react-native-unistyles 3.0.0-alpha.35 → 3.0.0-alpha.36

package/android/CMakeLists.txt

@@ -2,28 +2,28 @@ cmake_minimum_required(VERSION 3.9.0)
 
 project(unistyles)
 
+file(GLOB_RECURSE CORE_SRC RELATIVE ${CMAKE_SOURCE_DIR} "../cxx/**/*.cpp")
+file(GLOB_RECURSE PLATFORM_SRC RELATIVE ${CMAKE_SOURCE_DIR} "./src/main/cxx/*.cpp")
+
 add_library(unistyles
     SHARED
-    ../cxx/HostStyle.cpp
-    ../cxx/HybridUnistylesRuntime.cpp
-    ../cxx/HybridStatusBar.cpp
-    ../cxx/HybridNavigationBar.cpp
-    ../cxx/ShadowTreeTraverser.cpp
-    ../cxx/StyleSheet.cpp
-    ../cxx/StyleSheetImpl.cpp
-    ../cxx/StyleSheetRegistry.cpp
-    ../cxx/UnistylesImpl.cpp
-    ../cxx/UnistylesModel.cpp
-    ../cxx/UnistylesRuntime.cpp
-    ./src/main/cxx/cpp-adapter.cpp
-    ./src/main/cxx/helpers.cpp
-    ./src/main/cxx/platform.cpp
+    ${CORE_SRC}
+    ${PLATFORM_SRC}
 )
 
-include_directories(../cxx)
-include("${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/Unistyles+autolinking.cmake")
+include("${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/unistyles+autolinking.cmake")
+
+include_directories(
+    ./src/main/cxx
+    ../cxx
+    ../cxx/common
+    ../cxx/core
+    ../cxx/hybridObjects
+    ../cxx/parser
+    ../cxx/shadowTree
+)
 
