feat(android): populate home screen with AppRegistry entries (#1127)

tido64 · web-flow · commit 6b653c8ffc2d · 2022-10-06T16:54:37.000Z
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -158,6 +158,15 @@ android {
                     abiFilters(*project.ext.react.architectures)
                 }
             }
+        } else {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DANDROID_STL=c++_shared",
+                              "-DREACT_COMMON_DIR=${reactNativePath}/ReactCommon",
+                              "-DREACT_JNILIBS_DIR=${buildDir}/outputs/jniLibs"
+                    cppFlags "-std=c++17"
+                }
+            }
         }
     }
 
@@ -222,6 +231,32 @@ android {
                 }
             }
         }
+    } else {
+        externalNativeBuild {
+            cmake {
+                path "${projectDir}/src/main/jni/CMakeLists.txt"
+            }
+        }
+
+        def version = getPackageVersion("react-native", rootDir)
+        def allAar = file("${reactNativePath}/android/com/facebook/react/react-native/${version}/react-native-${version}.aar")
+
+        def prepareDebugJSI = tasks.register("prepareDebugJSI", Copy) {
+            def debugAar = file("${reactNativePath}/android/com/facebook/react/react-native/${version}/react-native-${version}-debug.aar")
+            from(zipTree(debugAar.exists() ? debugAar : allAar).matching({ it.include "**/libjsi.so" }))
+            into("${buildDir}/outputs/jniLibs/debug")
+        }
+
+        def prepareReleaseJSI = tasks.register("prepareReleaseJSI", Copy) {
+            def releaseAar = file("${reactNativePath}/android/com/facebook/react/react-native/${version}/react-native-${version}-release.aar")
+            from(zipTree(releaseAar.exists() ? releaseAar : allAar).matching({ it.include "**/libjsi.so" }))
+            into("${buildDir}/outputs/jniLibs/release")
+        }
+
+        afterEvaluate {
+            preDebugBuild.dependsOn(prepareDebugJSI)
+            preReleaseBuild.dependsOn(prepareReleaseJSI)
+        }
     }
 
     lintOptions {
diff --git a/android/app/src/camera/java/com/microsoft/reacttestapp/camera/MainActivityExtensions.kt b/android/app/src/camera/java/com/microsoft/reacttestapp/camera/MainActivityExtensions.kt
@@ -9,7 +9,6 @@ import androidx.core.content.ContextCompat
 import com.google.android.material.snackbar.Snackbar
 import com.microsoft.reacttestapp.MainActivity
 import com.microsoft.reacttestapp.R
-import com.microsoft.reacttestapp.testApp
 
 fun MainActivity.canUseCamera(): Boolean {
     return ContextCompat.checkSelfPermission(
@@ -27,7 +26,7 @@ fun MainActivity.scanForQrCode() {
                     .setTitle(R.string.is_this_the_right_url)
                     .setMessage(it)
                     .setPositiveButton(R.string.yes) { _: DialogInterface, _: Int ->
-                        testApp.reloadJSFromServer(this, it)
+                        reloadJSFromServer(it)
                     }
                     .setNegativeButton(R.string.no) { _: DialogInterface, _: Int ->
                         // Nothing to do
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/MainActivity.kt b/android/app/src/main/java/com/microsoft/reacttestapp/MainActivity.kt
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.facebook.react.ReactActivity
+import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.modules.systeminfo.ReactNativeVersion
 import com.facebook.react.packagerconnection.PackagerConnectionSettings
@@ -22,6 +23,7 @@ import com.microsoft.reacttestapp.component.ComponentBottomSheetDialogFragment
 import com.microsoft.reacttestapp.component.ComponentListAdapter
 import com.microsoft.reacttestapp.component.ComponentViewModel
 import com.microsoft.reacttestapp.manifest.Component
+import com.microsoft.reacttestapp.react.AppRegistry
 import com.microsoft.reacttestapp.react.BundleSource
 
 class MainActivity : ReactActivity() {
@@ -34,7 +36,8 @@ class MainActivity : ReactActivity() {
         HandlerCompat.createAsync(Looper.getMainLooper())
     }
 
-    private var didInitialNavigation = false
+    private lateinit var componentListAdapter: ComponentListAdapter
+    private var isTopResumedActivity = false
 
     private val newComponentViewModel = { component: Component ->
         ComponentViewModel(
@@ -49,21 +52,7 @@ class MainActivity : ReactActivity() {
         Session(applicationContext)
     }
 
-    private val startComponent: (ComponentViewModel) -> Unit = { component ->
-        didInitialNavigation = true
-        when (component.presentationStyle) {
-            "modal" -> {
-                ComponentBottomSheetDialogFragment
-                    .newInstance(component)
-                    .show(supportFragmentManager, ComponentBottomSheetDialogFragment.TAG)
-            }
-            else -> {
-                findActivityClass(component.name)?.let {
-                    startActivity(Intent(this, it))
-                } ?: startActivity(ComponentActivity.newIntent(this, component))
-            }
-        }
-    }
+    private var useAppRegistry: Boolean = false
 
     private fun findActivityClass(name: String): Class<*>? {
         return try {
@@ -87,16 +76,29 @@ class MainActivity : ReactActivity() {
             BuildConfig.ReactTestApp_singleApp === null -> {
                 setContentView(R.layout.activity_main)
 
-                didInitialNavigation =
-                    savedInstanceState?.getBoolean("didInitialNavigation", false) == true
-
-                if (components.isNotEmpty()) {
+                useAppRegistry = components.isEmpty()
+                if (useAppRegistry) {
+                    testApp.reactNativeHost.addReactInstanceEventListener {
+                        it.runOnJSQueueThread {
+                            val appKeys = AppRegistry.getAppKeys(it as ReactApplicationContext)
+                            val viewModels = appKeys.map { appKey ->
+                                ComponentViewModel(appKey, appKey, null, null)
+                            }
+                            mainThreadHandler.post {
+                                componentListAdapter.setComponents(viewModels)
+                                if (isTopResumedActivity && viewModels.count() == 1) {
+                                    startComponent(viewModels[0])
+                                }
+                            }
+                        }
+                    }
+                } else {
                     val index =
                         if (components.count() == 1) 0 else session.lastOpenedComponent(checksum)
                     index?.let {
                         val component = newComponentViewModel(components[it])
                         val startInitialComponent = { _: ReactContext ->
-                            if (!didInitialNavigation) {
+                            if (isTopResumedActivity) {
                                 startComponent(component)
                             }
                         }
@@ -125,6 +127,11 @@ class MainActivity : ReactActivity() {
         }
     }
 
+    override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) {
+        super.onTopResumedActivityChanged(isTopResumedActivity)
+        this.isTopResumedActivity = isTopResumedActivity
+    }
+
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,
@@ -139,26 +146,30 @@ class MainActivity : ReactActivity() {
         }
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean("didInitialNavigation", didInitialNavigation)
-        super.onSaveInstanceState(outState)
+    internal fun reloadJSFromServer(bundleURL: String) {
+        componentListAdapter.clear()
+        testApp.reloadJSFromServer(this, bundleURL)
     }
 
     private fun reload(bundleSource: BundleSource) {
+        if (useAppRegistry) {
+            componentListAdapter.clear()
+        }
         testApp.reactNativeHost.reload(this, bundleSource)
     }
 
     private fun setupRecyclerView(manifestComponents: List<Component>, manifestChecksum: String) {
-        val components = manifestComponents.map(newComponentViewModel)
+        componentListAdapter = ComponentListAdapter(
+            LayoutInflater.from(applicationContext),
+            manifestComponents.map(newComponentViewModel)
+        ) { component, index ->
+            startComponent(component)
+            session.storeComponent(index, manifestChecksum)
+        }
+
         findViewById<RecyclerView>(R.id.recyclerview).apply {
             layoutManager = LinearLayoutManager(context)
-            adapter = ComponentListAdapter(
-                LayoutInflater.from(context),
-                components
-            ) { component, index ->
-                startComponent(component)
-                session.storeComponent(index, manifestChecksum)
-            }
+            adapter = componentListAdapter
 
             addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
         }
@@ -214,6 +225,21 @@ class MainActivity : ReactActivity() {
         }
     }
 
+    private fun startComponent(component: ComponentViewModel) {
+        when (component.presentationStyle) {
+            "modal" -> {
+                ComponentBottomSheetDialogFragment
+                    .newInstance(component)
+                    .show(supportFragmentManager, ComponentBottomSheetDialogFragment.TAG)
+            }
+            else -> {
+                findActivityClass(component.name)?.let {
+                    startActivity(Intent(this, it))
+                } ?: startActivity(ComponentActivity.newIntent(this, component))
+            }
+        }
+    }
+
     private fun updateMenuItemState(toolbar: MaterialToolbar, bundleSource: BundleSource) {
         toolbar.menu.apply {
             findItem(R.id.load_embedded_js_bundle).isEnabled =
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentListAdapter.kt b/android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentListAdapter.kt
@@ -1,17 +1,33 @@
 package com.microsoft.reacttestapp.component
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.annotation.UiThread
 import androidx.recyclerview.widget.RecyclerView
 import com.microsoft.reacttestapp.R
 
 class ComponentListAdapter(
     private val layoutInflater: LayoutInflater,
-    private val components: List<ComponentViewModel>,
+    private var components: List<ComponentViewModel>,
     private val listener: (ComponentViewModel, Int) -> Unit
 ) : RecyclerView.Adapter<ComponentListAdapter.ComponentViewHolder>() {
 
+    @UiThread
+    fun clear() {
+        val itemCount = components.size
+        components = listOf()
+        notifyItemRangeRemoved(0, itemCount)
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    @UiThread
+    fun setComponents(components: List<ComponentViewModel>) {
+        this.components = components
+        notifyDataSetChanged()
+    }
+
     override fun getItemCount() = components.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ComponentViewHolder {
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/react/AppRegistry.kt b/android/app/src/main/java/com/microsoft/reacttestapp/react/AppRegistry.kt
@@ -0,0 +1,23 @@
+package com.microsoft.reacttestapp.react
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.soloader.SoLoader
+
+/**
+ * The corresponding C++ implementation is in `android/app/src/main/jni/AppRegistry.cpp`
+ */
+class AppRegistry {
+    companion object {
+        init {
+            SoLoader.loadLibrary("reacttestapp_appmodules")
+        }
+
+        fun getAppKeys(context: ReactApplicationContext): Array<String> {
+            val appKeys = AppRegistry().getAppKeys(context.javaScriptContextHolder.get())
+                ?: return arrayOf()
+            return appKeys.filterIsInstance<String>().toTypedArray()
+        }
+    }
+
+    private external fun getAppKeys(jsiPtr: Long): Array<Any>?
+}
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/react/TestAppReactNativeHost.kt b/android/app/src/main/java/com/microsoft/reacttestapp/react/TestAppReactNativeHost.kt
@@ -27,6 +27,7 @@ import com.microsoft.reacttestapp.R
 import com.microsoft.reacttestapp.compat.ReactInstanceEventListener
 import com.microsoft.reacttestapp.compat.ReactNativeHostCompat
 import com.microsoft.reacttestapp.fabric.FabricJSIModulePackage
+import java.util.Collections.synchronizedList
 import java.util.concurrent.CountDownLatch
 
 sealed class BundleSource {
@@ -63,6 +64,9 @@ class TestAppReactNativeHost(
 
     var onBundleSourceChanged: ((newSource: BundleSource) -> Unit)? = null
 
+    private val reactInstanceEventListeners =
+        synchronizedList<ReactInstanceEventListener>(arrayListOf())
+
     fun init(beforeReactNativeInit: () -> Unit, afterReactNativeInit: () -> Unit) {
         if (BuildConfig.DEBUG && hasInstance()) {
             error("init() can only be called once on startup")
@@ -106,6 +110,7 @@ class TestAppReactNativeHost(
     }
 
     fun addReactInstanceEventListener(listener: (ReactContext) -> Unit) {
+        reactInstanceEventListeners.add(listener)
         reactInstanceManager.addReactInstanceEventListener(listener)
     }
 
@@ -162,7 +167,16 @@ class TestAppReactNativeHost(
             .setJSIModulesPackage(jsiModulePackage)
             .build()
         ReactMarker.logMarker(ReactMarkerConstants.BUILD_REACT_INSTANCE_MANAGER_END)
+
         addCustomDevOptions(reactInstanceManager.devSupportManager)
+
+        synchronized(reactInstanceEventListeners) {
+            val i = reactInstanceEventListeners.iterator()
+            while (i.hasNext()) {
+                reactInstanceManager.addReactInstanceEventListener(i.next())
+            }
+        }
+
         return reactInstanceManager
     }
 
diff --git a/android/app/src/main/jni/Android.mk b/android/app/src/main/jni/Android.mk
@@ -12,12 +12,13 @@ include $(PROJECT_BUILD_DIR)/generated/rncli/src/main/jni/Android-rncli.mk
 include $(CLEAR_VARS)
 
 LOCAL_PATH := $(THIS_DIR)
+REACTTESTAPP_PATH := $(LOCAL_PATH)/../../../../..
 
 # You can customize the name of your application .so file here.
 LOCAL_MODULE := reacttestapp_appmodules
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACTTESTAPP_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(REACTTESTAPP_PATH)/common/AppRegistry.cpp
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 # If you wish to add a custom TurboModule or Fabric component in your app you
diff --git a/android/app/src/main/jni/AppRegistry.cpp b/android/app/src/main/jni/AppRegistry.cpp
@@ -0,0 +1,20 @@
+#include "AppRegistry.h"
+
+#include "common/AppRegistry.h"
+
+extern "C" {
+
+JNIEXPORT jobjectArray JNICALL Java_com_microsoft_reacttestapp_react_AppRegistry_getAppKeys(
+    JNIEnv *env, jclass clazz, jlong jsiPtr)
+{
+    auto runtime = reinterpret_cast<facebook::jsi::Runtime *>(jsiPtr);
+    auto appKeys = ReactTestApp::GetAppKeys(*runtime);
+    auto numKeys = static_cast<int>(appKeys.size());
+    auto result = env->NewObjectArray(numKeys, env->FindClass("java/lang/String"), nullptr);
+    for (int i = 0; i < numKeys; ++i) {
+        env->SetObjectArrayElement(result, i, env->NewStringUTF(appKeys[i].c_str()));
+    }
+    return result;
+}
+
+}  // extern "C"
diff --git a/android/app/src/main/jni/AppRegistry.h b/android/app/src/main/jni/AppRegistry.h
@@ -0,0 +1,13 @@
+#ifndef ANDROID_JNI_APPREGISTRY_
+#define ANDROID_JNI_APPREGISTRY_
+
+#include <jni.h>
+
+extern "C" {
+
+JNIEXPORT jobjectArray JNICALL Java_com_microsoft_reacttestapp_react_AppRegistry_getAppKeys(
+    JNIEnv *env, jclass clazz, jlong jsiPtr);
+
+}  // extern "C"
+
+#endif  // ANDROID_JNI_APPREGISTRY_
diff --git a/android/app/src/main/jni/CMakeLists.txt b/android/app/src/main/jni/CMakeLists.txt
diff --git a/android/test-app-util.gradle b/android/test-app-util.gradle
