Merge branch 'master' into mergeController

android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.reactnativenavigation">
 
-    <application>
+    <application
+        android:allowBackup="false"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity android:name=".controllers.NavigationActivity" />
+        <activity
+            android:name=".controllers.PortraitNavigationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name="com.facebook.react.devsupport.DevSettingsActivity"
+            android:exported="false" />
     </application>
 
 </manifest>

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -41,7 +41,11 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void startApp(final ReadableMap params) {
-        NavigationCommandsHandler.startApp(BundleConverter.toBundle(params));
+        boolean portraitOnlyMode = false;
+        if (params.hasKey("portraitOnlyMode")) {
+            portraitOnlyMode = params.getBoolean("portraitOnlyMode");
+        }
+        NavigationCommandsHandler.startApp(BundleConverter.toBundle(params), portraitOnlyMode);
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -104,6 +104,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         }
         if (layout != null) {
             layout.destroy();
+            layout = null;
         }
     }
 
@@ -120,7 +121,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     public void onBackPressed() {
-        if (!layout.onBackPressed()) {
+        if (layout != null && !layout.onBackPressed()) {
             NavigationApplication.instance.getReactGateway().onBackPressed();
         }
     }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -27,8 +27,13 @@ public class NavigationCommandsHandler {
      *
      * @param params ActivityParams as bundle
      */
-    public static void startApp(Bundle params) {
-        Intent intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
+    public static void startApp(Bundle params, boolean portraitOnlyMode) {
+        Intent intent;
+        if (portraitOnlyMode) {
+            intent = new Intent(NavigationApplication.instance, PortraitNavigationActivity.class);
+        } else {
+            intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
+        }
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(ACTIVITY_PARAMS_BUNDLE, params);
         NavigationApplication.instance.startActivity(intent);
@@ -183,8 +188,8 @@ public class NavigationCommandsHandler {
     }
 
     public static void setScreenTitleBarLeftButtons(final String screenInstanceId,
-                                                     final String navigatorEventId,
-                                                     final TitleBarLeftButtonParams titleBarButtons) {
+                                                    final String navigatorEventId,
+                                                    final TitleBarLeftButtonParams titleBarButtons) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;

android/app/src/main/java/com/reactnativenavigation/controllers/PortraitNavigationActivity.java

@@ -0,0 +1,4 @@
+package com.reactnativenavigation.controllers;
+
+public class PortraitNavigationActivity extends NavigationActivity {
+}

android/app/src/main/java/com/reactnativenavigation/controllers/SplashActivity.java

@@ -16,27 +16,30 @@ public abstract class SplashActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setSplashLayout();
+    }
 
-        if (NavigationApplication.instance.isReactContextInitialized()) {
-            finish();
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (NavigationApplication.instance.getReactGateway().hasStartedCreatingContext()) {
             return;
         }
 
         if (ReactDevPermission.shouldAskPermission()) {
             ReactDevPermission.askPermission(this);
+            return;
+        }
+
+        if (NavigationApplication.instance.isReactContextInitialized()) {
             finish();
             return;
         }
 
+        // TODO I'm starting to think this entire flow is incorrect and should be done in Application
         NavigationApplication.instance.startReactContextOnceInBackgroundAndExecuteJS();
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-        finish();
-    }
-
     private void setSplashLayout() {
         final int splashLayout = getSplashLayout();
         if (splashLayout > 0) {

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java

@@ -38,6 +38,11 @@ public class NavigationReactGateway implements ReactGateway {
         return host.hasInstance() && getReactInstanceManager().getCurrentReactContext() != null;
     }
 
+    @Override
+    public boolean hasStartedCreatingContext() {
+        return getReactInstanceManager().hasStartedCreatingInitialContext();
+    }
+
     public ReactContext getReactContext() {
         return getReactInstanceManager().getCurrentReactContext();
     }

android/app/src/main/java/com/reactnativenavigation/react/ReactGateway.java

@@ -29,4 +29,6 @@ public interface ReactGateway {
     void onBackPressed();
 
     void onActivityResult(int requestCode, int resultCode, Intent data);
+
+    boolean hasStartedCreatingContext();
 }

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

@@ -7,18 +7,15 @@
         android:name=".MyApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:label="@string/app_name">
         <activity
             android:name=".MainActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     </application>
 
 </manifest>

example/android/app/src/main/res/values/styles.xml

@@ -1,8 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-    </style>
-
-</resources>

example/src/app.js

@@ -29,23 +29,24 @@ Navigation.startTabBasedApp({
     left: {
       screen: 'example.SideMenu'
     }
-  }
+  },
+  portraitOnlyMode: true
 });
-// Navigation.startSingleScreenApp({
-//   screen: {
-//     screen: 'example.FirstTabScreen',
-//     title: 'Navigation',
-//     navigatorStyle: {
-//       navBarBackgroundColor: '#4dbce9',
-//       navBarTextColor: '#ffff00',
-//       navBarSubtitleTextColor: '#ff0000',
-//       navBarButtonColor: '#ffffff',
-//       statusBarTextColorScheme: 'light'
-//     }
-//   },
-//   drawer: {
-//     left: {
-//       screen: 'example.SideMenu'
-//     }
-//   }
-// });
+//Navigation.startSingleScreenApp({
+//  screen: {
+//    screen: 'example.FirstTabScreen',
+//    title: 'Navigation',
+//    navigatorStyle: {
+//      navBarBackgroundColor: '#4dbce9',
+//      navBarTextColor: '#ffff00',
+//      navBarSubtitleTextColor: '#ff0000',
+//      navBarButtonColor: '#ffffff',
+//      statusBarTextColorScheme: 'light'
+//    }
+//  },
+//  drawer: {
+//    left: {
+//      screen: 'example.SideMenu'
+//    }
+//  }
+//});

example/src/screens/FirstTabScreen.js

@@ -120,7 +120,10 @@ export default class FirstTabScreen extends Component {
       screen: "example.LightBoxScreen",
       style: {
         backgroundBlur: "dark"
-      }
+      },
+      passProps: {
+        greeting: 'hey there'
+      },
     });
   }
 

