expo-system-ui 2.0.1 → 2.1.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 2.1.0 — 2022-12-30
+
+### 🎉 New features
+
+- Migrated Android codebase to use the new Expo modules API. ([#20221](https://github.com/expo/expo/pull/20221) by [@alanhughes](https://github.com/alanjhughes))
+
 ## 2.0.1 — 2022-10-28
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -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/main/docs/pages/versions/unversioned/sdk/system-ui.md
+[docs-main]: https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/system-ui.mdx
 [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

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '2.0.1'
+version = '2.1.0'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName '2.0.1'
+    versionName '2.1.0'
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/systemui/SystemUIModule.kt

@@ -1,75 +1,36 @@
 package expo.modules.systemui
 
-import android.app.Activity
-import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.util.Log
-import expo.modules.core.ExportedModule
-import expo.modules.core.ModuleRegistry
-import expo.modules.core.Promise
-import expo.modules.core.errors.CurrentActivityNotFoundException
-import expo.modules.core.interfaces.ActivityProvider
-import expo.modules.core.interfaces.ExpoMethod
-
-class SystemUIModule(context: Context) : ExportedModule(context) {
-
-  private lateinit var activityProvider: ActivityProvider
-
-  override fun getName(): String {
-    return NAME
-  }
-
-  override fun onCreate(moduleRegistry: ModuleRegistry) {
-    activityProvider = moduleRegistry.getModule(ActivityProvider::class.java)
-      ?: throw IllegalStateException("Could not find implementation for ActivityProvider.")
-  }
-
-  // Ensure that rejections are passed up to JS rather than terminating the native client.
-  private fun safeRunOnUiThread(promise: Promise, block: (activity: Activity) -> Unit) {
-    val activity = activityProvider.currentActivity
-    if (activity == null) {
-      promise.reject(CurrentActivityNotFoundException())
-      return
-    }
-    activity.runOnUiThread {
-      block(activity)
-    }
-  }
-
-  @ExpoMethod
-  fun setBackgroundColorAsync(color: Int, promise: Promise) {
-    safeRunOnUiThread(promise) {
-      var rootView = it.window.decorView
-      var colorString = colorToHex(color)
-      try {
-        val color = Color.parseColor(colorString)
-        rootView.setBackgroundColor(color)
-        promise.resolve(null)
-      } catch (e: Throwable) {
-        Log.e(ERROR_TAG, e.toString())
-        rootView.setBackgroundColor(Color.WHITE)
-        promise.reject(ERROR_TAG, "Invalid color: \"$color\"")
-      }
-    }
-  }
-
-  @ExpoMethod
-  fun getBackgroundColorAsync(promise: Promise) {
-    safeRunOnUiThread(promise) {
-      var mBackground = it.window.decorView.background
-      if (mBackground is ColorDrawable) {
-        promise.resolve(colorToHex((mBackground.mutate() as ColorDrawable).color))
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.functions.Queues
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+
+class SystemUIModule : Module() {
+  private val currentActivity
+    get() = appContext.currentActivity ?: throw Exceptions.MissingActivity()
+
+  override fun definition() = ModuleDefinition {
+    Name("ExpoSystemUI")
+
+    AsyncFunction("setBackgroundColorAsync") { color: Int ->
+      val rootView = currentActivity.window.decorView
+      val colorInt = Color.parseColor(colorToHex(color))
+      rootView.setBackgroundColor(colorInt)
+    }.runOnQueue(Queues.MAIN)
+
+    AsyncFunction("getBackgroundColorAsync") {
+      val background = currentActivity.window.decorView.background
+      return@AsyncFunction if (background is ColorDrawable) {
+        colorToHex((background.mutate() as ColorDrawable).color)
       } else {
-        promise.resolve(null)
+        null
       }
     }
   }
 
   companion object {
-    private const val NAME = "ExpoSystemUI"
-    private const val ERROR_TAG = "ERR_SYSTEM_UI"
-
     fun colorToHex(color: Int): String {
       return String.format("#%02x%02x%02x", Color.red(color), Color.green(color), Color.blue(color))
     }

package/android/src/main/java/expo/modules/systemui/SystemUIPackage.kt

@@ -1,14 +1,10 @@
 package expo.modules.systemui
 
 import android.content.Context
-import expo.modules.core.BasePackage
-import expo.modules.core.ExportedModule
+import expo.modules.core.interfaces.Package
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
 
-class SystemUIPackage : BasePackage() {
-  override fun createExportedModules(context: Context): List<ExportedModule> {
-    return listOf(SystemUIModule(context) as ExportedModule)
-  }
+class SystemUIPackage : Package {
   override fun createReactActivityLifecycleListeners(activityContext: Context): List<ReactActivityLifecycleListener> {
     return listOf(SystemUIReactActivityLifecycleListener(activityContext))
   }

package/android/src/main/java/expo/modules/systemui/SystemUIReactActivityLifecycleListener.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import expo.modules.core.interfaces.ReactActivityLifecycleListener
+import expo.modules.systemui.singletons.SystemUI
 
 // EXPO_VERSIONING_NEEDS_EXPOVIEW_R
 

package/android/src/main/java/expo/modules/systemui/singletons/SystemUI.kt

@@ -1,4 +1,4 @@
-package expo.modules.systemui
+package expo.modules.systemui.singletons
 
 import android.os.Build
 import android.util.Log

package/build/ExpoSystemUI.d.ts

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

package/build/ExpoSystemUI.d.ts.map

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

package/build/ExpoSystemUI.js

@@ -1,3 +1,3 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-export default NativeModulesProxy.ExpoSystemUI ?? {};
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoSystemUI');
 //# sourceMappingURL=ExpoSystemUI.js.map

package/build/ExpoSystemUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoSystemUI.js","sourceRoot":"","sources":["../src/ExpoSystemUI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,eAAe,kBAAkB,CAAC,YAAY,IAAI,EAAE,CAAC","sourcesContent":["import { NativeModulesProxy } from 'expo-modules-core';\n\nexport default NativeModulesProxy.ExpoSystemUI ?? {};\n"]}
+{"version":3,"file":"ExpoSystemUI.js","sourceRoot":"","sources":["../src/ExpoSystemUI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,eAAe,mBAAmB,CAAC,cAAc,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\nexport default requireNativeModule('ExpoSystemUI');\n"]}

package/expo-module.config.json

@@ -2,6 +2,9 @@
   "name": "expo-system-ui",
   "platforms": ["ios", "android"],
   "ios": {
-    "modulesClassNames": ["ExpoSystemUIModule"]
+    "modules": ["ExpoSystemUIModule"]
+  },
+  "android": {
+    "modules": ["expo.modules.systemui.SystemUIModule"]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-system-ui",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Interact with system UI elements",
   "main": "build/SystemUI.js",
   "types": "build/SystemUI.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "59081bb17e727b10f2a00cd07bb45cd283a6f6a5"
+  "gitHead": "ba80e8181b79d06e00a245653727f4eaeb80420e"
 }

package/plugin/build/withAndroidUserInterfaceStyle.d.ts

@@ -1,6 +1,6 @@
 import { ExpoConfig } from 'expo/config';
 import { AndroidConfig, ConfigPlugin } from 'expo/config-plugins';
-export declare type Props = {
+export type Props = {
     userInterfaceStyle?: ExpoConfig['userInterfaceStyle'];
 };
 export declare const withAndroidUserInterfaceStyle: ConfigPlugin<void>;

package/src/ExpoSystemUI.ts

@@ -1,3 +1,2 @@
-import { NativeModulesProxy } from 'expo-modules-core';
-
-export default NativeModulesProxy.ExpoSystemUI ?? {};
+import { requireNativeModule } from 'expo-modules-core';
+export default requireNativeModule('ExpoSystemUI');