-string(APPEND CMAKE_CXX_FLAGS " -DFOLLY_NO_CONFIG")
+string(APPEND CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG")
 
 set_target_properties(unistyles PROPERTIES
     CXX_STANDARD 20
@@ -32,22 +32,17 @@ set_target_properties(unistyles PROPERTIES
     POSITION_INDEPENDENT_CODE ON
 )
 
-find_package(ReactAndroid REQUIRED CONFIG)
-find_package(fbjni REQUIRED CONFIG)
-
-# REACTNATIVE_MERGED_SO doesnt work as of RN 0.76.0-rc.3
-if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-    target_link_libraries(unistyles ReactAndroid::reactnative)
-else()
-    target_link_libraries(unistyles
-        ReactAndroid::turbomodulejsijni
-        ReactAndroid::react_nativemodule_core
-        android
-        fbjni::fbjni
-    )
-endif()
-
-target_link_libraries(unistyles
-    ReactAndroid::jsi
-    fbjni::fbjni
-)
+# todo included by nitrogen
+# find_package(ReactAndroid REQUIRED CONFIG)
+# find_package(fbjni REQUIRED CONFIG)
+
+#if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
+#     target_link_libraries(unistyles ReactAndroid::reactnative)
+#else()
+#    target_link_libraries(unistyles
+#        ReactAndroid::turbomodulejsijni
+#        ReactAndroid::react_nativemodule_core
+#         android
+#        fbjni::fbjni
+#    )
+#endif()

package/android/build.gradle

@@ -14,7 +14,7 @@ buildscript {
 
 apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
-apply from: '../nitrogen/generated/android/Unistyles+autolinking.gradle'
+apply from: '../nitrogen/generated/android/unistyles+autolinking.gradle'
 
 def resolveBuildType() {
     Gradle gradle = getGradle()
@@ -62,6 +62,7 @@ android {
             "META-INF/**",
             "**/libjsi.so",
             "**/libc++_shared.so",
+            "**/libreactnative.so",
             "**/libreact_nativemodule_core.so",
             "**/libturbomodulejsijni.so",
             "**/libfbjni.so"

package/android/src/main/cxx/NativeUnistylesModule.cpp

@@ -0,0 +1,71 @@
+#include "NativeUnistylesModule.h"
+#import <NitroModules/HybridObjectRegistry.hpp>
+#import "HybridUnistylesRuntime.h"
+#import "HybridStyleSheet.h"
+#import "HybridShadowRegistry.h"
+
+using namespace margelo::nitro::unistyles;
+using namespace facebook::react;
+
+UnistylesModule::UnistylesModule(
+    jni::alias_ref<UnistylesModule::jhybridobject> jThis,
+    jni::alias_ref<react::JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+    jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
+    jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+):  _runtimeExecutor(runtimeExecutorHolder->cthis()->get()),
+    _uiManager(fabricUIManager->getBinding()->getScheduler()->getUIManager()),
+    _nativePlatform(nativePlatform->cthis()) {}
+
+jni::local_ref<UnistylesModule::jhybriddata> UnistylesModule::initHybrid(
+    jni::alias_ref<UnistylesModule::jhybridobject> jThis,
+    jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+    jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
+    jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+) {
+    return makeCxxInstance(jThis, runtimeExecutorHolder, fabricUIManager, nativePlatform);
+}
+
+void UnistylesModule::registerNatives() {
+    javaClassStatic()->registerNatives({
+        makeNativeMethod("getBindingsInstaller", UnistylesModule::getBindingsInstaller),
+        makeNativeMethod("initHybrid", UnistylesModule::initHybrid)
+    });
+}
+
+jni::local_ref<BindingsInstallerHolder::javaobject> UnistylesModule::getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jobj) {
+    auto& runtimeExecutor = jobj->cthis()->_runtimeExecutor;
+    auto& uiManager = jobj->cthis()->_uiManager;
+    auto& nativePlatform = *jobj->cthis()->_nativePlatform;
+
+    return BindingsInstallerHolder::newObjectCxxArgs([&runtimeExecutor, uiManager, nativePlatform](jsi::Runtime& rt) {
+        // function is called on: first init and every live reload
+        // check if this is live reload, if so let's replace UnistylesRuntime with new runtime
+        auto hasUnistylesRuntime = HybridObjectRegistry::hasHybridObject("UnistylesRuntime");
+
+        if (hasUnistylesRuntime) {
+            HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesRuntime");
+            HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesStyleSheet");
+            HybridObjectRegistry::unregisterHybridObjectConstructor("UnistylesShadowRegistry");
+        }
+
+        auto runOnJSThread = [&runtimeExecutor](std::function<void(jsi::Runtime&)>&& callback) {
+            runtimeExecutor([&](jsi::Runtime &rt) {
+                callback(rt);
+            });
+        };
+
+        // init hybrids
+        auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
+        auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime, uiManager);
+
+        HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", [unistylesRuntime]() -> std::shared_ptr<HybridObject>{
+            return unistylesRuntime;
+        });
+        HybridObjectRegistry::registerHybridObjectConstructor("UnistylesStyleSheet", [styleSheet]() -> std::shared_ptr<HybridObject>{
+            return styleSheet;
+        });
+        HybridObjectRegistry::registerHybridObjectConstructor("UnistylesShadowRegistry", []() -> std::shared_ptr<HybridObject>{
+            return std::make_shared<HybridShadowRegistry>();
+        });
+    });
+}

package/android/src/main/cxx/NativeUnistylesModule.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <ReactCommon/BindingsInstallerHolder.h>
+#include <react/fabric/JFabricUIManager.h>
+#include <react/jni/JRuntimeExecutor.h>
+#include <react/renderer/scheduler/Scheduler.h>
+#include <fbjni/fbjni.h>
+#include <react/fabric/Binding.h>
+#include "NativePlatform.h"
+
+namespace margelo::nitro::unistyles {
+
+using namespace facebook;
+using namespace facebook::react;
+
+struct UnistylesModule : public jni::HybridClass<UnistylesModule> {
+    static constexpr auto kJavaDescriptor = "Lcom/unistyles/UnistylesModule;";
+
+    explicit UnistylesModule(
+        jni::alias_ref<jhybridobject> jThis,
+        jni::alias_ref<react::JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+        jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
+        jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+    );
+
+    static void registerNatives();
+    static jni::local_ref<jhybriddata> initHybrid(
+        jni::alias_ref<jhybridobject> jThis,
+        jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutorHolder,
+        jni::alias_ref<JFabricUIManager::javaobject>,
+        jni::alias_ref<JHybridNativePlatformSpec::javaobject> nativePlatform
+    );
+
+    static jni::local_ref<BindingsInstallerHolder::javaobject> getBindingsInstaller(jni::alias_ref<UnistylesModule::javaobject> jThis);
+
+private:
+    std::shared_ptr<UIManager> _uiManager;
+    RuntimeExecutor _runtimeExecutor;
+    Unistyles::HybridNativePlatformSpecCxx* _nativePlatform;
+};
+
+}

package/android/src/main/cxx/cpp-adapter.cpp

@@ -1,88 +1,10 @@
-#include <jni.h>
-
-#include <NitroModules/HybridObjectRegistry.hpp>
-#include <HybridUnistylesRuntime.h>
-#include <HybridStatusBar.h>
-#include <HybridNavigationBar.h>
-
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-    HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", []() -> std::shared_ptr<HybridObject>{
-        return std::make_shared<HybridUnistylesRuntime>();
-    });
-    HybridObjectRegistry::registerHybridObjectConstructor("StatusBar", []() -> std::shared_ptr<HybridObject>{
-        return std::make_shared<HybridStatusBar>();
+#include <fbjni/fbjni.h>
+#include "unistylesOnLoad.hpp"
+#include "NativeUnistylesModule.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+    return facebook::jni::initialize(vm, [=] {
+        margelo::nitro::unistyles::UnistylesModule::registerNatives();
+        margelo::nitro::unistyles::initialize(vm);
     });
