expo-dev-menu 5.0.8 → 5.0.10

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 5.0.10 — 2024-05-02
+
+### 🐛 Bug fixes
+
+- Fixed some dev menu items like "Reload" that are not functional. ([#28578](https://github.com/expo/expo/pull/28578) by [@kudo](https://github.com/kudo))
+- Fixed DevMenu showing up before the app is loaded when using the new architecture. ([#28589](https://github.com/expo/expo/pull/28589) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+### 💡 Others
+
+- Update Menu background color in dark mode. ([#28549](https://github.com/expo/expo/pull/28549) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+## 5.0.9 — 2024-05-01
+
+_This version does not introduce any user-facing changes._
+
 ## 5.0.8 — 2024-04-29
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '5.0.8'
+version = '5.0.10'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -20,7 +20,7 @@ android {
   namespace "expo.modules.devmenu"
   defaultConfig {
     versionCode 10
-    versionName '5.0.8'
+    versionName '5.0.10'
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devmenu/DevMenuAppInfo.kt

@@ -61,15 +61,11 @@ object DevMenuAppInfo {
   }
 
   private fun getApplicationIconUri(reactContext: ReactContext): String {
-    var appIcon = ""
     val packageManager = reactContext.packageManager
     val packageName = reactContext.packageName
     val applicationInfo = packageManager.getApplicationInfo(packageName, 0)
 
-    if (applicationInfo.icon != null) {
-      appIcon = "" + applicationInfo.icon
-    }
     //    TODO - figure out how to get resId for AdaptiveIconDrawable icons
-    return appIcon
+    return applicationInfo.icon.toString()
   }
 }

package/android/src/debug/java/expo/modules/devmenu/DevMenuManager.kt

@@ -91,23 +91,9 @@ object DevMenuManager : DevMenuManagerInterface, LifecycleEventListener {
 
   /**
    * Returns an collection of modules conforming to [DevMenuExtensionInterface].
-   * Bridge may register multiple modules with the same name – in this case it returns only the one that overrides the others.
    */
-  private val delegateExtensions: Collection<DevMenuExtensionInterface>
-    get() {
-      val reactContext = delegateReactContext ?: return emptyList()
-      val uniqueExtensionClasses = reactContext
-        .nativeModules
-        .filterIsInstance<DevMenuExtensionInterface>()
-        .filterIsInstance<NativeModule>()
-        .map { it.javaClass }
-        .toSet()
-
-      return uniqueExtensionClasses
-        .map { extensionClass ->
-          reactContext.getNativeModule(extensionClass) as DevMenuExtensionInterface
-        }
-    }
+  @get:Synchronized
+  private val delegateExtensions = mutableListOf<DevMenuExtensionInterface>()
 
   private val cachedDevMenuDataSources by KeyValueCachedProperty<ReactHostWrapper, List<DevMenuDataSourceInterface>> {
     delegateExtensions
@@ -460,6 +446,10 @@ object DevMenuManager : DevMenuManagerInterface, LifecycleEventListener {
       }
   }
 
+  override fun registerExtensionInterface(extensionInterface: DevMenuExtensionInterface) {
+    delegateExtensions.add(extensionInterface)
+  }
+
   override fun sendEventToDelegateBridge(eventName: String, eventData: Any?) {
     delegateReactContext
       ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

package/android/src/main/java/expo/modules/devmenu/extensions/DevMenuExtension.kt

@@ -22,6 +22,10 @@ class DevMenuExtension(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext), DevMenuExtensionInterface {
   override fun getName() = "ExpoDevMenuExtensions"
 
+  init {
+    DevMenuManager.registerExtensionInterface(this)
+  }
+
   override fun devMenuItems(settings: DevMenuExtensionSettingsInterface) = DevMenuItemsContainer.export {
     if (!settings.wasRunOnDevelopmentBridge()) {
       return@export

package/android/src/release/java/expo/modules/devmenu/DevMenuManager.kt

@@ -7,6 +7,7 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import com.facebook.react.bridge.ReadableMap
 import expo.interfaces.devmenu.DevMenuDelegateInterface
+import expo.interfaces.devmenu.DevMenuExtensionInterface
 import expo.interfaces.devmenu.DevMenuManagerInterface
 import expo.interfaces.devmenu.DevMenuPreferencesInterface
 import expo.interfaces.devmenu.ReactHostWrapper
@@ -71,6 +72,10 @@ object DevMenuManager : DevMenuManagerInterface {
     throw IllegalStateException(DEV_MENU_IS_NOT_AVAILABLE)
   }
 
+  override fun registerExtensionInterface(extensionInterface: DevMenuExtensionInterface) {
+    throw IllegalStateException(DEV_MENU_IS_NOT_AVAILABLE)
+  }
+
   override fun serializedItems(): List<Bundle> {
     throw IllegalStateException(DEV_MENU_IS_NOT_AVAILABLE)
   }