Submodule for Vendored AudioPlayer & Updated example RN 0.59 with Hooks (doublesymmetry#615)

* Use submodule for vendored Audio player & update example
* Remove vendored audioplayer
* Add vendored audioplayer as submodule
* Update audio player branch to fork

Author: dcvz

Diff for: .gitmodules

@@ -0,0 +1,3 @@
+[submodule "ios/RNTrackPlayer/Vendor/AudioPlayer"]
+	path = ios/RNTrackPlayer/Vendor/AudioPlayer
+	url = https://github.com/dcvz/SwiftAudio.git

Diff for: example/.babelrc

@@ -1,47 +1,23 @@
-import React, { Component } from 'react';
-import TrackPlayer from 'react-native-track-player';
-import { StackNavigator } from 'react-navigation';
-
-import PlayerStore from './react/stores/Player';
-import TrackStore from './react/stores/Track';
-
-import LandingScreen from './react/screens/LandingScreen';
-import PlaylistScreen from './react/screens/PlaylistScreen';
-
-const RootStack = StackNavigator({
-  Landing: {
-    screen: LandingScreen,
-  },
-  Playlist: {
-    screen: PlaylistScreen,
+import React from "react";
+import { createStackNavigator, createAppContainer } from "react-navigation";
+
+import LandingScreen from "./react/screens/LandingScreen";
+import PlaylistScreen from "./react/screens/PlaylistScreen";
+
+const AppNavigator = createStackNavigator(
+  {
+    Landing: {
+      screen: LandingScreen
+    },
+    Playlist: {
+      screen: PlaylistScreen
+    }
   },
-}, { initialRouteName: 'Landing' })
-
-export default class App extends Component {
-
-  componentDidMount() {
-    this._onTrackChanged = TrackPlayer.addEventListener('playback-track-changed', async (data) => {
-      if (data.nextTrack) {
-        const track = await TrackPlayer.getTrack(data.nextTrack);
-        TrackStore.title = track.title;
-        TrackStore.artist = track.artist;
-        TrackStore.artwork = track.artwork;
-      }
-    })
-
-    this._onStateChanged = TrackPlayer.addEventListener('playback-state', (data) => {
-      PlayerStore.playbackState = data.state;
-    })
-  }
+  { initialRouteName: "Landing" }
+);
 
-  componentWillUnmount() {
-    this._onTrackChanged.remove()
-    this._onStateChanged.remove()
-  }
+const AppContainer = createAppContainer(AppNavigator);
 
-  render() {
-    return (
-      <RootStack />
-    );
-  }
+export default function App() {
+  return <AppContainer />;
 }

Diff for: example/App.js

@@ -94,18 +94,19 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         applicationId "com.example"
-        minSdkVersion 16
-        targetSdkVersion 27
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
     }
     android {
         compileOptions {
@@ -118,7 +119,7 @@ android {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86"
+            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
     buildTypes {
@@ -132,7 +133,7 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2]
+            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
@@ -143,6 +144,7 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-gesture-handler')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:27.1.1"
     implementation "com.facebook.react:react-native:+"  // From node_modules

Diff for: example/android/app/build.gradle

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+</manifest>

Diff for: example/android/app/src/debug/AndroidManifest.xml

@@ -3,12 +3,12 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity

Diff for: example/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 package com.example;
 
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
 public class MainActivity extends ReactActivity {
 
@@ -12,4 +15,14 @@ public class MainActivity extends ReactActivity {
     protected String getMainComponentName() {
         return "example";
     }
+
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+      return new ReactActivityDelegate(this, getMainComponentName()) {
+        @Override
+        protected ReactRootView createRootView() {
+         return new RNGestureHandlerEnabledRootView(MainActivity.this);
+        }
+      };
+    }
 }

Diff for: example/android/app/src/main/java/com/example/MainActivity.java

@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.guichaguri.trackplayer.TrackPlayer;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
@@ -24,6 +25,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new RNGestureHandlerPackage(),
           new TrackPlayer()
       );
     }

Diff for: example/android/app/src/main/java/com/example/MainApplication.java

@@ -1,12 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        buildToolsVersion = "28.0.3"
+        minSdkVersion = 16
+        compileSdkVersion = 28
+        targetSdkVersion = 28
+        supportLibVersion = "28.0.0"
+    }
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,8 +22,8 @@ buildscript {
 
 allprojects {
     repositories {
-        google()
         mavenLocal()
+        google()
         jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

Diff for: example/android/build.gradle

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

Diff for: example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,8 @@
 rootProject.name = 'example'
 
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
+
 include ':react-native-track-player'
 project(':react-native-track-player').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-track-player/android')
 

Diff for: example/android/settings.gradle

@@ -0,0 +1,11 @@
+module.exports = {
+  presets: ['module:metro-react-native-babel-preset'],
+  plugins: [
+    [
+      "@babel/plugin-proposal-decorators",
+      {
+        legacy: true
+      }
+    ]
+  ]
+};

Diff for: example/babel.config.js

@@ -2,8 +2,6 @@ import { AppRegistry } from 'react-native';
 import TrackPlayer from 'react-native-track-player';
 
 import App from './App';
-import PlayerStore, { playbackStates } from './react/stores/Player';
-import TrackStore from './react/stores/Track';
 
 AppRegistry.registerComponent('example', () => App);
 TrackPlayer.registerPlaybackService(() => require('./service'));