-    HybridObjectRegistry::registerHybridObjectConstructor("NavigationBar", []() -> std::shared_ptr<HybridObject>{
-        return std::make_shared<HybridNavigationBar>();
-    });
-
-    return JNI_VERSION_1_2;
 }
-
-//using namespace facebook;
-//
-//static jobject unistylesModule = nullptr;
-//std::shared_ptr<UnistylesRuntime> unistylesRuntime = nullptr;
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeInstall(JNIEnv *env, jobject thiz, jlong jsi, jobject callInvokerHolder) {
-//    auto runtime = reinterpret_cast<jsi::Runtime *>(jsi);
-//    auto callInvoker{
-//        jni::alias_ref<react::CallInvokerHolder::javaobject>{ reinterpret_cast<react::CallInvokerHolder::javaobject>(callInvokerHolder)} -> cthis() ->getCallInvoker()
-//    };
-//
-//    if (unistylesModule == nullptr) {
-//        unistylesModule = env->NewGlobalRef(thiz);
-//    }
-//
-//    if (unistylesModule == nullptr) {
-//        return throwKotlinException(env, "Something went wrong while initializing UnistylesModule");
-//    }
-//
-//    unistylesRuntime = std::make_shared<UnistylesRuntime>(*runtime, callInvoker);
-//    auto styleSheet = std::make_shared<StyleSheet>(*runtime, unistylesRuntime);
-//
-//    makeShared(env, unistylesModule, unistylesRuntime);
-//
-//    jsi::Object hostObject = jsi::Object::createFromHostObject(*runtime, unistylesRuntime);
-//    jsi::Object styleSheetHostObject = jsi::Object::createFromHostObject(*runtime, styleSheet);
-//    runtime->global().setProperty(*runtime, "__UNISTYLES__", std::move(hostObject));
-//    runtime->global().setProperty(*runtime, "__UNISTYLES__STYLESHEET__", std::move(styleSheetHostObject));
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeDestroy(JNIEnv *env, jobject thiz) {
-//    unistylesRuntime.reset();
-//    unistylesModule = nullptr;
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeOnOrientationChange(JNIEnv *env, jobject thiz, jobject screen, jobject insets, jobject statusBar, jobject navigationBar) {
-//    if (unistylesRuntime != nullptr) {
-//        Screen screenDimensions = jobjectToScreen(env, screen);
-//        Dimensions statusBarDimensions = jobjectToDimensions(env, statusBar);
-//        Insets screenInsets = jobjectToInsets(env, insets);
-//        Dimensions navigationBarDimensions = jobjectToDimensions(env, navigationBar);
-//
-//        unistylesRuntime->handleScreenSizeChange(screenDimensions, screenInsets, statusBarDimensions, navigationBarDimensions);
-//    }
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeOnAppearanceChange(JNIEnv *env, jobject thiz, jstring colorScheme) {
-//    if (unistylesRuntime != nullptr) {
-//        unistylesRuntime->handleAppearanceChange(env->GetStringUTFChars(colorScheme, nullptr));
-//    }
-//}
-//
-//extern "C"
-//JNIEXPORT void JNICALL
-//Java_com_unistyles_UnistylesModule_nativeOnContentSizeCategoryChange(JNIEnv *env, jobject thiz, jstring contentSizeCategory) {
-//    if (unistylesRuntime != nullptr) {
-//        unistylesRuntime->handleContentSizeCategoryChange(env->GetStringUTFChars(contentSizeCategory, nullptr));
-//    }
-//}

package/android/src/main/java/com/unistyles/NativePlatform.kt

@@ -0,0 +1,184 @@
+package com.unistyles
+
+import UnistylesModuleInsets
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Build
+import android.util.DisplayMetrics
+import android.view.WindowManager
+import androidx.core.text.TextUtilsCompat
+import androidx.core.view.ViewCompat
+import com.facebook.react.bridge.ReactApplicationContext
+import com.margelo.nitro.unistyles.ColorScheme
+import com.margelo.nitro.unistyles.Dimensions
+import com.margelo.nitro.unistyles.HybridNativePlatformSpec
+import com.margelo.nitro.unistyles.Insets
+import com.margelo.nitro.unistyles.Orientation
+import com.margelo.nitro.unistyles.UnistyleDependency
+import com.margelo.nitro.unistyles.UnistylesNativeMiniRuntime
+import java.util.Locale
+
+class NativePlatform(private val reactContext: ReactApplicationContext): HybridNativePlatformSpec() {
+    private val _insets = UnistylesModuleInsets(reactContext)
+
+    override fun getInsets(): Insets {
+        return _insets.getInsets()
+    }
+
+    override fun getColorScheme(): ColorScheme {
+        val uiMode = reactContext.resources.configuration.uiMode
+
+        val colorScheme = when (uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) {
+            Configuration.UI_MODE_NIGHT_YES -> ColorScheme.DARK
+            Configuration.UI_MODE_NIGHT_NO -> ColorScheme.LIGHT
+            else -> ColorScheme.UNSPECIFIED
+        }
+
+        return colorScheme
+    }
+
+    override fun getFontScale(): Double {
+        return reactContext.resources.configuration.fontScale.toDouble()
+    }
+
+    override fun getPixelRatio(): Double {
+        return reactContext.resources.displayMetrics.density.toDouble()
+    }
+
+    override fun getOrientation(): Orientation {
+        val orientation = when (reactContext.resources.configuration.orientation) {
+            Configuration.ORIENTATION_PORTRAIT -> Orientation.PORTRAIT
+            Configuration.ORIENTATION_LANDSCAPE -> Orientation.LANDSCAPE
+            else -> Orientation.PORTRAIT
+        }
+
+        return orientation
+    }
+
+    override fun getContentSizeCategory(): String {
+        val fontScale = reactContext.resources.configuration.fontScale
+
+        val contentSizeCategory = when {
+            fontScale <= 0.85f -> "Small"
+            fontScale <= 1.0f -> "Default"
+            fontScale <= 1.15f -> "Large"
+            fontScale <= 1.3f -> "ExtraLarge"
+            fontScale <= 1.5f -> "Huge"
+            fontScale <= 1.8 -> "ExtraHuge"
+            else -> "ExtraExtraHuge"
+        }
+
+        return contentSizeCategory
+    }
+
+    override fun getScreenDimensions(): Dimensions {
+        // function takes in count edge-to-edge layout
+        when {
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.R -> {
+                val windowManager = reactContext.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+                val metrics = DisplayMetrics()
+
+                windowManager.defaultDisplay.getRealMetrics(metrics)
+
+                val screenWidth = (metrics.widthPixels / metrics.density).toDouble()
+                val screenHeight = (metrics.heightPixels / metrics.density).toDouble()
+
+                return Dimensions(screenWidth, screenHeight)
+            }
+            else -> {
+                val displayMetrics = reactContext.resources.displayMetrics
+
+                reactContext.currentActivity?.windowManager?.currentWindowMetrics?.bounds?.let {
+                    val boundsWidth = (it.width() / displayMetrics.density).toDouble()
+                    val boundsHeight = (it.height() / displayMetrics.density).toDouble()
+
+                    return Dimensions(boundsWidth, boundsHeight)
+                } ?: run {
+                    val screenWidth = (displayMetrics.widthPixels / displayMetrics.density).toDouble()
+                    val screenHeight = (displayMetrics.heightPixels / displayMetrics.density).toDouble()
+
+                    return Dimensions(screenWidth, screenHeight)
+                }
+            }
+        }
+    }
+
+    override fun getStatusBarDimensions(): Dimensions {
+        // todo
+        return Dimensions(0.0, 0.0)
+    }
+
+    override fun getNavigationBarDimensions(): Dimensions {
+        // todo
+        return Dimensions(0.0, 0.0)
+    }
+
+    override fun getPrefersRtlDirection(): Boolean {
+        // forced by React Native
+        val sharedPrefs = reactContext.getSharedPreferences(
+            "com.facebook.react.modules.i18nmanager.I18nUtil",
+            Context.MODE_PRIVATE
+        )
+        val hasForcedRtl = sharedPrefs.getBoolean("RCTI18nUtil_forceRTL", false)
+        // user preferences
+        val isRtl = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL
+
+        return hasForcedRtl || isRtl
+    }
+
+    override fun setRootViewBackgroundColor(color: Double) {
+        // todo
+    }
+
+    override fun setNavigationBarBackgroundColor(color: Double) {
+        // todo
+    }
+
+    override fun setNavigationBarHidden(isHidden: Boolean) {
+        // todo
+    }
+
+    override fun setStatusBarHidden(isHidden: Boolean) {
+        // todo
+    }
+
+    override fun setStatusBarBackgroundColor(color: Double) {
+        // todo
+    }
+
+    override fun setImmersiveMode(isEnabled: Boolean) {
+        this.setStatusBarHidden(isEnabled)
+        this.setNavigationBarHidden(isEnabled)
+    }
+
+    override fun getMiniRuntime(): UnistylesNativeMiniRuntime {
+        return UnistylesNativeMiniRuntime(
+            colorScheme = this.getColorScheme(),
+            screen = this.getScreenDimensions(),
+            contentSizeCategory = this.getContentSizeCategory(),
+            insets = this.getInsets(),
+            pixelRatio = this.getPixelRatio(),
+            fontScale = this.getFontScale(),
+            rtl = this.getPrefersRtlDirection(),
+            statusBar = this.getStatusBarDimensions(),
+            navigationBar = this.getNavigationBarDimensions(),
+            isPortrait = this.getOrientation() == Orientation.PORTRAIT,
+            isLandscape = this.getOrientation() == Orientation.LANDSCAPE
+        )
+    }
+
+    override fun registerPlatformListener(callback: (dependencies: Array<UnistyleDependency>) -> Unit) {
+        // todo
+    }
+
+    override fun registerImeListener(callback: () -> Unit) {
+        // todo
+    }
+
+    override fun unregisterPlatformListeners() {
+        // todo
+    }
+
+    override val memorySize: Long
+        get() = 0
+}

package/android/src/main/java/com/unistyles/UnistylesModule+insets.kt

@@ -0,0 +1,8 @@
+import com.facebook.react.bridge.ReactApplicationContext
+import com.margelo.nitro.unistyles.Insets
+
+class UnistylesModuleInsets(private val reactContext: ReactApplicationContext) {
+    fun getInsets(): Insets {
+        return Insets(top = 0.0, bottom = 0.0, left = 0.0, right = 0.0, ime = 0.0)
+    }
+}

package/android/src/main/java/com/unistyles/UnistylesModule.kt

@@ -0,0 +1,47 @@
+package com.unistyles
+
+import com.facebook.fbreact.specs.NativeTurboUnistylesSpec
+import com.facebook.jni.HybridData
+import com.facebook.proguard.annotations.DoNotStrip
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.RuntimeExecutor
+import com.facebook.react.fabric.FabricUIManager
+import com.facebook.react.turbomodule.core.interfaces.BindingsInstallerHolder
+import com.facebook.react.turbomodule.core.interfaces.TurboModuleWithJSIBindings
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.common.UIManagerType
+import com.margelo.nitro.unistyles.HybridNativePlatformSpec
+
+@Suppress("KotlinJniMissingFunction")
+class UnistylesModule(reactContext: ReactApplicationContext): NativeTurboUnistylesSpec(reactContext), TurboModuleWithJSIBindings {
+    @DoNotStrip
+    private var mHybridData: HybridData?
+    private val _nativePlatform = NativePlatform(reactContext)
+
+    companion object {
+        const val NAME = NativeTurboUnistylesSpec.NAME
+    }
+
+    init {
+        mHybridData = initializeHybridData(reactContext)
+    }
+
+    private fun initializeHybridData(reactContext: ReactApplicationContext): HybridData {
+        val runtimeExecutor = reactContext.catalystInstance?.runtimeExecutor
+            ?: throw IllegalStateException("Unistyles: React Native runtime executor is not available. Please follow installation guides.")
+        val fabricUIManager = UIManagerHelper.getUIManager(reactContext, UIManagerType.FABRIC) as? FabricUIManager
+            ?: throw IllegalStateException("Unistyles: Fabric UI Manager is not available. Please follow installation guides.")
+
+        return initHybrid(runtimeExecutor, fabricUIManager, _nativePlatform)
+    }
+
+    @DoNotStrip
+    external override fun getBindingsInstaller(): BindingsInstallerHolder
+
+    @DoNotStrip
+    private external fun initHybrid(
+        runtimeExecutor: RuntimeExecutor,
+        fabricUIManager: FabricUIManager,
+        nativePlatform: HybridNativePlatformSpec
+    ): HybridData
+}

package/android/src/main/java/com/unistyles/UnistylesPackage.kt

@@ -1,28 +1,30 @@
 package com.unistyles
 
-import android.util.Log
 import com.facebook.react.TurboReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.module.model.ReactModuleInfoProvider
 
 class UnistylesPackage: TurboReactPackage() {
-    companion object {
-        private const val TAG: String = "Unistyles"
-
-        init {
-            try {
-                System.loadLibrary("unistyles")
-                Log.i(TAG, "Installed Unistyles \uD83E\uDD84!")
-            } catch (e: Throwable) {
-                Log.e(TAG, "Failed to load Unistyles C++ library! Is it properly linked?", e)
-                throw e
-            }
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return if (name == UnistylesModule.NAME) {
+            UnistylesModule(reactContext)
+        } else {
+            null
         }
     }
 
-    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? = null
     override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-        return ReactModuleInfoProvider { emptyMap() }
+        return ReactModuleInfoProvider {
+            mapOf(UnistylesModule.NAME to ReactModuleInfo(
+                UnistylesModule.NAME,
+                UnistylesModule.NAME,
+                _canOverrideExistingModule = true,
+                _needsEagerInit = true,
+                isCxxModule = true,
+                isTurboModule = true
+            ))
+        }
     }
 }

package/cxx/NativePlatform.h

@@ -0,0 +1,11 @@
+#if __has_include("Unistyles-Swift-Cxx-Umbrella.hpp")
+    #include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#elif __has_include("JHybridNativePlatformSpec.hpp")
+    #include "JHybridNativePlatformSpec.hpp"
+
+    namespace Unistyles {
+        using HybridNativePlatformSpecCxx = margelo::nitro::unistyles::JHybridNativePlatformSpec;
+    }
+#else
+    #error "Unistyles: Can't find platform specific header!"
+#endif

package/cxx/common/Helpers.h

@@ -3,7 +3,7 @@
 #include <jsi/jsi.h>
 #include <jsi/JSIDynamic.h>
 #include <folly/dynamic.h>
-#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include "NativePlatform.h"
 #include <unordered_set>
 
 using namespace facebook;

package/cxx/core/Unistyle.h

@@ -3,7 +3,7 @@
 #include "string"
 #include <jsi/jsi.h>
 #include <folly/dynamic.h>
-#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include "NativePlatform.h"
 
 namespace margelo::nitro::unistyles::core {
 

package/cxx/core/UnistylesRegistry.h

@@ -53,7 +53,7 @@ private:
     std::unordered_map<jsi::Runtime*, std::unordered_map<const ShadowNodeFamily*, std::vector<std::shared_ptr<UnistyleData>>>> _shadowRegistry{};
 };
 
-UnistylesRegistry& UnistylesRegistry::get() {
+inline UnistylesRegistry& UnistylesRegistry::get() {
     static UnistylesRegistry cache;
 
     return cache;

package/cxx/hybridObjects/HybridNavigationBar.h

@@ -1,19 +1,19 @@
 #pragma once
 
 #include "HybridUnistylesNavigationBarSpec.hpp"
-#include "Unistyles-Swift-Cxx-Umbrella.hpp"
+#include "NativePlatform.h"
 #include <optional>
 
 using namespace margelo::nitro::unistyles;
 
 struct HybridNavigationBar: public HybridUnistylesNavigationBarSpec {
     HybridNavigationBar(Unistyles::HybridNativePlatformSpecCxx nativePlatform): HybridObject(TAG), _nativePlatform{nativePlatform} {}
-    
+
     void setBackgroundColor(double color) override;
     void setHidden(bool isHidden) override;
     double getWidth() override;
     double getHeight() override;
-    
+
 private:
     Unistyles::HybridNativePlatformSpecCxx _nativePlatform;
 };