@iternio/react-native-auto-play 0.3.5 → 0.3.7

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoScreen.kt

@@ -9,6 +9,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import com.facebook.react.bridge.UiThreadUtil
+import java.util.concurrent.ConcurrentHashMap
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.AndroidAutoTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.GridTemplate
 import com.margelo.nitro.swe.iternio.reactnativeautoplay.template.InformationTemplate
@@ -117,15 +118,18 @@ class AndroidAutoScreen(
     companion object {
         const val TAG = "AndroidAutoScreen"
 
-        private val screens = mutableMapOf<String, AndroidAutoScreen>()
+        private val screens = ConcurrentHashMap<String, AndroidAutoScreen>()
 
         fun getScreen(marker: String): AndroidAutoScreen? {
             return screens[marker]
         }
 
         fun getScreenManager(): ScreenManager? {
-            return screens[AndroidAutoSession.ROOT_SESSION]?.screenManager
-        }
+            val clusterSessions = AndroidAutoSession.getClusterSessions().toSet()
+            return screens.entries
+                .firstOrNull { !clusterSessions.contains(it.key) }
+                ?.value?.screenManager
+         }
 
         fun invalidateScreens() {
             for (screen in screens) {
@@ -143,4 +147,4 @@ class AndroidAutoScreen(
             }
         }
     }
-}
+}

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoSession.kt

