expo-screen-orientation 4.0.0 → 4.1.0

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 4.1.0 — 2021-12-03
+
+### 💡 Others
+
+- [plugin] Added SDK 43 tests for new AppDelegate template ([#14763](https://github.com/expo/expo/pull/14763) by [@EvanBacon](https://github.com/EvanBacon))
+- The app delegate subscriber on iOS has been separated from the singleton module to hook into the new implementation of `ExpoAppDelegate`. ([#14867](https://github.com/expo/expo/pull/14867) by [@tsapeta](https://github.com/tsapeta))
+
+### ⚠️ Notices
+
+- Extra setup on iOS bare projects is not necessary from the support of `ExpoReactDelegateHandler`. ([#15140](https://github.com/expo/expo/pull/15140) by [@kudo](https://github.com/kudo))
+
+## 4.0.1 — 2021-10-01
+
+_This version does not introduce any user-facing changes._
+
 ## 4.0.0 — 2021-09-28
 
 ### 🛠 Breaking changes

package/README.md

@@ -13,7 +13,7 @@ For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/expo/expo/tree/master/packages/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 
@@ -23,33 +23,14 @@ npm install expo-screen-orientation
 
 ### Configure for iOS
 
-1. Run `npx pod-install` after installing the npm package.
-2. Open the `AppDelegate.m` of your application.
-3. Make sure your `AppDelegate` extends `UMAppDelegateWrapper` as shown [here](https://gist.github.com/lukmccall/d2b97b2dde0d1aa04a245a369ffdd153).
-4. Import `<EXScreenOrientation/EXScreenOrientationViewController.h>`
-5. In `-application:didFinishLaunchingWithOptions:launchOptions` change default `root view controller` to `EXScreenOrientationViewController`:
+Run `npx pod-install` after installing the npm package.
 
-   Replace
+The default [UIInterfaceOrientationMask](https://developer.apple.com/documentation/uikit/uiinterfaceorientationmask?language=objc) mask is `UIInterfaceOrientationMaskPortrait`. You can optionally add `EXDefaultScreenOrientationMask` key in your `Info.plist` to change the default orientation mask, e.g.
 
-   ```objc
-   UIViewController *rootViewController = [UIViewController new];
-   ```
-
-   with:
-
-   ```objc
-   UIViewController *rootViewController = [[EXScreenOrientationViewController alloc] init]; // The default screen orientation will be set to `portrait`.
-   ```
-
-   or if you want to change the default screen orientation, with:
-
-   ```objc
-   UIViewController *rootViewController =  [[EXScreenOrientationViewController alloc] initWithDefaultScreenOrientationMask:UIInterfaceOrientationMaskPortrait]; // through parameter you can specify your default orientation mask.
-   ```
-
-   For more information about available orientation masks, check out [UIInterfaceOrientationMask](https://developer.apple.com/documentation/uikit/uiinterfaceorientationmask?language=objc)
-
-> **Note** if you are using a custom view controller, the controller will need to extend the `EXScreenOrientationViewController`.
+```xml
+<key>EXDefaultScreenOrientationMask</key>
+<string>UIInterfaceOrientationMaskAllButUpsideDown</string>
+```
 
 ### Configure for Android
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '4.0.0'
+version = '4.1.0'
 
 buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
@@ -57,7 +57,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 7
-    versionName '4.0.0'
+    versionName '4.1.0'
   }
   lintOptions {
     abortOnError false

package/build/ScreenOrientation.types.d.ts

@@ -103,17 +103,20 @@ export declare enum WebOrientation {
 }
 export declare type PlatformOrientationInfo = {
     /**
-     * __Android Only.__ A constant to set using the Android native [API](https://developer.android.com/reference/android/R.attr.html#screenOrientation).
+     * A constant to set using the Android native [API](https://developer.android.com/reference/android/R.attr.html#screenOrientation).
      * For example, in order to set the lock policy to [unspecified](https://developer.android.com/reference/android/content/pm/ActivityInfo.html#SCREEN_ORIENTATION_UNSPECIFIED),
      * `-1` should be passed in.
+     * @platform android
      */
     screenOrientationConstantAndroid?: number;
     /**
-     * __iOS Only.__ An array of orientations to allow on the iOS platform.
+     * An array of orientations to allow on the iOS platform.
+     * @platform ios
      */
     screenOrientationArrayIOS?: Orientation[];
     /**
-     * __Web Only.__ A web orientation lock to apply in the browser.
+     * A web orientation lock to apply in the browser.
+     * @platform web
      */
     screenOrientationLockWeb?: WebOrientationLock;
 };
@@ -123,13 +126,15 @@ export declare type ScreenOrientationInfo = {
      */
     orientation: Orientation;
     /**
-     *  __iOS Only.__ The [vertical size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
+     * The [vertical size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
      * of the device.
+     * @platform ios
      */
     verticalSizeClass?: SizeClassIOS;
     /**
-     *  __iOS Only.__ The [horizontal size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
+     * The [horizontal size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
      * of the device.
+     * @platform ios
      */
     horizontalSizeClass?: SizeClassIOS;
 };

package/build/ScreenOrientation.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScreenOrientation.types.js","sourceRoot":"","sources":["../src/ScreenOrientation.types.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,MAAM,CAAN,IAAY,WAqBX;AArBD,WAAY,WAAW;IACrB;;OAEG;IACH,mDAAW,CAAA;IACX;;OAEG;IACH,2DAAe,CAAA;IACf;;OAEG;IACH,+DAAiB,CAAA;IACjB;;OAEG;IACH,iEAAkB,CAAA;IAClB;;OAEG;IACH,mEAAmB,CAAA;AACrB,CAAC,EArBW,WAAW,KAAX,WAAW,QAqBtB;AAED,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAN,IAAY,eA0CX;AA1CD,WAAY,eAAe;IACzB;;;OAGG;IACH,2DAAW,CAAA;IACX;;OAEG;IACH,mDAAO,CAAA;IACP;;OAEG;IACH,6DAAY,CAAA;IACZ;;OAEG;IACH,mEAAe,CAAA;IACf;;OAEG;IACH,uEAAiB,CAAA;IACjB;;OAEG;IACH,+DAAa,CAAA;IACb;;OAEG;IACH,yEAAkB,CAAA;IAClB;;OAEG;IACH,2EAAmB,CAAA;IACnB;;OAEG;IACH,uDAAS,CAAA;IACT;;OAEG;IACH,2DAAW,CAAA;AACb,CAAC,EA1CW,eAAe,KAAf,eAAe,QA0C1B;AAED,cAAc;AACd;;;GAGG;AACH,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,qDAAW,CAAA;IACX,qDAAW,CAAA;IACX,qDAAW,CAAA;AACb,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAED,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAN,IAAY,kBAUX;AAVD,WAAY,kBAAkB;IAC5B,2DAAqC,CAAA;IACrC,+DAAyC,CAAA;IACzC,2CAAqB,CAAA;IACrB,6DAAuC,CAAA;IACvC,iEAA2C,CAAA;IAC3C,6CAAuB,CAAA;IACvB,iCAAW,CAAA;IACX,yCAAmB,CAAA;IACnB,yCAAmB,CAAA;AACrB,CAAC,EAVW,kBAAkB,KAAlB,kBAAkB,QAU7B;AAED,eAAe;AACf,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,uDAAqC,CAAA;IACrC,2DAAyC,CAAA;IACzC,yDAAuC,CAAA;IACvC,6DAA2C,CAAA;AAC7C,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB","sourcesContent":["// @needsAudit\nexport enum Orientation {\n  /**\n   * An unknown screen orientation. For example, the device is flat, perhaps on a table.\n   */\n  UNKNOWN = 0,\n  /**\n   * Right-side up portrait interface orientation.\n   */\n  PORTRAIT_UP = 1,\n  /**\n   * Upside down portrait interface orientation.\n   */\n  PORTRAIT_DOWN = 2,\n  /**\n   * Left landscape interface orientation.\n   */\n  LANDSCAPE_LEFT = 3,\n  /**\n   * Right landscape interface orientation.\n   */\n  LANDSCAPE_RIGHT = 4,\n}\n\n// @needsAudit\n/**\n * An enum whose values can be passed to the [`lockAsync`](#screenorientationlockasyncorientationlock)\n * method.\n * > __Note:__ `OrientationLock.ALL` and `OrientationLock.PORTRAIT` are invalid on devices which\n * don't support `OrientationLock.PORTRAIT_DOWN`.\n */\nexport enum OrientationLock {\n  /**\n   * The default orientation. On iOS, this will allow all orientations except `Orientation.PORTRAIT_DOWN`.\n   * On Android, this lets the system decide the best orientation.\n   */\n  DEFAULT = 0,\n  /**\n   * All four possible orientations\n   */\n  ALL = 1,\n  /**\n   * Any portrait orientation.\n   */\n  PORTRAIT = 2,\n  /**\n   * Right-side up portrait only.\n   */\n  PORTRAIT_UP = 3,\n  /**\n   * Upside down portrait only.\n   */\n  PORTRAIT_DOWN = 4,\n  /**\n   * Any landscape orientation.\n   */\n  LANDSCAPE = 5,\n  /**\n   * Left landscape only.\n   */\n  LANDSCAPE_LEFT = 6,\n  /**\n   * Right landscape only.\n   */\n  LANDSCAPE_RIGHT = 7,\n  /**\n   * A platform specific orientation. This is not a valid policy that can be applied in [`lockAsync`](#screenorientationlockasyncorientationlock).\n   */\n  OTHER = 8,\n  /**\n   * An unknown screen orientation lock. This is not a valid policy that can be applied in [`lockAsync`](#screenorientationlockasyncorientationlock).\n   */\n  UNKNOWN = 9,\n}\n\n// @needsAudit\n/**\n * Each iOS device has a default set of [size classes](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)\n * that you can use as a guide when designing your interface.\n */\nexport enum SizeClassIOS {\n  REGULAR = 0,\n  COMPACT = 1,\n  UNKNOWN = 2,\n}\n\n// @needsAudit\n/**\n * An enum representing the lock policies that can be applied on the web platform, modelled after\n * the [W3C specification](https://w3c.github.io/screen-orientation/#dom-orientationlocktype).\n * These values can be applied through the [`lockPlatformAsync`](#screenorientationlockplatformasyncplatforminfo)\n * method.\n */\nexport enum WebOrientationLock {\n  PORTRAIT_PRIMARY = 'portrait-primary',\n  PORTRAIT_SECONDARY = 'portrait-secondary',\n  PORTRAIT = 'portrait',\n  LANDSCAPE_PRIMARY = 'landscape-primary',\n  LANDSCAPE_SECONDARY = 'landscape-secondary',\n  LANDSCAPE = 'landscape',\n  ANY = 'any',\n  NATURAL = 'natural',\n  UNKNOWN = 'unknown',\n}\n\n// @docsMissing\nexport enum WebOrientation {\n  PORTRAIT_PRIMARY = 'portrait-primary',\n  PORTRAIT_SECONDARY = 'portrait-secondary',\n  LANDSCAPE_PRIMARY = 'landscape-primary',\n  LANDSCAPE_SECONDARY = 'landscape-secondary',\n}\n\n// @needsAudit\nexport type PlatformOrientationInfo = {\n  /**\n   * __Android Only.__ A constant to set using the Android native [API](https://developer.android.com/reference/android/R.attr.html#screenOrientation).\n   * For example, in order to set the lock policy to [unspecified](https://developer.android.com/reference/android/content/pm/ActivityInfo.html#SCREEN_ORIENTATION_UNSPECIFIED),\n   * `-1` should be passed in.\n   */\n  screenOrientationConstantAndroid?: number;\n  /**\n   * __iOS Only.__ An array of orientations to allow on the iOS platform.\n   */\n  screenOrientationArrayIOS?: Orientation[];\n  /**\n   * __Web Only.__ A web orientation lock to apply in the browser.\n   */\n  screenOrientationLockWeb?: WebOrientationLock;\n};\n\n// @needsAudit\nexport type ScreenOrientationInfo = {\n  /**\n   * The current orientation of the device.\n   */\n  orientation: Orientation;\n  /**\n   *  __iOS Only.__ The [vertical size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)\n   * of the device.\n   */\n  verticalSizeClass?: SizeClassIOS;\n  /**\n   *  __iOS Only.__ The [horizontal size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)\n   * of the device.\n   */\n  horizontalSizeClass?: SizeClassIOS;\n};\n\nexport type OrientationChangeListener = (event: OrientationChangeEvent) => void;\n\n// @needsAudit\nexport type OrientationChangeEvent = {\n  /**\n   * The current `OrientationLock` of the device.\n   */\n  orientationLock: OrientationLock;\n  /**\n   * The current `ScreenOrientationInfo` of the device.\n   */\n  orientationInfo: ScreenOrientationInfo;\n};\n"]}
+{"version":3,"file":"ScreenOrientation.types.js","sourceRoot":"","sources":["../src/ScreenOrientation.types.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,MAAM,CAAN,IAAY,WAqBX;AArBD,WAAY,WAAW;IACrB;;OAEG;IACH,mDAAW,CAAA;IACX;;OAEG;IACH,2DAAe,CAAA;IACf;;OAEG;IACH,+DAAiB,CAAA;IACjB;;OAEG;IACH,iEAAkB,CAAA;IAClB;;OAEG;IACH,mEAAmB,CAAA;AACrB,CAAC,EArBW,WAAW,KAAX,WAAW,QAqBtB;AAED,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAN,IAAY,eA0CX;AA1CD,WAAY,eAAe;IACzB;;;OAGG;IACH,2DAAW,CAAA;IACX;;OAEG;IACH,mDAAO,CAAA;IACP;;OAEG;IACH,6DAAY,CAAA;IACZ;;OAEG;IACH,mEAAe,CAAA;IACf;;OAEG;IACH,uEAAiB,CAAA;IACjB;;OAEG;IACH,+DAAa,CAAA;IACb;;OAEG;IACH,yEAAkB,CAAA;IAClB;;OAEG;IACH,2EAAmB,CAAA;IACnB;;OAEG;IACH,uDAAS,CAAA;IACT;;OAEG;IACH,2DAAW,CAAA;AACb,CAAC,EA1CW,eAAe,KAAf,eAAe,QA0C1B;AAED,cAAc;AACd;;;GAGG;AACH,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,qDAAW,CAAA;IACX,qDAAW,CAAA;IACX,qDAAW,CAAA;AACb,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAED,cAAc;AACd;;;;;GAKG;AACH,MAAM,CAAN,IAAY,kBAUX;AAVD,WAAY,kBAAkB;IAC5B,2DAAqC,CAAA;IACrC,+DAAyC,CAAA;IACzC,2CAAqB,CAAA;IACrB,6DAAuC,CAAA;IACvC,iEAA2C,CAAA;IAC3C,6CAAuB,CAAA;IACvB,iCAAW,CAAA;IACX,yCAAmB,CAAA;IACnB,yCAAmB,CAAA;AACrB,CAAC,EAVW,kBAAkB,KAAlB,kBAAkB,QAU7B;AAED,eAAe;AACf,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,uDAAqC,CAAA;IACrC,2DAAyC,CAAA;IACzC,yDAAuC,CAAA;IACvC,6DAA2C,CAAA;AAC7C,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB","sourcesContent":["// @needsAudit\nexport enum Orientation {\n  /**\n   * An unknown screen orientation. For example, the device is flat, perhaps on a table.\n   */\n  UNKNOWN = 0,\n  /**\n   * Right-side up portrait interface orientation.\n   */\n  PORTRAIT_UP = 1,\n  /**\n   * Upside down portrait interface orientation.\n   */\n  PORTRAIT_DOWN = 2,\n  /**\n   * Left landscape interface orientation.\n   */\n  LANDSCAPE_LEFT = 3,\n  /**\n   * Right landscape interface orientation.\n   */\n  LANDSCAPE_RIGHT = 4,\n}\n\n// @needsAudit\n/**\n * An enum whose values can be passed to the [`lockAsync`](#screenorientationlockasyncorientationlock)\n * method.\n * > __Note:__ `OrientationLock.ALL` and `OrientationLock.PORTRAIT` are invalid on devices which\n * don't support `OrientationLock.PORTRAIT_DOWN`.\n */\nexport enum OrientationLock {\n  /**\n   * The default orientation. On iOS, this will allow all orientations except `Orientation.PORTRAIT_DOWN`.\n   * On Android, this lets the system decide the best orientation.\n   */\n  DEFAULT = 0,\n  /**\n   * All four possible orientations\n   */\n  ALL = 1,\n  /**\n   * Any portrait orientation.\n   */\n  PORTRAIT = 2,\n  /**\n   * Right-side up portrait only.\n   */\n  PORTRAIT_UP = 3,\n  /**\n   * Upside down portrait only.\n   */\n  PORTRAIT_DOWN = 4,\n  /**\n   * Any landscape orientation.\n   */\n  LANDSCAPE = 5,\n  /**\n   * Left landscape only.\n   */\n  LANDSCAPE_LEFT = 6,\n  /**\n   * Right landscape only.\n   */\n  LANDSCAPE_RIGHT = 7,\n  /**\n   * A platform specific orientation. This is not a valid policy that can be applied in [`lockAsync`](#screenorientationlockasyncorientationlock).\n   */\n  OTHER = 8,\n  /**\n   * An unknown screen orientation lock. This is not a valid policy that can be applied in [`lockAsync`](#screenorientationlockasyncorientationlock).\n   */\n  UNKNOWN = 9,\n}\n\n// @needsAudit\n/**\n * Each iOS device has a default set of [size classes](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)\n * that you can use as a guide when designing your interface.\n */\nexport enum SizeClassIOS {\n  REGULAR = 0,\n  COMPACT = 1,\n  UNKNOWN = 2,\n}\n\n// @needsAudit\n/**\n * An enum representing the lock policies that can be applied on the web platform, modelled after\n * the [W3C specification](https://w3c.github.io/screen-orientation/#dom-orientationlocktype).\n * These values can be applied through the [`lockPlatformAsync`](#screenorientationlockplatformasyncplatforminfo)\n * method.\n */\nexport enum WebOrientationLock {\n  PORTRAIT_PRIMARY = 'portrait-primary',\n  PORTRAIT_SECONDARY = 'portrait-secondary',\n  PORTRAIT = 'portrait',\n  LANDSCAPE_PRIMARY = 'landscape-primary',\n  LANDSCAPE_SECONDARY = 'landscape-secondary',\n  LANDSCAPE = 'landscape',\n  ANY = 'any',\n  NATURAL = 'natural',\n  UNKNOWN = 'unknown',\n}\n\n// @docsMissing\nexport enum WebOrientation {\n  PORTRAIT_PRIMARY = 'portrait-primary',\n  PORTRAIT_SECONDARY = 'portrait-secondary',\n  LANDSCAPE_PRIMARY = 'landscape-primary',\n  LANDSCAPE_SECONDARY = 'landscape-secondary',\n}\n\n// @needsAudit\nexport type PlatformOrientationInfo = {\n  /**\n   * A constant to set using the Android native [API](https://developer.android.com/reference/android/R.attr.html#screenOrientation).\n   * For example, in order to set the lock policy to [unspecified](https://developer.android.com/reference/android/content/pm/ActivityInfo.html#SCREEN_ORIENTATION_UNSPECIFIED),\n   * `-1` should be passed in.\n   * @platform android\n   */\n  screenOrientationConstantAndroid?: number;\n  /**\n   * An array of orientations to allow on the iOS platform.\n   * @platform ios\n   */\n  screenOrientationArrayIOS?: Orientation[];\n  /**\n   * A web orientation lock to apply in the browser.\n   * @platform web\n   */\n  screenOrientationLockWeb?: WebOrientationLock;\n};\n\n// @needsAudit\nexport type ScreenOrientationInfo = {\n  /**\n   * The current orientation of the device.\n   */\n  orientation: Orientation;\n  /**\n   * The [vertical size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)\n   * of the device.\n   * @platform ios\n   */\n  verticalSizeClass?: SizeClassIOS;\n  /**\n   * The [horizontal size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)\n   * of the device.\n   * @platform ios\n   */\n  horizontalSizeClass?: SizeClassIOS;\n};\n\nexport type OrientationChangeListener = (event: OrientationChangeEvent) => void;\n\n// @needsAudit\nexport type OrientationChangeEvent = {\n  /**\n   * The current `OrientationLock` of the device.\n   */\n  orientationLock: OrientationLock;\n  /**\n   * The current `ScreenOrientationInfo` of the device.\n   */\n  orientationInfo: ScreenOrientationInfo;\n};\n"]}

package/expo-module.config.json

@@ -0,0 +1,8 @@
+{
+  "name": "expo-screen-orientation",
+  "platforms": ["ios", "android"],
+  "ios": {
+    "appDelegateSubscribers": ["ScreenOrientationAppDelegate"],
+    "reactDelegateHandlers": ["ScreenOrientationReactDelegateHandler"]
+  }
+}

package/ios/EXScreenOrientation/EXScreenOrientationRegistry.h

@@ -2,7 +2,7 @@
 
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
-#import <ExpoModulesCore/EXSingletonModule.h>
+#import <ExpoModulesCore/ExpoModulesCore.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface EXScreenOrientationRegistry : EXSingletonModule <UIApplicationDelegate, EXScreenOrientationEventEmitter, EXScreenOrientationRegistry>
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(nullable NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions;
+- (void)updateCurrentScreenOrientation;
 
 - (UIInterfaceOrientationMask)requiredOrientationMask;
 - (void)traitCollectionDidChangeTo:(UITraitCollection *)traitCollection;

package/ios/EXScreenOrientation/EXScreenOrientationRegistry.m

@@ -42,9 +42,9 @@ EX_REGISTER_SINGLETON_MODULE(ScreenOrientationRegistry)
   return self;
 }
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions
+- (void)updateCurrentScreenOrientation
 {
-  // application:didFinishLaunchingWithOptions should be executed on the main thread.
+  // This should already be executed on the main thread.
   // However, it's safer to ensure that we are on a good thread.
   EX_WEAKIFY(self);
   [EXUtilities performSynchronouslyOnMainThread:^{
@@ -59,8 +59,6 @@ EX_REGISTER_SINGLETON_MODULE(ScreenOrientationRegistry)
       self.currentScreenOrientation = UIApplication.sharedApplication.statusBarOrientation;
     }
   }];
-  
-  return YES;
 }
 
 - (void)dealloc

package/ios/EXScreenOrientation/EXScreenOrientationViewController.h

@@ -9,4 +9,6 @@
 
 - (instancetype)initWithDefaultScreenOrientationMask:(UIInterfaceOrientationMask)defaultOrientationMask;
 
+- (instancetype)initDefaultScreenOrientationFromPlist;
+
 @end

package/ios/EXScreenOrientation/EXScreenOrientationViewController.m

@@ -4,6 +4,9 @@
 
 #import <EXScreenOrientation/EXScreenOrientationViewController.h>
 #import <EXScreenOrientation/EXScreenOrientationRegistry.h>
+#import <EXScreenOrientation/NSString+UIInterfaceOrientationMask.h>
+
+NSString *const EXDefaultScreenOrientationMask = @"EXDefaultScreenOrientationMask";
 
 // copy of RNScreens protocol
 @protocol EXScreenOrientationRNSScreenWindowTraits
@@ -34,6 +37,20 @@
   return self;
 }
 
+- (instancetype)initDefaultScreenOrientationFromPlist
+{
+  NSString *plistValue = [NSBundle.mainBundle objectForInfoDictionaryKey:EXDefaultScreenOrientationMask];
+  if (plistValue != nil) {
+    @try {
+      UIInterfaceOrientationMask mask = [plistValue toUIInterfaceOrientationMask];
+      return [self initWithDefaultScreenOrientationMask:mask];
+    } @catch (NSException *exception) {
+      EXLogError(@"Invalid `%@` value in Info.plist, expected: one of `UIInterfaceOrientationMask` value, got: \"%@\".", EXDefaultScreenOrientationMask, plistValue);
+    }
+  }
+  return [self init];
+}
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
   if ([self shouldUseRNScreenOrientation]) {

package/ios/EXScreenOrientation/NSString+UIInterfaceOrientationMask.h

@@ -0,0 +1,9 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <UIKit/UIKit.h>
+
+@interface NSString (UIInterfaceOrientationMask)
+
+- (UIInterfaceOrientationMask)toUIInterfaceOrientationMask;
+
+@end

package/ios/EXScreenOrientation/NSString+UIInterfaceOrientationMask.m

@@ -0,0 +1,21 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import <EXScreenOrientation/NSString+UIInterfaceOrientationMask.h>
+
+@implementation NSString (UIInterfaceOrientationMask)
+
+- (UIInterfaceOrientationMask)toUIInterfaceOrientationMask
+{
+#define RETURN_VALUE_CHECKED(OPTION) if ([self isEqualToString:@#OPTION]) { return OPTION; }
+  RETURN_VALUE_CHECKED(UIInterfaceOrientationMaskPortrait)
+  RETURN_VALUE_CHECKED(UIInterfaceOrientationMaskLandscapeLeft)
+  RETURN_VALUE_CHECKED(UIInterfaceOrientationMaskLandscapeRight)
+  RETURN_VALUE_CHECKED(UIInterfaceOrientationMaskPortraitUpsideDown)
+  RETURN_VALUE_CHECKED(UIInterfaceOrientationMaskLandscape)
+  RETURN_VALUE_CHECKED(UIInterfaceOrientationMaskAll)
+  RETURN_VALUE_CHECKED(UIInterfaceOrientationMaskAllButUpsideDown)
+#undef RETURN_VALUE_CHECKED
+  @throw [NSException exceptionWithName:NSInvalidArgumentException reason:@"Invalid UIInterfaceOrientationMask value" userInfo:nil];
+}
+
+@end

package/ios/EXScreenOrientation/ScreenOrientationAppDelegate.swift

@@ -0,0 +1,12 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+
+public class ScreenOrientationAppDelegate: ExpoAppDelegateSubscriber {
+  public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    if let screenOrientationRegistry = ModuleRegistryProvider.getSingletonModule(for: EXScreenOrientationRegistry.self) as? EXScreenOrientationRegistry {
+      screenOrientationRegistry.updateCurrentScreenOrientation()
+    }
+    return true
+  }
+}

package/ios/EXScreenOrientation/ScreenOrientationReactDelegateHandler.swift

@@ -0,0 +1,9 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+
+public class ScreenOrientationReactDelegateHandler: ExpoReactDelegateHandler {
+  public override func createRootViewController(reactDelegate: ExpoReactDelegate) -> UIViewController? {
+    return EXScreenOrientationViewController(defaultScreenOrientationFromPlist: ());
+  }
+}

package/ios/EXScreenOrientation.podspec

@@ -11,16 +11,22 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform       = :ios, '12.0'
+  s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
   s.dependency 'React-Core'
 
+  # Swift/Objective-C compatibility
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES'
+  }
+
   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
     s.source_files = "#{s.name}/**/*.h"
     s.vendored_frameworks = "#{s.name}.xcframework"
   else
-    s.source_files = "#{s.name}/**/*.{h,m}"
+    s.source_files = "#{s.name}/**/*.{h,m,swift}"
   end
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-screen-orientation",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Expo universal module for managing device's screen orientation",
   "main": "build/ScreenOrientation.js",
   "types": "build/ScreenOrientation.d.ts",
@@ -36,11 +36,13 @@
     "preset": "expo-module-scripts"
   },
   "dependencies": {
-    "@expo/config-plugins": "^3.1.0",
-    "expo-modules-core": "~0.4.0"
+    "@expo/config-plugins": "^4.0.2"
   },
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "1fffde73411ee7a642b98f1506a8de921805d52b"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "2e5c6983b86d5ecfca028ba64002897d8adc2cc4"
 }

package/plugin/build/withScreenOrientation.d.ts

@@ -1,5 +1,22 @@
-import { ConfigPlugin } from '@expo/config-plugins';
-export declare function modifyObjcAppDelegate(contents: string, mask: string): string;
+import { ConfigPlugin, InfoPlist } from '@expo/config-plugins';
+import { ExpoConfig } from '@expo/config-types';
+export declare const INITIAL_ORIENTATION_KEY = "EXDefaultScreenOrientationMask";
+declare const OrientationLock: {
+    DEFAULT: string;
+    ALL: string;
+    PORTRAIT: string;
+    PORTRAIT_UP: string;
+    PORTRAIT_DOWN: string;
+    LANDSCAPE: string;
+    LANDSCAPE_LEFT: string;
+    LANDSCAPE_RIGHT: string;
+};
+declare type OrientationMasks = keyof typeof OrientationLock;
+interface ExpoConfigWithInitialOrientation extends ExpoConfig {
+    initialOrientation?: OrientationMasks;
+}
+export declare function getInitialOrientation(config: Pick<ExpoConfigWithInitialOrientation, 'initialOrientation'>): OrientationMasks;
+export declare function setInitialOrientation(config: Pick<ExpoConfigWithInitialOrientation, 'initialOrientation'>, infoPlist: InfoPlist): InfoPlist;
 declare const _default: ConfigPlugin<void | {
     initialOrientation?: "DEFAULT" | "ALL" | "PORTRAIT" | "PORTRAIT_UP" | "PORTRAIT_DOWN" | "LANDSCAPE" | "LANDSCAPE_LEFT" | "LANDSCAPE_RIGHT" | undefined;
 }>;

package/plugin/build/withScreenOrientation.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.modifyObjcAppDelegate = void 0;
+exports.setInitialOrientation = exports.getInitialOrientation = exports.INITIAL_ORIENTATION_KEY = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const assert_1 = __importDefault(require("assert"));
-const fs_1 = __importDefault(require("fs"));
 const pkg = require('expo-screen-orientation/package.json');
+// This value must match the `EXDefaultScreenOrientationMask` string used in `expo-screen-orientation/ios/EXScreenOrientation/EXScreenOrientationViewController.m` (do not change).
+exports.INITIAL_ORIENTATION_KEY = 'EXDefaultScreenOrientationMask';
 const OrientationLock = {
     DEFAULT: 'UIInterfaceOrientationMaskAllButUpsideDown',
     ALL: 'UIInterfaceOrientationMaskAll',
@@ -18,36 +19,32 @@ const OrientationLock = {
     LANDSCAPE_LEFT: 'UIInterfaceOrientationMaskLandscapeLeft',
     LANDSCAPE_RIGHT: 'UIInterfaceOrientationMaskLandscapeRight',
 };
-function modifyObjcAppDelegate(contents, mask) {
-    // Add import
-    if (!contents.includes('#import <EXScreenOrientation/EXScreenOrientationViewController.h>')) {
-        contents = contents.replace(/#import "AppDelegate.h"/g, `#import "AppDelegate.h"
-#import <EXScreenOrientation/EXScreenOrientationViewController.h>`);
+const withScreenOrientationViewController = (config, { initialOrientation = 'DEFAULT' } = {}) => {
+    config = (0, config_plugins_1.withInfoPlist)(config, (config) => {
+        const extendedConfig = {
+            ...config,
+            initialOrientation,
+        };
+        config.modResults = setInitialOrientation(extendedConfig, config.modResults);
+        return config;
+    });
+    return config;
+};
+function getInitialOrientation(config) {
+    var _a;
+    return (_a = config.initialOrientation) !== null && _a !== void 0 ? _a : 'DEFAULT';
+}
+exports.getInitialOrientation = getInitialOrientation;
+function setInitialOrientation(config, infoPlist) {
+    const initialOrientation = getInitialOrientation(config);
+    (0, assert_1.default)(initialOrientation in OrientationLock, `Invalid initial orientation "${initialOrientation}" expected one of: ${Object.keys(OrientationLock).join(', ')}`);
+    if (initialOrientation === 'DEFAULT') {
+        delete infoPlist[exports.INITIAL_ORIENTATION_KEY];
     }
-    // Change View Controller
-    if (!contents.includes('[EXScreenOrientationViewController alloc]')) {
-        contents = contents.replace(/UIViewController\s?\*\s?rootViewController\s?=\s?\[UIViewController new\];/g, `UIViewController *rootViewController = [[EXScreenOrientationViewController alloc] initWithDefaultScreenOrientationMask:${mask}];`);
+    else {
+        infoPlist[exports.INITIAL_ORIENTATION_KEY] = OrientationLock[initialOrientation];
     }
-    return contents;
+    return infoPlist;
 }
-exports.modifyObjcAppDelegate = modifyObjcAppDelegate;
-const withScreenOrientationViewController = (config, { initialOrientation = 'DEFAULT' } = {}) => {
-    assert_1.default(initialOrientation in OrientationLock, `Invalid initial orientation "${initialOrientation}" expected one of: ${Object.keys(OrientationLock).join(', ')}`);
-    return config_plugins_1.withDangerousMod(config, [
-        'ios',
-        async (config) => {
-            const fileInfo = config_plugins_1.IOSConfig.Paths.getAppDelegate(config.modRequest.projectRoot);
-            let contents = fs_1.default.readFileSync(fileInfo.path, { encoding: 'utf-8' });
-            if (fileInfo.language === 'objc') {
-                contents = modifyObjcAppDelegate(contents, OrientationLock[initialOrientation]);
-            }
-            else {
-                // TODO: Support Swift
-                throw new Error(`Cannot append screen orientation view controller to AppDelegate of language "${fileInfo.language}"`);
-            }
-            fs_1.default.writeFileSync(fileInfo.path, contents);
-            return config;
-        },
-    ]);
-};
-exports.default = config_plugins_1.createRunOncePlugin(withScreenOrientationViewController, pkg.name, pkg.version);
+exports.setInitialOrientation = setInitialOrientation;
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withScreenOrientationViewController, pkg.name, pkg.version);

package/plugin/src/withScreenOrientation.ts

@@ -1,14 +1,12 @@
-import {
-  ConfigPlugin,
-  createRunOncePlugin,
-  IOSConfig,
-  withDangerousMod,
-} from '@expo/config-plugins';
+import { ConfigPlugin, createRunOncePlugin, InfoPlist, withInfoPlist } from '@expo/config-plugins';
+import { ExpoConfig } from '@expo/config-types';
 import assert from 'assert';
-import fs from 'fs';
 
 const pkg = require('expo-screen-orientation/package.json');
 
+// This value must match the `EXDefaultScreenOrientationMask` string used in `expo-screen-orientation/ios/EXScreenOrientation/EXScreenOrientationViewController.m` (do not change).
+export const INITIAL_ORIENTATION_KEY = 'EXDefaultScreenOrientationMask';
+
 const OrientationLock = {
   DEFAULT: 'UIInterfaceOrientationMaskAllButUpsideDown',
   ALL: 'UIInterfaceOrientationMaskAll',
@@ -20,29 +18,39 @@ const OrientationLock = {
   LANDSCAPE_RIGHT: 'UIInterfaceOrientationMaskLandscapeRight',
 };
 
-export function modifyObjcAppDelegate(contents: string, mask: string): string {
-  // Add import
-  if (!contents.includes('#import <EXScreenOrientation/EXScreenOrientationViewController.h>')) {
-    contents = contents.replace(
-      /#import "AppDelegate.h"/g,
-      `#import "AppDelegate.h"
-#import <EXScreenOrientation/EXScreenOrientationViewController.h>`
-    );
-  }
+type OrientationMasks = keyof typeof OrientationLock;
 
-  // Change View Controller
-  if (!contents.includes('[EXScreenOrientationViewController alloc]')) {
-    contents = contents.replace(
-      /UIViewController\s?\*\s?rootViewController\s?=\s?\[UIViewController new\];/g,
-      `UIViewController *rootViewController = [[EXScreenOrientationViewController alloc] initWithDefaultScreenOrientationMask:${mask}];`
-    );
-  }
-  return contents;
+// `initialOrientation` is not public in expo config yet, we just use it as an internal type.
+interface ExpoConfigWithInitialOrientation extends ExpoConfig {
+  initialOrientation?: OrientationMasks;
 }
 
 const withScreenOrientationViewController: ConfigPlugin<{
   initialOrientation?: keyof typeof OrientationLock;
 } | void> = (config, { initialOrientation = 'DEFAULT' } = {}) => {
+  config = withInfoPlist(config, (config) => {
+    const extendedConfig = {
+      ...config,
+      initialOrientation,
+    };
+    config.modResults = setInitialOrientation(extendedConfig, config.modResults);
+    return config;
+  });
+  return config;
+};
+
+export function getInitialOrientation(
+  config: Pick<ExpoConfigWithInitialOrientation, 'initialOrientation'>
+): OrientationMasks {
+  return config.initialOrientation ?? 'DEFAULT';
+}
+
+export function setInitialOrientation(
+  config: Pick<ExpoConfigWithInitialOrientation, 'initialOrientation'>,
+  infoPlist: InfoPlist
+): InfoPlist {
+  const initialOrientation = getInitialOrientation(config);
+
   assert(
     initialOrientation in OrientationLock,
     `Invalid initial orientation "${initialOrientation}" expected one of: ${Object.keys(
@@ -50,24 +58,12 @@ const withScreenOrientationViewController: ConfigPlugin<{
     ).join(', ')}`
   );
 
-  return withDangerousMod(config, [
-    'ios',
-    async (config) => {
-      const fileInfo = IOSConfig.Paths.getAppDelegate(config.modRequest.projectRoot);
-      let contents = fs.readFileSync(fileInfo.path, { encoding: 'utf-8' });
-      if (fileInfo.language === 'objc') {
-        contents = modifyObjcAppDelegate(contents, OrientationLock[initialOrientation]);
-      } else {
-        // TODO: Support Swift
-        throw new Error(
-          `Cannot append screen orientation view controller to AppDelegate of language "${fileInfo.language}"`
-        );
-      }
-      fs.writeFileSync(fileInfo.path, contents);
-
-      return config;
-    },
-  ]);
-};
+  if (initialOrientation === 'DEFAULT') {
+    delete infoPlist[INITIAL_ORIENTATION_KEY];
+  } else {
+    infoPlist[INITIAL_ORIENTATION_KEY] = OrientationLock[initialOrientation];
+  }
+  return infoPlist;
+}
 
 export default createRunOncePlugin(withScreenOrientationViewController, pkg.name, pkg.version);

package/src/ScreenOrientation.types.ts

@@ -114,17 +114,20 @@ export enum WebOrientation {
 // @needsAudit
 export type PlatformOrientationInfo = {
   /**
-   * __Android Only.__ A constant to set using the Android native [API](https://developer.android.com/reference/android/R.attr.html#screenOrientation).
+   * A constant to set using the Android native [API](https://developer.android.com/reference/android/R.attr.html#screenOrientation).
    * For example, in order to set the lock policy to [unspecified](https://developer.android.com/reference/android/content/pm/ActivityInfo.html#SCREEN_ORIENTATION_UNSPECIFIED),
    * `-1` should be passed in.
+   * @platform android
    */
   screenOrientationConstantAndroid?: number;
   /**
-   * __iOS Only.__ An array of orientations to allow on the iOS platform.
+   * An array of orientations to allow on the iOS platform.
+   * @platform ios
    */
   screenOrientationArrayIOS?: Orientation[];
   /**
-   * __Web Only.__ A web orientation lock to apply in the browser.
+   * A web orientation lock to apply in the browser.
+   * @platform web
    */
   screenOrientationLockWeb?: WebOrientationLock;
 };
@@ -136,13 +139,15 @@ export type ScreenOrientationInfo = {
    */
   orientation: Orientation;
   /**
-   *  __iOS Only.__ The [vertical size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
+   * The [vertical size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
    * of the device.
+   * @platform ios
    */
   verticalSizeClass?: SizeClassIOS;
   /**
-   *  __iOS Only.__ The [horizontal size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
+   * The [horizontal size class](https://developer.apple.com/library/archive/featuredarticles/ViewControllerPGforiPhoneOS/TheAdaptiveModel.html)
    * of the device.
+   * @platform ios
    */
   horizontalSizeClass?: SizeClassIOS;
 };

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-screen-orientation",
-  "platforms": ["ios", "android"]
-}