example/src/screens/LightBoxScreen.js

@@ -1,10 +1,10 @@
 import React, {Component} from 'react';
 import {
+  StyleSheet,
   Text,
   View,
-  ScrollView,
   TouchableOpacity,
-  StyleSheet
+  Dimensions
 } from 'react-native';
 
 export default class LightBoxScreen extends Component {
@@ -13,16 +13,19 @@ export default class LightBoxScreen extends Component {
   }
   render() {
     return (
-      <View style={{width: 300, height: 200, padding: 20}}>
-
-        <Text>
-          This is a LightBox
+      <View style={styles.container}>
+        <Text style={styles.welcome}>
+          This is a LightBox!
         </Text>
-
-        <TouchableOpacity onPress={ this.onDismissPress.bind(this) }>
+        {
+          this.props.greeting &&
+            <Text style={[styles.welcome, {fontSize: 16, marginTop: 20}]}>
+              {this.props.greeting}
+            </Text>
+        }
+        <TouchableOpacity onPress={() => this.onDismissPress()}>
           <Text style={styles.button}>Dismiss</Text>
         </TouchableOpacity>
-
       </View>
     );
   }
@@ -31,7 +34,25 @@ export default class LightBoxScreen extends Component {
   }
 }
 
-const styles = StyleSheet.create({
+var styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    width: Dimensions.get('window').width * 0.8,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: 'white',
+    borderRadius: 10
+  },
+  welcome: {
+    fontSize: 20,
+    textAlign: 'center',
+    margin: 10,
+  },
+  instructions: {
+    textAlign: 'center',
+    color: '#333333',
+    marginBottom: 5,
+  },
   button: {
     textAlign: 'center',
     fontSize: 18,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "2.0.0-experimental.118",
+  "version": "2.0.0-experimental.121",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,