@@ -23,6 +23,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.util.UUID
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CopyOnWriteArrayList
 
 class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication: ReactApplication) :
     Session() {
@@ -246,9 +248,9 @@ class AndroidAutoSession(sessionInfo: SessionInfo, private val reactApplication:
         const val ROOT_SESSION = "AutoPlayRoot"
 
         private lateinit var reactContext: ReactContext
-        private val sessions = mutableMapOf<String, ScreenContext>()
+        private val sessions = ConcurrentHashMap<String, ScreenContext>()
 
-        private val clusterSessions = mutableListOf<String>()
+        private val clusterSessions = CopyOnWriteArrayList<String>()
 
         fun getIsConnected(): Boolean {
             return sessions.containsKey(ROOT_SESSION)

package/nitro.json

@@ -10,48 +10,105 @@
   },
   "autolinking": {
     "AutoPlay": {
-      "kotlin": "HybridAutoPlay",
-      "swift": "HybridAutoPlay"
+      "android": {
+        "implementationClassName": "HybridAutoPlay",
+        "language": "kotlin"
+      },
+      "ios": {
+        "implementationClassName": "HybridAutoPlay",
+        "language": "swift"
+      }
     },
     "AndroidAutoTelemetry": {
-      "kotlin": "HybridAndroidAutoTelemetry"
+      "android": {
+        "implementationClassName": "HybridAndroidAutoTelemetry",
+        "language": "kotlin"
+      }
     },
     "AndroidAutomotive": {
-      "kotlin": "HybridAndroidAutomotive"
+      "android": {
+        "implementationClassName": "HybridAndroidAutomotive",
+        "language": "kotlin"
+      }
     },
     "SignInTemplate": {
-      "kotlin": "HybridSignInTemplate"
+      "android": {
+        "implementationClassName": "HybridSignInTemplate",
+        "language": "kotlin"
+      }
     },
     "ListTemplate": {
-      "kotlin": "HybridListTemplate",
-      "swift": "HybridListTemplate"
+      "android": {
+        "implementationClassName": "HybridListTemplate",
+        "language": "kotlin"
+      },
+      "ios": {
+        "implementationClassName": "HybridListTemplate",
+        "language": "swift"
+      }
     },
     "InformationTemplate": {
-      "kotlin": "HybridInformationTemplate",
-      "swift": "HybridInformationTemplate"
+      "android": {
+        "implementationClassName": "HybridInformationTemplate",
+        "language": "kotlin"
+      },
+      "ios": {
+        "implementationClassName": "HybridInformationTemplate",
+        "language": "swift"
+      }
     },
     "GridTemplate": {
-      "kotlin": "HybridGridTemplate",
-      "swift": "HybridGridTemplate"
+      "android": {
+        "implementationClassName": "HybridGridTemplate",
+        "language": "kotlin"
+      },
+      "ios": {
+        "implementationClassName": "HybridGridTemplate",
+        "language": "swift"
+      }
     },
     "MapTemplate": {
-      "kotlin": "HybridMapTemplate",
-      "swift": "HybridMapTemplate"
+      "android": {
+        "implementationClassName": "HybridMapTemplate",
+        "language": "kotlin"
+      },
+      "ios": {
+        "implementationClassName": "HybridMapTemplate",
+        "language": "swift"
+      }
     },
     "MessageTemplate": {
-      "kotlin": "HybridMessageTemplate",
-      "swift": "HybridMessageTemplate"
+      "android": {
+        "implementationClassName": "HybridMessageTemplate",
+        "language": "kotlin"
+      },
+      "ios": {
+        "implementationClassName": "HybridMessageTemplate",
+        "language": "swift"
+      }
     },
     "SearchTemplate": {
-      "kotlin": "HybridSearchTemplate",
-      "swift": "HybridSearchTemplate"
+      "android": {
+        "implementationClassName": "HybridSearchTemplate",
+        "language": "kotlin"
+      },
+      "ios": {
+        "implementationClassName": "HybridSearchTemplate",
+        "language": "swift"
+      }
     },
     "CarPlayDashboard": {
-      "swift": "HybridCarPlayDashboard"
+      "ios": {
+        "implementationClassName": "HybridCarPlayDashboard",
+        "language": "swift"
+      }
     },
     "Cluster": {
-      "kotlin": "HybridCluster",
-      "swift": "HybridCluster"
+      "android": {
+        "implementationClassName": "HybridCluster",
+        "language": "kotlin"
+      },
+      "ios": { "implementationClassName": "HybridCluster", "language": "swift" }
     }
   },
   "ignorePaths": ["**/node_modules"]

package/nitrogen/generated/android/ReactNativeAutoPlayOnLoad.cpp

@@ -51,134 +51,204 @@
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::swe::iternio::reactnativeautoplay::registerAllNatives();
+  });
+}
+
+struct JHybridAutoPlaySpecImpl: public jni::JavaClass<JHybridAutoPlaySpecImpl, JHybridAutoPlaySpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAutoPlay;";
+  static std::shared_ptr<JHybridAutoPlaySpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAutoPlaySpecImpl::javaobject()>();
+    jni::local_ref<JHybridAutoPlaySpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridAutoPlaySpec();
+  }
+};
+struct JHybridAndroidAutoTelemetrySpecImpl: public jni::JavaClass<JHybridAndroidAutoTelemetrySpecImpl, JHybridAndroidAutoTelemetrySpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAndroidAutoTelemetry;";
+  static std::shared_ptr<JHybridAndroidAutoTelemetrySpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAndroidAutoTelemetrySpecImpl::javaobject()>();
+    jni::local_ref<JHybridAndroidAutoTelemetrySpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridAndroidAutoTelemetrySpec();
+  }
+};
+struct JHybridAndroidAutomotiveSpecImpl: public jni::JavaClass<JHybridAndroidAutomotiveSpecImpl, JHybridAndroidAutomotiveSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAndroidAutomotive;";
+  static std::shared_ptr<JHybridAndroidAutomotiveSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAndroidAutomotiveSpecImpl::javaobject()>();
+    jni::local_ref<JHybridAndroidAutomotiveSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridAndroidAutomotiveSpec();
+  }
+};
+struct JHybridSignInTemplateSpecImpl: public jni::JavaClass<JHybridSignInTemplateSpecImpl, JHybridSignInTemplateSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridSignInTemplate;";
+  static std::shared_ptr<JHybridSignInTemplateSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridSignInTemplateSpecImpl::javaobject()>();
+    jni::local_ref<JHybridSignInTemplateSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridSignInTemplateSpec();
+  }
+};
+struct JHybridListTemplateSpecImpl: public jni::JavaClass<JHybridListTemplateSpecImpl, JHybridListTemplateSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridListTemplate;";
+  static std::shared_ptr<JHybridListTemplateSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridListTemplateSpecImpl::javaobject()>();
+    jni::local_ref<JHybridListTemplateSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridListTemplateSpec();
+  }
+};
+struct JHybridInformationTemplateSpecImpl: public jni::JavaClass<JHybridInformationTemplateSpecImpl, JHybridInformationTemplateSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridInformationTemplate;";
+  static std::shared_ptr<JHybridInformationTemplateSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridInformationTemplateSpecImpl::javaobject()>();
+    jni::local_ref<JHybridInformationTemplateSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridInformationTemplateSpec();
+  }
+};
+struct JHybridGridTemplateSpecImpl: public jni::JavaClass<JHybridGridTemplateSpecImpl, JHybridGridTemplateSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridGridTemplate;";
+  static std::shared_ptr<JHybridGridTemplateSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridGridTemplateSpecImpl::javaobject()>();
+    jni::local_ref<JHybridGridTemplateSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridGridTemplateSpec();
+  }
+};
+struct JHybridMapTemplateSpecImpl: public jni::JavaClass<JHybridMapTemplateSpecImpl, JHybridMapTemplateSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridMapTemplate;";
+  static std::shared_ptr<JHybridMapTemplateSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridMapTemplateSpecImpl::javaobject()>();
+    jni::local_ref<JHybridMapTemplateSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridMapTemplateSpec();
+  }
+};
+struct JHybridMessageTemplateSpecImpl: public jni::JavaClass<JHybridMessageTemplateSpecImpl, JHybridMessageTemplateSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridMessageTemplate;";
+  static std::shared_ptr<JHybridMessageTemplateSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridMessageTemplateSpecImpl::javaobject()>();
+    jni::local_ref<JHybridMessageTemplateSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridMessageTemplateSpec();
+  }
+};
+struct JHybridSearchTemplateSpecImpl: public jni::JavaClass<JHybridSearchTemplateSpecImpl, JHybridSearchTemplateSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridSearchTemplate;";
+  static std::shared_ptr<JHybridSearchTemplateSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridSearchTemplateSpecImpl::javaobject()>();
+    jni::local_ref<JHybridSearchTemplateSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridSearchTemplateSpec();
+  }
+};
+struct JHybridClusterSpecImpl: public jni::JavaClass<JHybridClusterSpecImpl, JHybridClusterSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/HybridCluster;";
+  static std::shared_ptr<JHybridClusterSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridClusterSpecImpl::javaobject()>();
+    jni::local_ref<JHybridClusterSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridClusterSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::swe::iternio::reactnativeautoplay;
-  using namespace facebook;
 
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAndroidAutomotiveSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_ActiveCarUxRestrictions_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_AppFocusState_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAndroidAutoTelemetrySpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_Telemetry__cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAutoPlaySpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_VisibilityState_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_Location__std__optional_std__string__cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_SafeAreaInsets_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridClusterSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_ColorScheme_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_ZoomEvent_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_bool_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridGridTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_bool__cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_bool_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridInformationTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridListTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridMapTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_std__optional_Point__cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_double_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_ColorScheme_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_AlertDismissalReason_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_std__string_cxx::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridMessageTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridSearchTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JHybridSignInTemplateSpec::registerNatives();
-    margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_std__string__std__optional_GoogleSignInAccount__cxx::registerNatives();
+  // Register native JNI methods
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAndroidAutomotiveSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_ActiveCarUxRestrictions_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_AppFocusState_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAndroidAutoTelemetrySpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_Telemetry__cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridAutoPlaySpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_VisibilityState_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_Location__std__optional_std__string__cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_SafeAreaInsets_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridClusterSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_ColorScheme_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_ZoomEvent_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_bool_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridGridTemplateSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_bool__cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_bool_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridInformationTemplateSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridListTemplateSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridMapTemplateSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_std__optional_Point__cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_double_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_Point_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_ColorScheme_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_AlertDismissalReason_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__string_std__string_cxx::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridMessageTemplateSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridSearchTemplateSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JHybridSignInTemplateSpec::CxxPart::registerNatives();
+  margelo::nitro::swe::iternio::reactnativeautoplay::JFunc_void_std__optional_std__string__std__optional_GoogleSignInAccount__cxx::registerNatives();
 
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "AutoPlay",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridAutoPlaySpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAutoPlay");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "AndroidAutoTelemetry",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridAndroidAutoTelemetrySpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAndroidAutoTelemetry");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "AndroidAutomotive",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridAndroidAutomotiveSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridAndroidAutomotive");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "SignInTemplate",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridSignInTemplateSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridSignInTemplate");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "ListTemplate",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridListTemplateSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridListTemplate");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "InformationTemplate",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridInformationTemplateSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridInformationTemplate");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "GridTemplate",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridGridTemplateSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridGridTemplate");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "MapTemplate",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridMapTemplateSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridMapTemplate");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "MessageTemplate",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridMessageTemplateSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridMessageTemplate");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "SearchTemplate",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridSearchTemplateSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridSearchTemplate");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "Cluster",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridClusterSpec::javaobject> object("com/margelo/nitro/swe/iternio/reactnativeautoplay/HybridCluster");
-        auto instance = object.create();
-        return instance->cthis()->shared();
-      }
-    );
-  });
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "AutoPlay",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridAutoPlaySpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "AndroidAutoTelemetry",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridAndroidAutoTelemetrySpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "AndroidAutomotive",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridAndroidAutomotiveSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "SignInTemplate",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridSignInTemplateSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "ListTemplate",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridListTemplateSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "InformationTemplate",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridInformationTemplateSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "GridTemplate",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridGridTemplateSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "MapTemplate",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridMapTemplateSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "MessageTemplate",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridMessageTemplateSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "SearchTemplate",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridSearchTemplateSpecImpl::create();
+    }
+  );
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "Cluster",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridClusterSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::swe::iternio::reactnativeautoplay

