Support setting orientation from application and modals (#834)

Closes #681

android/app/src/main/AndroidManifest.xml

@@ -5,14 +5,6 @@
         <activity
             android:name=".controllers.NavigationActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"/>
-        <activity
-            android:name=".controllers.PortraitNavigationActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".controllers.LandscapeNavigationActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            android:screenOrientation="landscape" />
         <activity
             android:name="com.facebook.react.devsupport.DevSettingsActivity"
             android:exported="false" />

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

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

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

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

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

@@ -11,7 +11,9 @@ import com.reactnativenavigation.R;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.ModalScreenLayout;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
+import com.reactnativenavigation.params.AppStyle;
 import com.reactnativenavigation.params.ContextualMenuParams;
+import com.reactnativenavigation.params.Orientation;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
@@ -86,6 +88,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         layout = new ModalScreenLayout(getActivity(), screenParams, this);
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        setOrientation(screenParams.styleParams.orientation);
         setContentView(layout.asView());
     }
 
@@ -109,7 +112,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         layout.newStack(params);
     }
 
-    public boolean containsNavigator(String navigatorId) {
+    boolean containsNavigator(String navigatorId) {
         return layout.containsNavigator(navigatorId);
     }
 
@@ -128,10 +131,15 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
     @Override
     public void onDismiss(DialogInterface dialog) {
         destroy();
+        setOrientation(AppStyle.appStyle.orientation);
         onModalDismissedListener.onModalDismissed(this);
     }
 
     void onModalDismissed() {
         layout.onModalDismissed();
     }
+
+    private void setOrientation(Orientation orientation) {
+        getActivity().setRequestedOrientation(orientation.orientationCode);
+    }
 }

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

@@ -32,7 +32,7 @@ import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.react.ReactGateway;
-import com.reactnativenavigation.utils.Orientation;
+import com.reactnativenavigation.utils.OrientationHelper;
 import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
@@ -57,20 +57,23 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         if (!NavigationApplication.instance.isReactContextInitialized()) {
             NavigationApplication.instance.startReactContextOnceInBackgroundAndExecuteJS();
             return;
         }
 
         activityParams = NavigationCommandsHandler.parseActivityParams(getIntent());
-
         disableActivityShowAnimationIfNeeded();
+        setOrientation();
         createLayout();
         createModalController();
         NavigationApplication.instance.getActivityCallbacks().onActivityCreated(this, savedInstanceState);
     }
 
