gt-react-native 0.0.1-alpha.3 → 0.0.1-alpha.6

package/android/build.gradle

@@ -15,11 +15,16 @@ buildscript {
   }
 }
 
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
 
-apply plugin: "com.facebook.react"
+if (isNewArchitectureEnabled()) {
+    apply plugin: "com.facebook.react"
+}
 
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["GtReactNative_" + name]).toInteger()
@@ -31,6 +36,7 @@ android {
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
+    buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
   }
@@ -60,6 +66,11 @@ android {
         "generated/java",
         "generated/jni"
       ]
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += ["src/newarch"]
+      } else {
+        java.srcDirs += ["src/oldarch"]
+      }
     }
   }
 }

package/android/src/main/java/com/gtreactnative/{GtReactNativeModule.kt → GtReactNativeModuleImpl.kt}

@@ -6,29 +6,16 @@ import android.os.LocaleList
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableArray
-import com.facebook.react.module.annotations.ReactModule
-import com.facebook.fbreact.specs.NativeGtReactNativeSpec
 import java.util.Locale
 
-@ReactModule(name = GtReactNativeModule.NAME)
-class GtReactNativeModule(reactContext: ReactApplicationContext) :
-  NativeGtReactNativeSpec(reactContext) {
+object GtReactNativeModuleImpl {
+  const val NAME = "GtReactNative"
 
-  private val prefs by lazy {
-    reactApplicationContext.getSharedPreferences("gt_store", Context.MODE_PRIVATE)
-  }
-
-  override fun getName(): String {
-    return NAME
-  }
-
-  // Example method
-  // See https://reactnative.dev/docs/native-modules-android
-  override fun multiply(a: Double, b: Double): Double {
+  fun multiply(a: Double, b: Double): Double {
     return a * b
   }
 
-  override fun getNativeLocales(): WritableArray {
+  fun getNativeLocales(reactContext: ReactApplicationContext): WritableArray {
     val locales = Arguments.createArray()
     val seenLocales = mutableSetOf<String>()
 
@@ -57,13 +44,13 @@ class GtReactNativeModule(reactContext: ReactApplicationContext) :
     return locales
   }
 
-  override fun nativeStoreGet(key: String): String? = prefs.getString(key, null)
-
-  override fun nativeStoreSet(key: String, value: String) {
-    prefs.edit().putString(key, value).apply()
+  fun nativeStoreGet(reactContext: ReactApplicationContext, key: String): String? {
+    val prefs = reactContext.getSharedPreferences("gt_store", Context.MODE_PRIVATE)
+    return prefs.getString(key, null)
   }
 
-  companion object {
-    const val NAME = "GtReactNative"
+  fun nativeStoreSet(reactContext: ReactApplicationContext, key: String, value: String) {
+    val prefs = reactContext.getSharedPreferences("gt_store", Context.MODE_PRIVATE)
+    prefs.edit().putString(key, value).apply()
   }
-}
+}

package/android/src/main/java/com/gtreactnative/GtReactNativePackage.kt

@@ -1,13 +1,13 @@
 package com.gtreactnative
 
-import com.facebook.react.BaseReactPackage
+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
 import java.util.HashMap
 
-class GtReactNativePackage : BaseReactPackage() {
+class GtReactNativePackage : TurboReactPackage() {
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
     return if (name == GtReactNativeModule.NAME) {
       GtReactNativeModule(reactContext)
@@ -19,13 +19,14 @@ class GtReactNativePackage : BaseReactPackage() {
   override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
     return ReactModuleInfoProvider {
       val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
       moduleInfos[GtReactNativeModule.NAME] = ReactModuleInfo(
         GtReactNativeModule.NAME,
         GtReactNativeModule.NAME,
         false,  // canOverrideExistingModule
         false,  // needsEagerInit
         false,  // isCxxModule
-        true // isTurboModule
+        isTurboModule // isTurboModule
       )
       moduleInfos
     }

package/android/src/newarch/com/gtreactnative/GtReactNativeModule.kt

@@ -0,0 +1,30 @@
+package com.gtreactnative
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = GtReactNativeModuleImpl.NAME)
+class GtReactNativeModule(reactContext: ReactApplicationContext) :
+  NativeGtReactNativeSpec(reactContext) {
+
+  override fun getName(): String {
+    return GtReactNativeModuleImpl.NAME
+  }
+
+  override fun multiply(a: Double, b: Double): Double {
+    return GtReactNativeModuleImpl.multiply(a, b)
+  }
+
+  override fun getNativeLocales(): WritableArray {
+    return GtReactNativeModuleImpl.getNativeLocales(reactApplicationContext)
+  }
+
+  override fun nativeStoreGet(key: String): String? {
+    return GtReactNativeModuleImpl.nativeStoreGet(reactApplicationContext, key)
+  }
+
+  override fun nativeStoreSet(key: String, value: String) {
+    GtReactNativeModuleImpl.nativeStoreSet(reactApplicationContext, key, value)
+  }
+}

package/android/src/oldarch/com/gtreactnative/GtReactNativeModule.kt

@@ -0,0 +1,36 @@
+package com.gtreactnative
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.module.annotations.ReactModule
+
+@ReactModule(name = GtReactNativeModuleImpl.NAME)
+class GtReactNativeModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
+
+  override fun getName(): String {
+    return GtReactNativeModuleImpl.NAME
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun multiply(a: Double, b: Double): Double {
+    return GtReactNativeModuleImpl.multiply(a, b)
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun getNativeLocales(): WritableArray {
+    return GtReactNativeModuleImpl.getNativeLocales(reactApplicationContext)
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  fun nativeStoreGet(key: String): String? {
+    return GtReactNativeModuleImpl.nativeStoreGet(reactApplicationContext, key)
+  }
+
+  @ReactMethod
+  fun nativeStoreSet(key: String, value: String) {
+    GtReactNativeModuleImpl.nativeStoreSet(reactApplicationContext, key, value)
+  }
+}

package/ios/GtReactNative.h

@@ -1,5 +1,13 @@
-#import <GtReactNativeSpec/GtReactNativeSpec.h>
+#ifdef RCT_NEW_ARCH_ENABLED
 
+#import <GtReactNativeSpec/GtReactNativeSpec.h>
 @interface GtReactNative : NSObject <NativeGtReactNativeSpec>
 
+#else
+
+#import <React/RCTBridgeModule.h>
+@interface GtReactNative : NSObject <RCTBridgeModule>
+
+#endif
+
 @end

package/ios/GtReactNative.mm

@@ -4,6 +4,8 @@
   NSUserDefaults *_defaults;
 }
 
+RCT_EXPORT_MODULE();
+
 - (instancetype)init
 {
   if ((self = [super init])) {
@@ -11,13 +13,13 @@
   }
   return self;
 }
-- (NSNumber *)multiply:(double)a b:(double)b {
-    NSNumber *result = @(a * b);
 
-    return result;
+// Internal implementation methods
+- (NSNumber *)multiplyImpl:(double)a b:(double)b {
+    return @(a * b);
 }
 
-- (NSArray<NSString *> *)getNativeLocales {
+- (NSArray<NSString *> *)getNativeLocalesImpl {
     NSMutableArray<NSString *> *locales = [[NSMutableArray alloc] init];
     
     // Add current locale first
@@ -38,27 +40,60 @@
     return [locales copy];
 }
 
-- (nullable NSString *)nativeStoreGet:(NSString *)key
+- (nullable NSString *)nativeStoreGetImpl:(NSString *)key
 {
   if (key == nil) { return nil; }
   return [_defaults stringForKey:key];
 }
 
-- (void)nativeStoreSet:(NSString *)key value:(NSString *)value
+- (void)nativeStoreSetImpl:(NSString *)key value:(NSString *)value
 {
   if (key == nil || value == nil) { return; }
   [_defaults setObject:value forKey:key];
 }
 
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-    (const facebook::react::ObjCTurboModule::InitParams &)params
-{
+#ifdef RCT_NEW_ARCH_ENABLED
+
+// New architecture
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
     return std::make_shared<facebook::react::NativeGtReactNativeSpecJSI>(params);
 }
 
-+ (NSString *)moduleName
-{
-  return @"GtReactNative";
+- (NSNumber *)multiply:(double)a b:(double)b {
+    return [self multiplyImpl:a b:b];
+}
+
+- (NSArray<NSString *> *)getNativeLocales {
+    return [self getNativeLocalesImpl];
+}
+
+- (NSString *)nativeStoreGet:(NSString *)key {
+    return [self nativeStoreGetImpl:key];
 }
 
+- (void)nativeStoreSet:(NSString *)key value:(NSString *)value {
+    [self nativeStoreSetImpl:key value:value];
+}
+
+#else
+
+// Old architecture
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(multiply:(double)a b:(double)b) {
+    return [self multiplyImpl:a b:b];
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(getNativeLocales) {
+    return [self getNativeLocalesImpl];
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(nativeStoreGet:(NSString *)key) {
+    return [self nativeStoreGetImpl:key];
+}
+t
+RCT_EXPORT_METHOD(nativeStoreSet:(NSString *)key value:(NSString *)value) {
+    [self nativeStoreSetImpl:key value:value];
+}
+
+#endif
+
 @end

package/lib/module/NativeGtReactNative.js.map

@@ -1 +1 @@
-{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeGtReactNative.ts"],"mappings":";;AAAA,SAASA,mBAAmB,QAA0B,cAAc;AASpE,eAAeA,mBAAmB,CAACC,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}
+{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"../../src","sources":["NativeGtReactNative.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;AAQlD,eAAeA,mBAAmB,CAACC,YAAY,CAAO,eAAe,CAAC","ignoreList":[]}

package/lib/typescript/src/NativeGtReactNative.d.ts

@@ -1,4 +1,4 @@
-import { type TurboModule } from 'react-native';
+import type { TurboModule } from 'react-native';
 export interface Spec extends TurboModule {
     multiply(a: number, b: number): number;
     getNativeLocales(): string[];

package/lib/typescript/src/NativeGtReactNative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeGtReactNative.d.ts","sourceRoot":"","sources":["../../../src/NativeGtReactNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvC,gBAAgB,IAAI,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAClD;;AAED,wBAAuE"}
+{"version":3,"file":"NativeGtReactNative.d.ts","sourceRoot":"","sources":["../../../src/NativeGtReactNative.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,WAAW,IAAK,SAAQ,WAAW;IACvC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvC,gBAAgB,IAAI,MAAM,EAAE,CAAC;IAC7B,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAClD;;AAED,wBAAuE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gt-react-native",
-  "version": "0.0.1-alpha.3",
+  "version": "0.0.1-alpha.6",
   "description": "An i18n package for React Native",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -19,7 +19,6 @@
     "ios",
     "cpp",
     "*.podspec",
-    "react-native.config.js",
     "!ios/build",
     "!android/build",
     "!android/gradle",

package/src/NativeGtReactNative.ts

@@ -1,5 +1,5 @@
-import { TurboModuleRegistry, type TurboModule } from 'react-native';
-
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
 export interface Spec extends TurboModule {
   multiply(a: number, b: number): number;
   getNativeLocales(): string[];