package/nitrogen/generated/android/ReactNativeAutoPlayOnLoad.hpp

@@ -6,20 +6,29 @@
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::swe::iternio::reactnativeautoplay {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of ReactNativeAutoPlay, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of ReactNativeAutoPlay, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::swe::iternio::reactnativeautoplay::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all ReactNativeAutoPlay HybridObjects
+   *     margelo::nitro::swe::iternio::reactnativeautoplay::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::swe::iternio::reactnativeautoplay

package/nitrogen/generated/android/c++/JActiveCarUxRestrictions.hpp

@@ -23,7 +23,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JActiveCarUxRestrictions final: public jni::JavaClass<JActiveCarUxRestrictions> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/ActiveCarUxRestrictions;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/ActiveCarUxRestrictions;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JAlertActionStyle.hpp

@@ -19,7 +19,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JAlertActionStyle final: public jni::JavaClass<JAlertActionStyle> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AlertActionStyle;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AlertActionStyle;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JAlertDismissalReason.hpp

@@ -19,7 +19,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JAlertDismissalReason final: public jni::JavaClass<JAlertDismissalReason> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AlertDismissalReason;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AlertDismissalReason;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JAppFocusState.hpp

@@ -21,7 +21,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JAppFocusState final: public jni::JavaClass<JAppFocusState> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AppFocusState;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AppFocusState;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JAssetImage.hpp

@@ -24,7 +24,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JAssetImage final: public jni::JavaClass<JAssetImage> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AssetImage;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AssetImage;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JAutoText.hpp

@@ -26,7 +26,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JAutoText final: public jni::JavaClass<JAutoText> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AutoText;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/AutoText;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JBooleanTelemetryItem.hpp

@@ -21,7 +21,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JBooleanTelemetryItem final: public jni::JavaClass<JBooleanTelemetryItem> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/BooleanTelemetryItem;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/BooleanTelemetryItem;";
 
   public:
     /**

package/nitrogen/generated/android/c++/JCarUxRestrictions.hpp

@@ -19,7 +19,7 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
    */
   struct JCarUxRestrictions final: public jni::JavaClass<JCarUxRestrictions> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/CarUxRestrictions;";
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/swe/iternio/reactnativeautoplay/CarUxRestrictions;";
 
   public:
     /**