Refactor orientation logic to separate class (#811)

closes #661

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

@@ -1,8 +1,5 @@
 package com.reactnativenavigation.bridge;
 
-import android.app.Activity;
-import android.content.res.Configuration;
-
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -227,23 +224,6 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void getOrientation(Promise promise) {
-        Activity activity = getCurrentActivity();
-        if (activity != null) {
-            int orientation = getCurrentActivity().getResources().getConfiguration().orientation;
-            switch (orientation) {
-                case Configuration.ORIENTATION_PORTRAIT:
-                    promise.resolve("PORTRAIT");
-                    return;
-                case Configuration.ORIENTATION_LANDSCAPE:
-                    promise.resolve("LANDSCAPE");
-                    return;
-                case Configuration.ORIENTATION_UNDEFINED:
-                    promise.resolve("UNDEFINED");
-                    return;
-            }
-        } else {
-            promise.resolve("UNDEFINED");
-        }
+        NavigationCommandsHandler.getOrientation(promise);
     }
-
 }

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

@@ -9,22 +9,15 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.bridge.EventEmitter;
-import com.reactnativenavigation.bridge.NavigationReactEventEmitter;
 import com.reactnativenavigation.events.Event;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.JsDevReloadEvent;
 import com.reactnativenavigation.events.ModalDismissedEvent;
-import com.reactnativenavigation.events.OrientationChangedEvent;
 import com.reactnativenavigation.events.Subscriber;
 import com.reactnativenavigation.layouts.BottomTabsLayout;
 import com.reactnativenavigation.layouts.Layout;
@@ -39,6 +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.views.SideMenu.Side;
 
 import java.util.List;
@@ -197,23 +191,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
-        EventEmitter eventEmitter = NavigationApplication.instance.getEventEmitter();
-        OrientationChangedEvent event = new OrientationChangedEvent();
-        WritableMap params = Arguments.createMap();
-
-        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            params.putString("orientation", "LANDSCAPE");
-        }
-
-        if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-            params.putString("orientation", "PORTRAIT");
-        }
-
-        if (newConfig.orientation == Configuration.ORIENTATION_UNDEFINED) {
-            params.putString("orientation", "UNDEFINED");
-        }
-
-        eventEmitter.sendNavigatorEvent(event.getType(), params);
+        Orientation.onConfigurationChanged(newConfig);
         NavigationApplication.instance.getActivityCallbacks().onConfigurationChanged(newConfig);
         super.onConfigurationChanged(newConfig);
     }

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.ContextualMenuParams;
@@ -15,6 +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.views.SideMenu.Side;
 
 import java.util.List;
@@ -420,4 +422,12 @@ public class NavigationCommandsHandler {
             }
         });
     }
+
+    public static void getOrientation(Promise promise) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+        promise.resolve(Orientation.get(currentActivity));
+    }
 }

android/app/src/main/java/com/reactnativenavigation/events/OrientationChangedEvent.java

@@ -1,9 +0,0 @@
-package com.reactnativenavigation.events;
-
-public class OrientationChangedEvent implements Event {
-    public static final String TYPE = "OrientationChanged";
-    @Override
-    public String getType() {
-        return TYPE;
-    }
-}

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

@@ -0,0 +1,31 @@
+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";
+        }
+    }
+}