expo-system-ui 1.0.0 → 1.2.0

package/CHANGELOG.md

@@ -10,6 +10,33 @@
 
 ### 💡 Others
 
-## 1.0.0 — 2021-11-09
+## 1.2.0 — 2022-04-18
 
-_This version does not introduce any user-facing changes._
+### 💡 Others
+
+- Updated `@expo/config-plugins` from `4.0.2` to `4.0.14` ([#15621](https://github.com/expo/expo/pull/15621) by [@EvanBacon](https://github.com/EvanBacon))
+
+### ⚠️ Notices
+
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+## 1.1.1 - 2022-02-01
+
+### 🐛 Bug fixes
+
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
+
+## 1.1.0 — 2021-12-03
+
+### 🛠 Breaking changes
+
+- Change iOS to set the background color of the first view controller in the hierarchy instead of the current active view controller. ([#15146](https://github.com/expo/expo/pull/15146) by [@EvanBacon](https://github.com/EvanBacon))
+
+### 🎉 New features
+
+- iOS now sets the background color of the base window to support native-stack modals. ([#15146](https://github.com/expo/expo/pull/15146) by [@EvanBacon](https://github.com/EvanBacon))
+- Initial background color on iOS will now be set inside the module instead of in the template. ([#15146](https://github.com/expo/expo/pull/15146) by [@EvanBacon](https://github.com/EvanBacon))
+
+### 🐛 Bug fixes
+
+- Fix `getBackgroundColorAsync` return type. ([#15127](https://github.com/expo/expo/pull/15127) by [@EvanBacon](https://github.com/EvanBacon))

package/README.md

@@ -4,7 +4,7 @@
 
 ## API documentation
 
-- [Documentation for the master branch][docs-main]
+- [Documentation for the main branch][docs-main]
 - [Documentation for the latest stable release][docs-stable]
 
 ### Installation
@@ -21,7 +21,7 @@ For bare React Native projects, ensure that you have the [native `expo` package]
 
 Contributions are very welcome! Please refer to guidelines described in the [contributing guide][contributing].
 
-[docs-main]: https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/system-ui.md
+[docs-main]: https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/system-ui.md
 [docs-stable]: https://docs.expo.dev/versions/latest/sdk/system-ui/
 [contributing]: https://github.com/expo/expo#contributing
 [expo-modules]: https://docs.expo.dev/bare/installing-expo-modules/

package/android/build.gradle

@@ -1,67 +1,80 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '1.0.0'
+version = '1.2.0'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.4.21')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
-// Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
 // Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-// Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
   }
 
   kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName '1.0.0'
+    versionName '1.2.0'
   }
   lintOptions {
     abortOnError false
@@ -73,7 +86,7 @@ dependencies {
 
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.4.21')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
   implementation 'androidx.core:core:1.6.0'
   implementation 'androidx.appcompat:appcompat:1.2.0'
 }

package/build/ExpoSystemUI.d.ts

@@ -1,2 +1,3 @@
 declare const _default: import("expo-modules-core").ProxyNativeModule;
 export default _default;
+//# sourceMappingURL=ExpoSystemUI.d.ts.map

package/build/ExpoSystemUI.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoSystemUI.d.ts","sourceRoot":"","sources":["../src/ExpoSystemUI.ts"],"names":[],"mappings":";AAEA,wBAAqD"}

package/build/ExpoSystemUI.web.d.ts

@@ -4,3 +4,4 @@ declare const _default: {
     setBackgroundColorAsync(color: string): void;
 };
 export default _default;
+//# sourceMappingURL=ExpoSystemUI.web.d.ts.map

package/build/ExpoSystemUI.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExpoSystemUI.web.d.ts","sourceRoot":"","sources":["../src/ExpoSystemUI.web.ts"],"names":[],"mappings":";;;mCAeiC,MAAM;;AAXvC,wBAgBE"}

package/build/SystemUI.d.ts

@@ -16,6 +16,7 @@ export declare function setBackgroundColorAsync(color: ColorValue): Promise<void
  * ```ts
  * const color = await SystemUI.getBackgroundColorAsync();
  * ```
- * @returns Current root view background color in hex format.
+ * @returns Current root view background color in hex format. Returns `null` if the background color is not set.
  */
-export declare function getBackgroundColorAsync(): Promise<ColorValue>;
+export declare function getBackgroundColorAsync(): Promise<ColorValue | null>;
+//# sourceMappingURL=SystemUI.d.ts.map

package/build/SystemUI.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SystemUI.d.ts","sourceRoot":"","sources":["../src/SystemUI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgB,MAAM,cAAc,CAAC;AAIxD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAE1E"}

package/build/SystemUI.js

@@ -20,7 +20,7 @@ export async function setBackgroundColorAsync(color) {
  * ```ts
  * const color = await SystemUI.getBackgroundColorAsync();
  * ```
- * @returns Current root view background color in hex format.
+ * @returns Current root view background color in hex format. Returns `null` if the background color is not set.
  */
 export async function getBackgroundColorAsync() {
     return await ExpoSystemUI.getBackgroundColorAsync();

package/build/SystemUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"SystemUI.js","sourceRoot":"","sources":["../src/SystemUI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,KAAiB;IAC7D,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,MAAM,YAAY,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;AACjE,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB;IAC3C,OAAO,MAAM,YAAY,CAAC,uBAAuB,EAAE,CAAC;AACtD,CAAC","sourcesContent":["import { ColorValue, processColor } from 'react-native';\n\nimport ExpoSystemUI from './ExpoSystemUI';\n\n/**\n * Changes the root view background color.\n *\n * @example\n * ```ts\n * SystemUI.setBackgroundColorAsync(\"white\");\n * ```\n * @param color Any valid [CSS 3 (SVG) color](http://www.w3.org/TR/css3-color/#svg-color).\n */\nexport async function setBackgroundColorAsync(color: ColorValue): Promise<void> {\n  const colorNumber = processColor(color);\n  return await ExpoSystemUI.setBackgroundColorAsync(colorNumber);\n}\n\n/**\n * Gets the root view background color.\n *\n * @example\n * ```ts\n * const color = await SystemUI.getBackgroundColorAsync();\n * ```\n * @returns Current root view background color in hex format.\n */\nexport async function getBackgroundColorAsync(): Promise<ColorValue> {\n  return await ExpoSystemUI.getBackgroundColorAsync();\n}\n"]}
+{"version":3,"file":"SystemUI.js","sourceRoot":"","sources":["../src/SystemUI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,KAAiB;IAC7D,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,MAAM,YAAY,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;AACjE,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB;IAC3C,OAAO,MAAM,YAAY,CAAC,uBAAuB,EAAE,CAAC;AACtD,CAAC","sourcesContent":["import { ColorValue, processColor } from 'react-native';\n\nimport ExpoSystemUI from './ExpoSystemUI';\n\n/**\n * Changes the root view background color.\n *\n * @example\n * ```ts\n * SystemUI.setBackgroundColorAsync(\"white\");\n * ```\n * @param color Any valid [CSS 3 (SVG) color](http://www.w3.org/TR/css3-color/#svg-color).\n */\nexport async function setBackgroundColorAsync(color: ColorValue): Promise<void> {\n  const colorNumber = processColor(color);\n  return await ExpoSystemUI.setBackgroundColorAsync(colorNumber);\n}\n\n/**\n * Gets the root view background color.\n *\n * @example\n * ```ts\n * const color = await SystemUI.getBackgroundColorAsync();\n * ```\n * @returns Current root view background color in hex format. Returns `null` if the background color is not set.\n */\nexport async function getBackgroundColorAsync(): Promise<ColorValue | null> {\n  return await ExpoSystemUI.getBackgroundColorAsync();\n}\n"]}

package/ios/ExpoSystemUI/ExpoSystemUIModule.swift

@@ -6,19 +6,49 @@ public class ExpoSystemUIModule: Module {
   public func definition() -> ModuleDefinition {
     name("ExpoSystemUI")
 
-    method("getBackgroundColorAsync") { () -> String? in
-      var color: String? = nil
-      EXUtilities.performSynchronously {
-        if let backgroundColor = self.appContext?.utilities?.currentViewController()?.view.backgroundColor?.cgColor {
-          color = EXUtilities.hexString(with: backgroundColor)
-        }
+    onCreate {
+      // TODO: Maybe read from the app manifest instead of from Info.plist.
+      // Set / reset the initial color on reload and app start.
+      let color = Bundle.main.object(forInfoDictionaryKey: "RCTRootViewBackgroundColor") as? Int
+      Self.setBackgroundColorAsync(color: color)
+    }
+
+    function("getBackgroundColorAsync") { () -> String? in
+      Self.getBackgroundColor()
+    }
+
+    function("setBackgroundColorAsync") { (color: Int) in
+      Self.setBackgroundColorAsync(color: color)
+    }
+  }
+
+  static func getBackgroundColor() -> String? {
+    var color: String?
+    EXUtilities.performSynchronously {
+      // Get the root view controller of the delegate window.
+      if let window = UIApplication.shared.delegate?.window, let backgroundColor = window?.rootViewController?.view.backgroundColor?.cgColor {
+        color = EXUtilities.hexString(with: backgroundColor)
       }
-      return color
     }
+    return color
+  }
 
-    method("setBackgroundColorAsync") { (color: Int) in
-      EXUtilities.performSynchronously {
-        self.appContext?.utilities?.currentViewController()?.view.backgroundColor = EXUtilities.uiColor(color)
+  static func setBackgroundColorAsync(color: Int?) {
+    EXUtilities.performSynchronously {
+      if color == nil {
+        if let window = UIApplication.shared.delegate?.window {
+          window?.backgroundColor = nil
+          window?.rootViewController?.view.backgroundColor = UIColor.white
+        }
+        return
+      }
+      let backgroundColor = EXUtilities.uiColor(color)
+      // Set the app-wide window, this could have future issues when running multiple React apps,
+      // i.e. dev client can't use expo-system-ui.
+      // Without setting the window backgroundColor, native-stack modals will show the wrong color.
+      if let window = UIApplication.shared.delegate?.window {
+        window?.backgroundColor = backgroundColor
+        window?.rootViewController?.view.backgroundColor = backgroundColor
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-system-ui",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Interact with system UI elements",
   "main": "build/SystemUI.js",
   "types": "build/SystemUI.d.ts",
@@ -30,18 +30,20 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.io/versions/latest/sdk/system-ui",
+  "homepage": "https://docs.expo.dev/versions/latest/sdk/system-ui",
   "dependencies": {
-    "@expo/config-plugins": "^4.0.2",
+    "@expo/config-plugins": "^4.0.14",
     "@react-native/normalize-color": "^2.0.0",
-    "expo-modules-core": "~0.4.2",
     "debug": "^4.3.2"
   },
   "jest": {
-    "preset": "expo-module-scripts/ios"
+    "preset": "expo-module-scripts"
   },
   "devDependencies": {
     "expo-module-scripts": "^2.0.0"
   },
-  "gitHead": "b80c4b7ead2f3179331e59612b90c78763d89179"
+  "peerDependencies": {
+    "expo": "*"
+  },
+  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
 }

package/plugin/build/withAndroidRootViewBackgroundColor.js

@@ -7,13 +7,13 @@ const { assignStylesValue, getAppThemeLightNoActionBarGroup } = config_plugins_1
 const ANDROID_WINDOW_BACKGROUND = 'android:windowBackground';
 const WINDOW_BACKGROUND_COLOR = 'activityBackground';
 const withAndroidRootViewBackgroundColor = (config) => {
-    config = exports.withRootViewBackgroundColorColors(config);
-    config = exports.withRootViewBackgroundColorStyles(config);
+    config = (0, exports.withRootViewBackgroundColorColors)(config);
+    config = (0, exports.withRootViewBackgroundColorStyles)(config);
     return config;
 };
 exports.withAndroidRootViewBackgroundColor = withAndroidRootViewBackgroundColor;
 const withRootViewBackgroundColorColors = (config) => {
-    return config_plugins_1.withAndroidColors(config, async (config) => {
+    return (0, config_plugins_1.withAndroidColors)(config, async (config) => {
         config.modResults = assignColorValue(config.modResults, {
             value: getRootViewBackgroundColor(config),
             name: WINDOW_BACKGROUND_COLOR,
@@ -23,7 +23,7 @@ const withRootViewBackgroundColorColors = (config) => {
 };
 exports.withRootViewBackgroundColorColors = withRootViewBackgroundColorColors;
 const withRootViewBackgroundColorStyles = (config) => {
-    return config_plugins_1.withAndroidStyles(config, async (config) => {
+    return (0, config_plugins_1.withAndroidStyles)(config, async (config) => {
         config.modResults = assignStylesValue(config.modResults, {
             add: !!getRootViewBackgroundColor(config),
             parent: getAppThemeLightNoActionBarGroup(),

package/plugin/build/withAndroidUserInterfaceStyle.js

@@ -9,7 +9,7 @@ const assert_1 = __importDefault(require("assert"));
 // strings.xml keys, this should not change.
 const USER_INTERFACE_STYLE_KEY = 'expo_system_ui_user_interface_style';
 const withAndroidUserInterfaceStyle = (config) => {
-    return config_plugins_1.withStringsXml(config, (config) => {
+    return (0, config_plugins_1.withStringsXml)(config, (config) => {
         config.modResults = setStrings(config.modResults, resolveProps(config));
         return config;
     });
@@ -18,7 +18,7 @@ exports.withAndroidUserInterfaceStyle = withAndroidUserInterfaceStyle;
 function resolveProps(config) {
     var _a, _b;
     const userInterfaceStyle = (_b = (_a = config.android) === null || _a === void 0 ? void 0 : _a.userInterfaceStyle) !== null && _b !== void 0 ? _b : config.userInterfaceStyle;
-    assert_1.default(!userInterfaceStyle || ['automatic', 'light', 'dark'].includes(userInterfaceStyle), `expo-system-ui: Invalid userInterfaceStyle: "${userInterfaceStyle}"`);
+    (0, assert_1.default)(!userInterfaceStyle || ['automatic', 'light', 'dark'].includes(userInterfaceStyle), `expo-system-ui: Invalid userInterfaceStyle: "${userInterfaceStyle}"`);
     return { userInterfaceStyle };
 }
 exports.resolveProps = resolveProps;

package/plugin/build/withIosRootViewBackgroundColor.js

@@ -11,7 +11,7 @@ const normalize_color_1 = __importDefault(require("@react-native/normalize-color
 const BACKGROUND_COLOR_KEY = 'RCTRootViewBackgroundColor';
 const debug = require('debug')('expo:system-ui:plugin:ios');
 const withIosRootViewBackgroundColor = (config) => {
-    config = config_plugins_1.withInfoPlist(config, (config) => {
+    config = (0, config_plugins_1.withInfoPlist)(config, (config) => {
         config.modResults = setRootViewBackgroundColor(config, config.modResults);
         return config;
     });
@@ -24,7 +24,7 @@ function setRootViewBackgroundColor(config, infoPlist) {
         delete infoPlist[BACKGROUND_COLOR_KEY];
     }
     else {
-        let color = normalize_color_1.default(backgroundColor);
+        let color = (0, normalize_color_1.default)(backgroundColor);
         if (!color) {
             throw new Error('Invalid background color on iOS');
         }

package/plugin/build/withIosUserInterfaceStyle.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setUserInterfaceStyle = exports.getUserInterfaceStyle = exports.withIosUserInterfaceStyle = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const withIosUserInterfaceStyle = (config) => {
-    return config_plugins_1.withInfoPlist(config, (config) => {
+    return (0, config_plugins_1.withInfoPlist)(config, (config) => {
         config.modResults = setUserInterfaceStyle(config, config.modResults);
         return config;
     });

package/plugin/build/withSystemUI.js

@@ -7,11 +7,11 @@ const withIosRootViewBackgroundColor_1 = require("./withIosRootViewBackgroundCol
 const withIosUserInterfaceStyle_1 = require("./withIosUserInterfaceStyle");
 const pkg = require('expo-system-ui/package.json');
 const withSystemUI = (config) => {
-    return config_plugins_1.withPlugins(config, [
+    return (0, config_plugins_1.withPlugins)(config, [
         withAndroidRootViewBackgroundColor_1.withAndroidRootViewBackgroundColor,
         withIosRootViewBackgroundColor_1.withIosRootViewBackgroundColor,
         withAndroidUserInterfaceStyle_1.withAndroidUserInterfaceStyle,
         withIosUserInterfaceStyle_1.withIosUserInterfaceStyle,
     ]);
 };
-exports.default = config_plugins_1.createRunOncePlugin(withSystemUI, pkg.name, pkg.version);
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withSystemUI, pkg.name, pkg.version);

package/src/SystemUI.ts

@@ -23,8 +23,8 @@ export async function setBackgroundColorAsync(color: ColorValue): Promise<void>
  * ```ts
  * const color = await SystemUI.getBackgroundColorAsync();
  * ```
- * @returns Current root view background color in hex format.
+ * @returns Current root view background color in hex format. Returns `null` if the background color is not set.
  */
-export async function getBackgroundColorAsync(): Promise<ColorValue> {
+export async function getBackgroundColorAsync(): Promise<ColorValue | null> {
   return await ExpoSystemUI.getBackgroundColorAsync();
 }