+    private void setOrientation() {
+        OrientationHelper.setOrientation(this, AppStyle.appStyle.orientation);
+    }
+
     private void disableActivityShowAnimationIfNeeded() {
         if (!activityParams.animateShow) {
             overridePendingTransition(0, 0);
@@ -191,7 +194,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
-        Orientation.onConfigurationChanged(newConfig);
+        OrientationHelper.onConfigurationChanged(newConfig);
         NavigationApplication.instance.getActivityCallbacks().onConfigurationChanged(newConfig);
         super.onConfigurationChanged(newConfig);
     }

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

@@ -16,7 +16,7 @@ import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.params.parsers.ScreenParamsParser;
-import com.reactnativenavigation.utils.Orientation;
+import com.reactnativenavigation.utils.OrientationHelper;
 import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
@@ -35,15 +35,8 @@ public class NavigationCommandsHandler {
      * @param params ActivityParams as bundle
      */
 
-    public static void startApp(Bundle params, boolean portraitOnlyMode, boolean landscapeOnlyMode) {
-        Intent intent;
-        if (portraitOnlyMode) {
-            intent = new Intent(NavigationApplication.instance, PortraitNavigationActivity.class);
-        } else if (landscapeOnlyMode) {
-            intent = new Intent(NavigationApplication.instance, LandscapeNavigationActivity.class);
-        } else {
-            intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
-        }
+    public static void startApp(Bundle params) {
+        Intent intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
         IntentDataHandler.onStartApp(intent);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(ACTIVITY_PARAMS_BUNDLE, params);
@@ -428,6 +421,6 @@ public class NavigationCommandsHandler {
         if (currentActivity == null) {
             return;
         }
-        promise.resolve(Orientation.get(currentActivity));
+        promise.resolve(OrientationHelper.getOrientation(currentActivity));
     }
 }

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

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

android/app/src/main/java/com/reactnativenavigation/params/Orientation.java

@@ -0,0 +1,38 @@
+package com.reactnativenavigation.params;
+
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+
+public enum Orientation {
+    Portrait("portrait", Configuration.ORIENTATION_PORTRAIT, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT),
+    Landscape("landscape", Configuration.ORIENTATION_LANDSCAPE, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE),
+    auto("auto", Configuration.ORIENTATION_UNDEFINED, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+
+    public String name;
+    public int configurationCode;
+    public int orientationCode;
+
+    Orientation(String name, int configurationCode, int orientationCode) {
+        this.name = name;
+        this.configurationCode = configurationCode;
+        this.orientationCode = orientationCode;
+    }
+
+    public static Orientation fromString(String name) {
+        for (Orientation orientation : values()) {
+            if (orientation.name.equals(name)) {
+                return orientation;
+            }
+        }
+        throw new RuntimeException();
+    }
+
+    public static String fromConfigurationCode(int configurationCode) {
+        for (Orientation orientation : values()) {
+            if (orientation.configurationCode == configurationCode) {
+                return orientation.name;
+            }
+        }
+        throw new RuntimeException();
+    }
+}

android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java

@@ -41,6 +41,7 @@ public class StyleParams {
         }
     }
 
+    public Orientation orientation;
     public Color statusBarColor;
     public Color contextualMenuStatusBarColor;
     public Color contextualMenuButtonsColor;

android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java

@@ -4,6 +4,7 @@ import android.graphics.Color;
 import android.os.Bundle;
 
 import com.reactnativenavigation.params.AppStyle;
+import com.reactnativenavigation.params.Orientation;
 import com.reactnativenavigation.params.StyleParams;
 
 public class StyleParamsParser {
@@ -19,6 +20,7 @@ public class StyleParamsParser {
         }
 
         StyleParams result = new StyleParams();
+        result.orientation = Orientation.fromString(params.getString("orientation", getDefaultOrientation()));
         result.statusBarColor = getColor("statusBarColor", getDefaultStatusBarColor());
         result.contextualMenuStatusBarColor = getColor("contextualMenuStatusBarColor", getDefaultContextualMenuStatusBarColor());
         result.contextualMenuButtonsColor = getColor("contextualMenuButtonsColor", getDefaultContextualMenuButtonsColor());
@@ -74,11 +76,16 @@ public class StyleParamsParser {
         return result;
     }
 
+    private String getDefaultOrientation() {
+        return AppStyle.appStyle == null ? null : AppStyle.appStyle.orientation.name;
+    }
+
     private StyleParams createDefaultStyleParams() {
         StyleParams result = new StyleParams();
         result.titleBarDisabledButtonColor = getTitleBarDisabledButtonColor();
         result.topBarElevationShadowEnabled = true;
         result.titleBarHideOnScroll = false;
+        result.orientation = Orientation.auto;
         return result;
     }
 

android/app/src/main/java/com/reactnativenavigation/utils/Orientation.java

@@ -1,31 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.content.res.Configuration;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.controllers.NavigationActivity;
-
-public class Orientation {
-    public static String get(NavigationActivity currentActivity) {
-        return getOrientation(currentActivity.getResources().getConfiguration().orientation);
-    }
-
-    public static void onConfigurationChanged(Configuration newConfig) {
-        WritableMap params = Arguments.createMap();
-        params.putString("orientation", getOrientation(newConfig.orientation));
-        NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("orientationChanged", params);
-    }
-
-    private static String getOrientation(int orientation) {
-        switch (orientation) {
-            case Configuration.ORIENTATION_PORTRAIT:
-                return "PORTRAIT";
-            case Configuration.ORIENTATION_LANDSCAPE:
-                return "LANDSCAPE";
-            default:
-                return "UNDEFINED";
-        }
-    }
-}

android/app/src/main/java/com/reactnativenavigation/utils/OrientationHelper.java

@@ -0,0 +1,26 @@
+package com.reactnativenavigation.utils;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.controllers.NavigationActivity;
+import com.reactnativenavigation.params.Orientation;
+
+public class OrientationHelper {
+    public static String getOrientation(NavigationActivity currentActivity) {
+        return Orientation.fromConfigurationCode(currentActivity.getResources().getConfiguration().orientation);
+    }
+
+    public static void setOrientation(Activity activity, Orientation orientation) {
+        activity.setRequestedOrientation(orientation.orientationCode);
+    }
+
+    public static void onConfigurationChanged(Configuration newConfig) {
+        WritableMap params = Arguments.createMap();
+        params.putString("orientation", Orientation.fromConfigurationCode(newConfig.orientation));
+        NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("orientationChanged", params);
+    }
+}

android/app/src/main/res/layout/tab_activity.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".activities.TabActivity">
-
-    <android.support.design.widget.AppBarLayout
-        android:id="@+id/appbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.reactnativenavigation.views.RnnToolBar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_scrollFlags="scroll|enterAlways" />
-
-        <com.reactnativenavigation.views.RnnTabLayout
-            android:id="@+id/tabLayout"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_scrollFlags="scroll|enterAlways" />
-    </android.support.design.widget.AppBarLayout>
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-</LinearLayout>

src/deprecated/platformSpecificDeprecated.android.js

@@ -28,6 +28,9 @@ function startSingleScreenApp(params) {
   params.screen = adaptNavigationStyleToScreenStyle(screen);
   params.screen = adaptNavigationParams(screen);
   params.appStyle = convertStyleParams(params.appStyle);
+  if (params.appStyle) {
+    params.appStyle.orientation = getOrientation(params);
+  }
   params.sideMenu = convertDrawerParamsToSideMenuParams(params.drawer);
   params.overrideBackPress = screen.overrideBackPress;
   params.animateShow = convertAnimationType(params.animationType);
@@ -35,6 +38,16 @@ function startSingleScreenApp(params) {
   newPlatformSpecific.startApp(params);
 }
 
+function getOrientation(params) {
+  if (params.portraitOnlyMode || _.get(params, 'appStyle.orientation') === 'portrait') {
+    return 'portrait';
+  }
+  if (params.landscaptOnlyMode || _.get(params, 'appStyle.orientation') === 'landscape') {
+    return 'landscape';
+  }
+  return 'auto';
+}
+
 function adaptTopTabs(screen, navigatorID) {
   screen.topTabs = _.cloneDeep(screen.topTabs);
   _.forEach(_.get(screen, 'topTabs'), (tab) => {
@@ -120,6 +133,7 @@ function convertStyleParams(originalStyleObject) {
   }
 
   let ret = {
+    orientation: originalStyleObject.orientation,
     statusBarColor: processColor(originalStyleObject.statusBarColor),
     topBarColor: processColor(originalStyleObject.navBarBackgroundColor),
     topBarTransparent: originalStyleObject.navBarTransparent,
@@ -249,6 +263,9 @@ function startTabBasedApp(params) {
   params.tabs = newTabs;
 
   params.appStyle = convertStyleParams(params.appStyle);
+  if (params.appStyle) {
+    params.appStyle.orientation = getOrientation(params);
+  }
   params.sideMenu = convertDrawerParamsToSideMenuParams(params.drawer);
   params.animateShow = convertAnimationType(params.animationType);