Issue 7443: Add support for Android's sensorPortrait orientation. (#7454

) Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>
wix · Mar 3, 2022 · 7e9ea6c · 7e9ea6c
1 parent cc8387f
commit 7e9ea6c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/options/Orientation.java b/lib/android/app/src/main/java/com/reactnativenavigation/options/Orientation.java
@@ -8,7 +8,8 @@ public enum Orientation {
     Landscape("landscape", ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE),
     Portrait("portrait", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT),
     PortraitLandscape("sensor", ActivityInfo.SCREEN_ORIENTATION_USER),
-    SensorLandscape("sensorLandscape", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+    SensorLandscape("sensorLandscape", ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE),
+    SensorPortrait("sensorPortrait", ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
 
     public String name;
     public int orientationCode;

diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/options/OrientationOptions.java b/lib/android/app/src/main/java/com/reactnativenavigation/options/OrientationOptions.java
@@ -44,6 +44,8 @@ public int getValue() {
                 return orientations.contains(Orientation.Landscape) ? Orientation.PortraitLandscape.orientationCode : Orientation.Portrait.orientationCode;
             case SensorLandscape:
                 return Orientation.SensorLandscape.orientationCode;
+            case SensorPortrait:
+                return Orientation.SensorPortrait.orientationCode;
             default:
             case Default:
                 return Orientation.Default.orientationCode;

diff --git a/lib/android/app/src/test/java/com/reactnativenavigation/options/OrientationOptionsTest.java b/lib/android/app/src/test/java/com/reactnativenavigation/options/OrientationOptionsTest.java
@@ -26,10 +26,13 @@ public void parse() {
 
     @Test
     public void parseOrientations() {
-        OrientationOptions options = OrientationOptions.parse(create("default", "landscape", "portrait"));
+        OrientationOptions options = OrientationOptions.parse(create("default", "landscape", "portrait", "sensor", "sensorLandscape", "sensorPortrait"));
         assertThat(options.orientations.get(0)).isEqualTo(Orientation.Default);
         assertThat(options.orientations.get(1)).isEqualTo(Orientation.Landscape);
         assertThat(options.orientations.get(2)).isEqualTo(Orientation.Portrait);
+        assertThat(options.orientations.get(3)).isEqualTo(Orientation.PortraitLandscape);
+        assertThat(options.orientations.get(4)).isEqualTo(Orientation.SensorLandscape);
+        assertThat(options.orientations.get(5)).isEqualTo(Orientation.SensorPortrait);
     }
 
     @Test

diff --git a/lib/src/interfaces/Options.ts b/lib/src/interfaces/Options.ts
@@ -33,7 +33,12 @@ type FontWeight =
   | '800'
   | '900'
   | FontWeightIOS;
-export type LayoutOrientation = 'portrait' | 'landscape';
+export type LayoutOrientation =
+  | 'portrait'
+  | 'landscape'
+  | 'sensor'
+  | 'sensorLandscape'
+  | 'sensorPortrait';
 type AndroidDensityNumber = number;
 export type SystemItemIcon =
   | 'done'