fixing android

android/app/build.gradle

@@ -3,11 +3,11 @@ apply from: '../prepare-robolectric.gradle'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -47,7 +47,7 @@ android {
 dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
 
-	  compile 'com.android.support:design:25.0.1'
+    compile 'com.android.support:design:25.0.1'
     compile "com.android.support:appcompat-v7:25.0.1"
 
     // node_modules
@@ -59,6 +59,6 @@ dependencies {
 
     // tests
     testCompile "junit:junit:4.12"
-    testCompile "org.robolectric:robolectric:3.1.4"
+    testCompile "org.robolectric:robolectric:3.2.2"
     testCompile 'org.assertj:assertj-core:2.5.0'
 }

android/app/src/main/AndroidManifest.xml

@@ -13,5 +13,4 @@
             android:name="com.facebook.react.devsupport.DevSettingsActivity"
             android:exported="false" />
     </application>
-
 </manifest>

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle/wrapper/gradle-wrapper.properties

@@ -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-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

android/prepare-robolectric.gradle

@@ -3,10 +3,8 @@ def robolectricDependenciesFolder = rootProject.buildDir.path + "/robolectric-de
 configurations.create('robolectricRuntime')
 
 dependencies {
-    robolectricRuntime "org.ccil.cowan.tagsoup:tagsoup:1.2"
-    robolectricRuntime "org.robolectric:android-all:6.0.0_r1-robolectric-0"
-    robolectricRuntime "org.robolectric:shadows-core-v23:3.1.4"
-    robolectricRuntime "org.json:json:20080701"
+    robolectricRuntime "org.robolectric:android-all:6.0.1_r3-robolectric-0"
+    robolectricRuntime "org.robolectric:shadows-core:3.2.2"
 }
 
 rootProject.task(type: Copy, overwrite: true, "downloadRobolectricDependencies") {

ios/RNNRootViewController.m

@@ -34,4 +34,5 @@
 	[RNN.instance.eventEmitter sendContainerStop:self.containerId];
 }
 
+
 @end

playground/android/app/build.gradle

@@ -1,31 +1,14 @@
 apply plugin: "com.android.application"
-
-import com.android.build.OutputFile
 apply from: "../../node_modules/react-native/react.gradle"
 
-/**
- * Set this to true to create two separate APKs instead of one:
- *   - An APK that only works on ARM devices
- *   - An APK that only works on x86 devices
- * The advantage is the size of the APK is reduced by about 4MB.
- * Upload all the APKs to the Play Store and people will download
- * the correct one based on the CPU architecture of their device.
- */
-def enableSeparateBuildPerCPUArchitecture = false
-
-/**
- * Run Proguard to shrink the Java bytecode in release builds.
- */
-def enableProguardInReleaseBuilds = false
-
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.example"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         ndk {
@@ -35,14 +18,14 @@ android {
     splits {
         abi {
             reset()
-            enable enableSeparateBuildPerCPUArchitecture
+            enable false
             universalApk false  // If true, also generate a universal APK
             include "armeabi-v7a", "x86"
         }
     }
     buildTypes {
         release {
-            minifyEnabled enableProguardInReleaseBuilds
+            minifyEnabled false
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }

playground/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example">
+    package="com.reactnativenavigation.playground">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -18,5 +18,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>

playground/android/app/src/main/java/com/example/MainActivity.java → playground/android/app/src/main/java/com/reactnativenavigation/playground/MainActivity.java

@@ -1,4 +1,4 @@
-package com.example;
+package com.reactnativenavigation.playground;
 
 import com.reactnativenavigation.controllers.SplashActivity;
 

playground/android/app/src/main/java/com/example/MainApplication.java → playground/android/app/src/main/java/com/reactnativenavigation/playground/MainApplication.java

@@ -1,4 +1,4 @@
-package com.example;
+package com.reactnativenavigation.playground;
 
 import android.support.annotation.Nullable;
 

playground/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

playground/android/gradle/wrapper/gradle-wrapper.properties

@@ -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-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

playground/android/settings.gradle

@@ -1,6 +1,5 @@
-rootProject.name = 'example'
+rootProject.name = 'playground'
 
 include ':app'
 include ':react-native-navigation'
-project(':react-native-navigation').projectDir = new File(
-        rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')
+project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app/')

playground/e2e/app.test.js

@@ -27,6 +27,9 @@ describe('app', () => {
   it('screen lifecycle', () => {
     elementByLabel('Switch to lifecycle screen').tap();
     expect(elementByLabel('onStart!')).toBeVisible();
+    elementByLabel('Push to test onStop').tap();
+    expect(elementByLabel('Alert')).toBeVisible();
+    expect(elementByLabel('onStop!')).toBeVisible();
   });
 });
 

playground/src/app.js

@@ -8,7 +8,7 @@ export function start() {
   Navigation.events().onAppLaunched(() => {
     Navigation.setRoot({
       container: {
-        name: 'com.example.WelcomeScreen'
+        name: 'navigation.playground.WelcomeScreen'
       }
     });
   });

playground/src/containers/LifecycleScreen.js

@@ -1,9 +1,12 @@
 import React, { Component } from 'react';
-import { View, Text } from 'react-native';
+import { View, Text, Button } from 'react-native';
+
+import Navigation from 'react-native-navigation';
 
 class LifecycleScreen extends Component {
   constructor(props) {
     super(props);
+    this.onClickPush = this.onClickPush.bind(this);
     this.state = {
       text: 'nothing yet'
     };
@@ -14,16 +17,23 @@ class LifecycleScreen extends Component {
   }
 
   onStop() {
-    this.setState({ text: 'onStop!' });
+    alert('onStop!'); //eslint-disable-line
   }
 
   render() {
     return (
       <View style={styles.root}>
         <Text style={styles.h1}>{this.state.text}</Text>
+        <Button title="Push to test onStop" onPress={this.onClickPush} />
       </View>
     );
   }
+
+  onClickPush() {
+    Navigation.on(this.props.id).push({
+      name: 'navigation.playground.SimpleScreen'
+    });
+  }
 }
 export default LifecycleScreen;
 

playground/src/containers/WelcomeScreen.js

@@ -27,7 +27,7 @@ class WelcomeScreen extends Component {
       tabs: [
         {
           container: {
-            name: 'com.example.SimpleScreen',
+            name: 'navigation.playground.SimpleScreen',
             passProps: {
               text: 'This is tab 1',
               myFunction: () => 'Hello from a function!'
@@ -36,7 +36,7 @@ class WelcomeScreen extends Component {
         },
         {
           container: {
-            name: 'com.example.SimpleScreen',
+            name: 'navigation.playground.SimpleScreen',
             passProps: {
               text: 'This is tab 2'
             }
@@ -51,29 +51,29 @@ class WelcomeScreen extends Component {
       tabs: [
         {
           container: {
-            name: 'com.example.SimpleScreen'
+            name: 'navigation.playground.SimpleScreen'
           }
         },
         {
           container: {
-            name: 'com.example.SimpleScreen'
+            name: 'navigation.playground.SimpleScreen'
           }
         },
         {
           container: {
-            name: 'com.example.SimpleScreen'
+            name: 'navigation.playground.SimpleScreen'
           }
         }
       ],
       sideMenu: {
         left: {
           container: {
-            name: 'com.example.SimpleScreen'
+            name: 'navigation.playground.SimpleScreen'
           }
         },
         right: {
           container: {
-            name: 'com.example.SimpleScreen'
+            name: 'navigation.playground.SimpleScreen'
           }
         }
       }
@@ -82,7 +82,7 @@ class WelcomeScreen extends Component {
 
   onClickPush() {
     Navigation.on(this.props.id).push({
-      name: 'com.example.SimpleScreen',
+      name: 'navigation.playground.SimpleScreen',
       passProps: {
         text: 'Pushed screen'
       }
@@ -92,7 +92,7 @@ class WelcomeScreen extends Component {
   onClickLifecycleScreen() {
     Navigation.setRoot({
       container: {
-        name: 'com.example.LifecycleScreen'
+        name: 'navigation.playground.LifecycleScreen'
       }
     });
   }

playground/src/containers/index.js

@@ -5,7 +5,7 @@ import SimpleScreen from './SimpleScreen';
 import LifecycleScreen from './LifecycleScreen';
 
 export function registerContainers() {
-  Navigation.registerContainer(`com.example.WelcomeScreen`, () => WelcomeScreen);
-  Navigation.registerContainer(`com.example.SimpleScreen`, () => SimpleScreen);
-  Navigation.registerContainer(`com.example.LifecycleScreen`, () => LifecycleScreen);
+  Navigation.registerContainer(`navigation.playground.WelcomeScreen`, () => WelcomeScreen);
+  Navigation.registerContainer(`navigation.playground.SimpleScreen`, () => SimpleScreen);
+  Navigation.registerContainer(`navigation.playground.LifecycleScreen`, () => LifecycleScreen);
 }