expo-splash-screen 0.12.0 → 0.13.3

package/.expo/tsconfig.jest.json

@@ -1,5 +1,5 @@
 {
-  "extends": "/Users/tomasz/Work/expo/packages/expo-splash-screen/tsconfig.json",
+  "extends": "/Users/brentvatne/code/expo/packages/expo-splash-screen/tsconfig.json",
   "compilerOptions": {
     "module": "esnext",
     "typeRoots": [
@@ -7,7 +7,7 @@
       "../node_modules/@types",
       "../../node_modules/@types",
       "../../../node_modules/@types",
-      "/Users/tomasz/Work/expo/packages/expo-module-scripts/ts-declarations"
+      "/Users/brentvatne/code/expo/packages/expo-module-scripts/ts-declarations"
     ]
   }
 }

package/CHANGELOG.md

@@ -10,6 +10,37 @@
 
 ### 💡 Others
 
+## 0.13.3 — 2021-10-15
+
+### 🐛 Bug fixes
+
+- Fix `No native splash screen registered for given view controller` error happening when project is using both `expo-dev-client` and `expo-splash-screen` packages. ([#14745](https://github.com/expo/expo/pull/14745) by [@kudo](https://github.com/kudo))
+
+## 0.13.2 — 2021-10-15
+
+_This version does not introduce any user-facing changes._
+
+## 0.13.1 — 2021-10-01
+
+### 🐛 Bug fixes
+
+- Fix expo-screen-orientation breaking for expo-updates + expo-splash-screen integration. ([#14519](https://github.com/expo/expo/pull/14519) by [@kudo](https://github.com/kudo))
+
+## 0.13.0 — 2021-09-28
+
+### 🛠 Breaking changes
+
+- Dropped support for iOS 11.0 ([#14383](https://github.com/expo/expo/pull/14383) by [@cruzach](https://github.com/cruzach))
+
+### 🐛 Bug fixes
+
+- Fix 'No native splash screen registered' warning from reloading apps. ([#14467](https://github.com/expo/expo/pull/14467) by [@kudo](https://github.com/kudo))
+- Fix building errors from use_frameworks! in Podfile. ([#14523](https://github.com/expo/expo/pull/14523) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Updated `@expo/configure-splash-screen`, `@expo/prebuild-config` ([#14443](https://github.com/expo/expo/pull/14443) by [@EvanBacon](https://github.com/EvanBacon))
+
 ## 0.12.0 — 2021-09-09
 
 ### 🎉 New features

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.12.0'
+version = '0.13.3'
 
 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 17
-    versionName '0.12.0'
+    versionName '0.13.3'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/splashscreen/NativeResourcesBasedSplashScreenViewProvider.kt

@@ -4,6 +4,11 @@ import android.content.Context
 import androidx.core.content.ContextCompat
 
 // this needs to stay for versioning to work
+/* ktlint-disable no-unused-imports */
+import expo.modules.splashscreen.SplashScreenImageResizeMode
+import expo.modules.splashscreen.SplashScreenViewProvider
+// EXPO_VERSIONING_NEEDS_EXPOVIEW_R
+/* ktlint-enable no-unused-imports */
 
 /**
  * Default implementation that uses native resources.

package/android/src/main/java/expo/modules/splashscreen/SplashScreenReactActivityLifecycleListener.kt

@@ -8,6 +8,12 @@ import com.facebook.react.ReactRootView
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 import expo.modules.splashscreen.singletons.SplashScreen
 
+// this needs to stay for versioning to work
+/* ktlint-disable no-unused-imports */
+import expo.modules.splashscreen.SplashScreenImageResizeMode
+// EXPO_VERSIONING_NEEDS_EXPOVIEW_R
+/* ktlint-enable no-unused-imports */
+
 class SplashScreenReactActivityLifecycleListener(activityContext: Context) : ReactActivityLifecycleListener {
   override fun onCreate(activity: Activity, savedInstanceState: Bundle?) {
     // To support backward compatible or SplashScreenImageResizeMode customization

package/android/src/main/java/expo/modules/splashscreen/SplashScreenView.kt

@@ -6,6 +6,11 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.RelativeLayout
 
+// this needs to stay for versioning to work
+/* ktlint-disable no-unused-imports */
+import expo.modules.splashscreen.SplashScreenImageResizeMode
+/* ktlint-enable no-unused-imports */
+
 @SuppressLint("ViewConstructor")
 class SplashScreenView(
   context: Context

package/ios/EXSplashScreen/EXSplashScreenService.m

@@ -4,12 +4,22 @@
 #import <EXSplashScreen/EXSplashScreenViewNativeProvider.h>
 #import <ExpoModulesCore/EXDefines.h>
 
-NSString * const kRootViewController = @"rootViewController";
+static NSString * const kRootViewController = @"rootViewController";
+static NSString * const kView = @"view";
 
 @interface EXSplashScreenService ()
 
 @property (nonatomic, strong) NSMapTable<UIViewController *, EXSplashScreenViewController *> *splashScreenControllers;
-@property (nonatomic, assign) BOOL isObservingRootViewController;
+/**
+ * This module holds a reference to rootViewController acting as a flag to indicate KVO is enabled.
+ * When KVO is enabled, actually we are observing two targets and re-show splash screen if targets changed:
+ *   - `keyWindow.rootViewController`: it is for expo-dev-client which replaced it in startup.
+ *   - `rootViewController.rootView`: it is for expo-updates which replaced it in startup.
+ *
+ * If `rootViewController` is changed, we also need the old `rootViewController` to unregister rootView KVO.
+ * That's why we keep a weak reference here but not a boolean flag.
+ */
+@property (nonatomic, weak) UIViewController *observingRootViewController;
 
 @end
 
@@ -21,7 +31,6 @@ EX_REGISTER_SINGLETON_MODULE(SplashScreen);
 {
   if (self = [super init]) {
     _splashScreenControllers = [NSMapTable weakToStrongObjectsMapTable];
-    _isObservingRootViewController = NO;
   }
   return self;
 }
@@ -92,19 +101,8 @@ EX_REGISTER_SINGLETON_MODULE(SplashScreen);
   }
   [self removeRootViewControllerListener];
 
-  EXSplashScreenViewController *splashScreenViewController = [self.splashScreenControllers objectForKey:viewController];
-  EX_WEAKIFY(self);
-  return [splashScreenViewController
-      hideWithCallback:^(BOOL hasEffect) {
-        EX_ENSURE_STRONGIFY(self);
-        [self.splashScreenControllers removeObjectForKey:viewController];
-        successCallback(hasEffect);
-      }
-      failureCallback:^(NSString *message) {
-        EX_ENSURE_STRONGIFY(self);
-        [self.splashScreenControllers removeObjectForKey:viewController];
-        failureCallback(message);
-      }];
+  return [[self.splashScreenControllers objectForKey:viewController] hideWithCallback:successCallback
+                                                                      failureCallback:failureCallback];
 }
 
 - (void)onAppContentDidAppear:(UIViewController *)viewController
@@ -152,18 +150,26 @@ EX_REGISTER_SINGLETON_MODULE(SplashScreen);
 - (void)addRootViewControllerListener
 {
   NSAssert([NSThread isMainThread], @"Method must be called on main thread");
-  if (!_isObservingRootViewController) {
-    [UIApplication.sharedApplication.keyWindow addObserver:self forKeyPath:kRootViewController options:NSKeyValueObservingOptionNew context:nil];
-    _isObservingRootViewController = YES;
+  if (self.observingRootViewController == nil) {
+    UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
+
+    [UIApplication.sharedApplication.keyWindow addObserver:self
+                                                forKeyPath:kRootViewController
+                                                   options:NSKeyValueObservingOptionNew
+                                                   context:nil];
+
+    [rootViewController addObserver:self forKeyPath:kView options:NSKeyValueObservingOptionNew context:nil];
+    self.observingRootViewController = rootViewController;
   }
 }
 
 - (void)removeRootViewControllerListener
 {
   NSAssert([NSThread isMainThread], @"Method must be called on main thread");
-  if (_isObservingRootViewController) {
+  if (self.observingRootViewController != nil) {
     [UIApplication.sharedApplication.keyWindow removeObserver:self forKeyPath:kRootViewController context:nil];
-    _isObservingRootViewController = NO;
+    [self.observingRootViewController removeObserver:self forKeyPath:kView context:nil];
+    self.observingRootViewController = nil;
   }
 }
 
@@ -172,7 +178,20 @@ EX_REGISTER_SINGLETON_MODULE(SplashScreen);
   if (object == UIApplication.sharedApplication.keyWindow && [keyPath isEqualToString:kRootViewController]) {
     UIViewController *newRootViewController = change[@"new"];
     if (newRootViewController != nil) {
+      [self removeRootViewControllerListener];
       [self showSplashScreenFor:newRootViewController];
+      [self addRootViewControllerListener];
+    }
+  }
+  if (object == UIApplication.sharedApplication.keyWindow.rootViewController && [keyPath isEqualToString:kView]) {
+    UIView *newView = change[@"new"];
+    if (newView != nil && [newView.nextResponder isKindOfClass:[UIViewController class]]) {
+      UIViewController *viewController = (UIViewController *)newView.nextResponder;
+      // To show splash screen as soon as possible, we do not wait for hiding callback and call showSplashScreen immediately.
+      // GCD main queue should keep the calls in sequence.
+      [self hideSplashScreenFor:viewController successCallback:^(BOOL hasEffect){} failureCallback:^(NSString *message){}];
+      [self.splashScreenControllers removeObjectForKey:viewController];
+      [self showSplashScreenFor:viewController];
     }
   }
 }

package/ios/EXSplashScreen.podspec

@@ -10,8 +10,9 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '11.0'
+  s.platform       = :ios, '12.0'
   s.source         = { git: 'https://github.com/expo/expo.git' }
+  s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
   s.dependency 'React-Core'

package/ios/EXSplashScreen.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>EXSplashScreen.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>EXSplashScreen.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-splash-screen",
-  "version": "0.12.0",
+  "version": "0.13.3",
   "description": "Provides a module to allow keeping the native Splash Screen visible until you choose to hide it.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,12 +37,12 @@
     "preset": "expo-module-scripts"
   },
   "dependencies": {
-    "@expo/configure-splash-screen": "0.5.0",
-    "@expo/prebuild-config": "^2.0.0",
-    "expo-modules-core": "~0.3.1"
+    "@expo/configure-splash-screen": "^0.6.0",
+    "@expo/prebuild-config": "^3.0.0",
+    "expo-modules-core": "~0.4.4"
   },
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "fe74edd44933f9f00a023544cafc4713594892fb"
+  "gitHead": "e30402e90972d9e1838d7b63a40a71a41398a772"
 }