hummingbird-me · Mikunj · Nov 1, 2018 · Sep 7, 2018 · Sep 11, 2018 · Sep 11, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -53,6 +53,10 @@ matrix:
         - chmod +x ./android/gradlew
         - openssl aes-256-cbc -K $encrypted_70d456c9569f_key -iv $encrypted_70d456c9569f_iv -in ./android/app/releaseFiles.tar.enc -out ./android/app/releaseFiles.tar -d
         - tar xvf ./android/app/releaseFiles.tar -C ./android/app
+
+        # Doing this because travis seemed to mess up when looking for the keystore file
+        - mkdir -p ./android/app/app
+        - tar xvf ./android/app/releaseFiles.tar -C ./android/app/app
         # - security delete-certificate -c "Apple Worldwide Developer Relations Certification Authority" # add this to resolve 'Could not install WWDR certificate'
       install:
         - yarn install

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -115,10 +115,11 @@ android {
 
     defaultConfig {
         applicationId "com.everfox.animetrackerandroid"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 27
+        missingDimensionStrategy "RNN.reactNativeVersion", "reactNative51"
         versionCode 1
-        versionName "6.8.1"
+        versionName "6.9.2"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"
@@ -132,6 +133,10 @@ android {
     dexOptions {
         jumboMode = true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     splits {
         abi {
             reset()
@@ -172,6 +177,15 @@ android {
     }
 }
 
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        def requested = details.requested
+        if (requested.group == 'com.android.support' && requested.name != 'multidex' && requested.name != 'multidex-instrumentation') {
+            details.useVersion "27.1.0"
+        }
+    }
+}
+
 dependencies {
     compile project(':react-native-sentry')
     compile project(':react-native-android-fullscreen-webview')
@@ -183,11 +197,13 @@ dependencies {
     compile project(':react-native-fbsdk')
     compile project(':react-native-vector-icons')
     compile project(':react-native-code-push')
-    compile fileTree(dir: "libs", include: ["*.jar"])
-
+
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:27.1.0"
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation project(':react-native-navigation')
+
     compile 'com.android.support:multidex:1.0.1'
-    compile "com.android.support:appcompat-v7:27+"
-    compile "com.facebook.react:react-native:+"  // From node_modules
     compile "com.facebook.fresco:animated-gif:1.3.0"
     compile 'com.facebook.fresco:animated-webp:1.3.0'
     compile 'com.facebook.fresco:webpsupport:1.3.0'

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -46,7 +46,7 @@
     <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:launchMode="singleTop"
+        android:launchMode="singleTask"
         android:screenOrientation="portrait"
         android:configChanges="keyboard|keyboardHidden|screenSize|orientation"
         android:windowSoftInputMode="adjustPan"
@@ -56,8 +56,8 @@
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
-      <!-- Disabled deep linking for now -->
-      <!-- <intent-filter>
+      <!-- Deep Linking -->
+      <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
@@ -66,8 +66,10 @@
         <data android:scheme="https" android:host="kitsu.io" android:pathPrefix="/users" />
         <data android:scheme="https" android:host="kitsu.io" android:pathPrefix="/posts" />
         <data android:scheme="https" android:host="kitsu.io" android:pathPrefix="/comments" />
-        <data android:scheme="https" android:host="kitsu.io" android:pathPrefix="/media-reactions" />
-      </intent-filter> -->
+         <data android:scheme="https" android:host="kitsu.io" android:pathPrefix="/feedback" />
+        <!-- Enable once we have media reactions -->
+        <!-- <data android:scheme="https" android:host="kitsu.io" android:pathPrefix="/media-reactions" /> -->
+      </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     <meta-data

diff --git a/android/app/src/main/java/com/everfox/animetrackerandroid/MainActivity.java b/android/app/src/main/java/com/everfox/animetrackerandroid/MainActivity.java
@@ -1,11 +1,11 @@
 package com.everfox.animetrackerandroid;
-import com.facebook.react.ReactActivity;
+import com.reactnativenavigation.NavigationActivity;
 import android.content.Intent;
 import android.os.Bundle;
 import com.crashlytics.android.Crashlytics;
 import io.fabric.sdk.android.Fabric;
 
-public class MainActivity extends ReactActivity {
+public class MainActivity extends NavigationActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -14,13 +14,15 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     /**
+     * NOTE: DISABLED because React Native Navigation handles this automatically
      * Returns the name of the main component registered from JavaScript.
      * This is used to schedule rendering of the component.
-     */
+
     @Override
     protected String getMainComponentName() {
         return "kitsu_mobile";
     }
+    */
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {

diff --git a/android/app/src/main/java/com/everfox/animetrackerandroid/MainApplication.java b/android/app/src/main/java/com/everfox/animetrackerandroid/MainApplication.java
@@ -1,9 +1,9 @@
 package com.everfox.animetrackerandroid;
 
 import android.app.Application;
-import android.support.multidex.MultiDexApplication;
+import android.support.multidex.MultiDex;
+import android.content.Context;
 
-import com.facebook.react.ReactApplication;
 import io.sentry.RNSentryPackage;
 import com.airship.customwebview.CustomWebViewPackage;
 import com.dylanvann.fastimage.FastImageViewPackage;
@@ -14,6 +14,8 @@
 import com.facebook.reactnative.androidsdk.FBSDKPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.microsoft.codepush.react.CodePush;
+
+import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -22,61 +24,81 @@
 import com.facebook.FacebookSdk;
 import com.facebook.reactnative.androidsdk.FBSDKPackage;
 import com.facebook.appevents.AppEventsLogger;
+
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.react.NavigationReactNativeHost;
+import com.reactnativenavigation.react.ReactGateway;
+
 import java.util.Arrays;
 import java.util.List;
 
-public class MainApplication extends MultiDexApplication implements ReactApplication {
+public class MainApplication extends NavigationApplication  {
   private static CallbackManager mCallbackManager = CallbackManager.Factory.create();
 
   protected static CallbackManager getCallbackManager() {
     return mCallbackManager;
   }
 
-  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    FacebookSdk.sdkInitialize(getApplicationContext());
+    // If you want to use AppEventsLogger to log events.
+    AppEventsLogger.activateApp(this);
+    SoLoader.init(this, /* native exopackage */ false);
+  }
 
-    @Override
-    protected String getJSMainModuleName() {
-      return "index";
-    }
+  @Override
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(base);
+    MultiDex.install(this);
+  }
 
-    @Override
-    protected String getJSBundleFile() {
-      return CodePush.getJSBundleFile();
-    }
+  @Override
+  protected ReactGateway createReactGateway() {
+      ReactNativeHost host = new NavigationReactNativeHost(this, isDebug(), createAdditionalReactPackages()) {
+          @Override
+          protected String getJSMainModuleName() {
+              return "index";
+          }
 
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return BuildConfig.DEBUG;
-    }
+          @Override
+          protected String getJSBundleFile() {
+            return CodePush.getJSBundleFile();
+          }
 
-    @Override
-    protected List<ReactPackage> getPackages() {
-      return Arrays.<ReactPackage>asList(
-          new MainReactPackage(),
-            new RNSentryPackage(MainApplication.this),
-            new CustomWebViewPackage(),
-            new FastImageViewPackage(),
-            new PickerPackage(),
-            new ReactNativeOneSignalPackage(),
-            new ReactNativeYouTube(),
-            new LinearGradientPackage(),
-            new FBSDKPackage(mCallbackManager),
-            new VectorIconsPackage(),
-            new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)
-      );
-    }
-  };
+          @Override
+          public boolean getUseDeveloperSupport() {
+            return BuildConfig.DEBUG;
+          }
+      };
+      return new ReactGateway(this, isDebug(), host);
+  }
 
   @Override
-  public ReactNativeHost getReactNativeHost() {
-    return mReactNativeHost;
+  public boolean isDebug() {
+      return BuildConfig.DEBUG;
+  }
+
+  protected List<ReactPackage> getPackages() {
+    // Add additional packages you require here
+    // No need to add RnnPackage and MainReactPackage
+    return Arrays.<ReactPackage>asList(
+          new RNSentryPackage(MainApplication.this),
+          new CustomWebViewPackage(),
+          new FastImageViewPackage(),
+          new PickerPackage(),
+          new ReactNativeOneSignalPackage(),
+          new ReactNativeYouTube(),
+          new LinearGradientPackage(),
+          new FBSDKPackage(mCallbackManager),
+          new VectorIconsPackage(),
+          new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)
+    );
   }
+
   @Override
-  public void onCreate() {
-    super.onCreate();
-    FacebookSdk.sdkInitialize(getApplicationContext());
-    // If you want to use AppEventsLogger to log events.
-    AppEventsLogger.activateApp(this);
-    SoLoader.init(this, /* native exopackage */ false);
+  public List<ReactPackage> createAdditionalReactPackages() {
+    return getPackages();
   }
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,14 +2,13 @@
 
 buildscript {
     repositories {
+        google()
+        mavenLocal()
+        mavenCentral()
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +17,8 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
+        mavenCentral()
         mavenLocal()
         jcenter()
         maven {
@@ -27,10 +28,6 @@ allprojects {
 
         // jitpack repo is necessary to fetch ucrop dependency
         maven { url "https://jitpack.io" }
-        maven { 
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
 
         configurations.all {
             resolutionStrategy {
@@ -44,3 +41,18 @@ allprojects {
         }
     }
 }
+
+subprojects { subproject ->
+    afterEvaluate {
+        if ((subproject.plugins.hasPlugin('android') || subproject.plugins.hasPlugin('android-library'))) {
+            android {
+                variantFilter { variant ->
+                    def names = variant.flavors*.name
+                    if (names.contains("reactNative56") || names.contains("reactNative55")) {
+                        setIgnore(true)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -17,4 +17,9 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+org.gradle.jvmargs=-Xmx1536M
+
 android.useDeprecatedNdk=true
+
+# Disable incremental resource processing as it broke release build
+android.enableAapt2=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -19,5 +19,7 @@ include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 include ':react-native-code-push'
 project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+include ':react-native-navigation'
+project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/lib/android/app/')
 
 include ':app'
diff --git a/index.js b/index.js
@@ -1,6 +1,7 @@
-import { AppRegistry } from 'react-native';
+import { Navigation } from 'react-native-navigation';
 import { Sentry } from 'react-native-sentry';
-import App from './src/App';
+import { registerScreens, Layouts, defaultOptions } from 'kitsu/navigation';
+import OneSignal from 'react-native-onesignal';
 
 Sentry.config('https://068b9ab849bf4485beb4884adcc5be83:8c57373b9bb4410f99ebfd17878c739a@sentry.io/200469');
 
@@ -9,4 +10,22 @@ if (!__DEV__) {
   Sentry.install();
 }
 
-AppRegistry.registerComponent('kitsu_mobile', () => App);
+// Set notification display
+OneSignal.inFocusDisplaying(2);
+
+console.disableYellowBox = true;
+
+// If you're using the debugging tools for React Native, the network tab is normally useless
+// because it shows network activity to load the JS bundle only. This line causes it to
+// use the dev tools XMLHttpRequest object if dev tools is running, making the network
+// tab useful again. If dev tools isn't running, this will have no effect.
+// NOTE: Disable this if you intend to upload files
+GLOBAL.XMLHttpRequest = GLOBAL.originalXMLHttpRequest || GLOBAL.XMLHttpRequest;
+
+registerScreens();
+
+Navigation.events().registerAppLaunchedListener(() => {
+  Navigation.setDefaultOptions(defaultOptions);
+  Navigation.setRoot(Layouts.INITIAL);
+});
+