fix: prevent name shadowing, make it proper TM (#103)

* fix: prevent name shadowing, make it a proper turbo module

* feat: proper turbo module for Android

* fix: rename to ReactBrownfield

Author: okwasniewski

ReactBrownfield.podspec

@@ -0,0 +1,22 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+Pod::Spec.new do |spec|
+  spec.name         = "ReactBrownfield"
+  spec.version      = package['version']
+  spec.summary      = package['description']
+  spec.license      = package['license']
+
+  spec.authors      = package['author']
+  spec.homepage     = package['homepage']
+  spec.platform     = :ios, "14.0"
+
+  spec.module_name = "ReactBrownfield"
+  spec.source       = { :git => "[email protected]:callstack/react-native-brownfield.git", :tag => "#{spec.version}" }
+  spec.source_files  = "ios/**/*.{h,m,mm,swift}"
+  spec.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+
+  spec.dependency 'ReactAppDependencyProvider'
+  install_modules_dependencies(spec)
+end

ReactNativeBrownfield.podspec

@@ -84,6 +84,21 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  sourceSets {
+    main {
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += [
+          "src/newarch",
+          // Codegen specs
+          "generated/java",
+          "generated/jni"
+        ]
+      } else {
+        java.srcDirs += ["src/oldarch"]
+      }
+    }
+  }
 }
 
 repositories {

android/build.gradle

@@ -0,0 +1,37 @@
+package com.callstack.reactnativebrownfield
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactMethod
+
+class ReactNativeBrownfieldModule(reactContext: ReactApplicationContext) :
+  NativeReactNativeBrownfieldModuleSpec(reactContext) {
+  companion object {
+    var shouldPopToNative: Boolean = false
+  }
+
+  @ReactMethod
+  override fun popToNative(animated: Boolean) {
+    shouldPopToNative = true
+    onBackPressed()
+  }
+
+  @ReactMethod
+  override fun setPopGestureRecognizerEnabled(enabled: Boolean) {
+    shouldPopToNative = enabled
+  }
+
+  @ReactMethod
+  override fun setHardwareBackButtonEnabled(enabled: Boolean) {
+    shouldPopToNative = enabled
+  }
+
+  private fun onBackPressed() {
+    reactApplicationContext.currentActivity?.runOnUiThread {
+      reactApplicationContext.currentActivity?.onBackPressed()
+    }
+  }
+
+  override fun getName(): String {
+    return "ReactNativeBrownfield"
+  }
+}

android/src/newarch/ReactNativeBrownfieldModule.kt

@@ -11,11 +11,16 @@ class ReactNativeBrownfieldModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun popToNative() {
+  fun popToNative(animated: Boolean) {
     shouldPopToNative = true
     onBackPressed()
   }
 
+  @ReactMethod
+  fun setPopGestureRecognizerEnabled(enabled: Boolean) {
+    shouldPopToNative = enabled
+  }
+
   @ReactMethod
   fun setHardwareBackButtonEnabled(isFirstRoute: Boolean) {
     shouldPopToNative = isFirstRoute

android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeBrownfieldModule.kt renamed to android/src/oldarch/ReactNativeBrownfieldModule.kt

@@ -9,7 +9,7 @@ React Native Brownfield provides first-class support for Swift.
 You can import the object from:
 
 ```swift
-import ReactNativeBrownfield
+import ReactBrownfield
 ```
 
 ---
@@ -80,7 +80,7 @@ React Native Brownfield supports two main approaches for initialization:
 
 ```swift
 import UIKit
-import ReactNativeBrownfield
+import ReactBrownfield
 
 class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
@@ -98,7 +98,7 @@ To present a React Native view in a UIKit app, use `ReactNativeViewController`:
 
 ```swift
 import UIKit
-import ReactNativeBrownfield
+import ReactBrownfield
 
 class ViewController: UIViewController {
   @IBAction func openReactNativeScreen(_ sender: UIButton) {
@@ -113,7 +113,7 @@ class ViewController: UIViewController {
 
 ```swift
 import SwiftUI
-import ReactNativeBrownfield
+import ReactBrownfield
 
 @main
 struct MyApp: App {
@@ -135,7 +135,7 @@ To display React Native views in SwiftUI, use the provided `ReactNativeView` com
 
 ```swift
 import SwiftUI
-import ReactNativeBrownfield
+import ReactBrownfield
 
 struct ContentView: View {
   var body: some View {
@@ -167,7 +167,7 @@ A view controller that's rendering React Native view within its bounds. It autom
 You can import it from:
 
 ```swift
-import ReactNativeBrownfield
+import ReactBrownfield
 ```
 
 ---
@@ -200,7 +200,7 @@ A SwiftUI view that wraps the `ReactNativeViewController`, making it easy to int
 You can import it from:
 
 ```swift
-import ReactNativeBrownfield
+import ReactBrownfield
 ```
 
 ---

docs/SWIFT.md

@@ -1,4 +1,4 @@
-const path = require("path");
+const path = require('path');
 const pkg = require('../package.json');
 
 module.exports = {
@@ -7,8 +7,8 @@ module.exports = {
       automaticPodsInstallation: true,
     },
     android: {
-      sourceDir: './kotlin'
-    }
+      sourceDir: './kotlin',
+    },
   },
   dependencies: {
     [pkg.name]: {

example/react-native.config.js

@@ -1,5 +1,5 @@
 import SwiftUI
-import ReactNativeBrownfield
+import ReactBrownfield
 
 @main
 struct MyApp: App {

example/swift/App.swift

@@ -27,7 +27,8 @@ target 'SwiftExample' do
     react_native_post_install(
       installer,
       config[:reactNativePath],
-      :mac_catalyst_enabled => false
+      :mac_catalyst_enabled => false,
+      :ccache_enabled => true
     )
   end
 end

example/swift/Podfile

@@ -1527,6 +1527,28 @@ PODS:
     - React-jsi (= 0.78.0)
   - ReactAppDependencyProvider (0.78.0):
     - ReactCodegen
+  - ReactBrownfield (1.0.0-rc.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.11.18.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactAppDependencyProvider
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - ReactCodegen (0.78.0):
     - DoubleConversion
     - glog
@@ -1591,28 +1613,6 @@ PODS:
     - React-logger (= 0.78.0)
     - React-perflogger (= 0.78.0)
     - React-utils (= 0.78.0)
-  - ReactNativeBrownfield (0.1.0):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2024.11.18.00)
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-featureflags
-    - React-graphics
-    - React-ImageManager
-    - React-NativeModulesApple
-    - React-RCTFabric
-    - React-rendererdebug
-    - React-utils
-    - ReactAppDependencyProvider
-    - ReactCodegen
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-    - Yoga
   - RNScreens (4.9.1):
     - DoubleConversion
     - glog
@@ -1728,9 +1728,9 @@ DEPENDENCIES:
   - React-timing (from `../node_modules/react-native/ReactCommon/react/timing`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
   - ReactAppDependencyProvider (from `build/generated/ios`)
+  - ReactBrownfield (from `../..`)
   - ReactCodegen (from `build/generated/ios`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
-  - ReactNativeBrownfield (from `../..`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
@@ -1868,12 +1868,12 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/utils"
   ReactAppDependencyProvider:
     :path: build/generated/ios
+  ReactBrownfield:
+    :path: "../.."
   ReactCodegen:
     :path: build/generated/ios
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
-  ReactNativeBrownfield:
-    :path: "../.."
   RNScreens:
     :path: "../node_modules/react-native-screens"
   Yoga:
@@ -1944,13 +1944,13 @@ SPEC CHECKSUMS:
   React-timing: bb220a53a795ed57976a4855c521f3de2f298fe5
   React-utils: 3b054aaebe658fc710a8d239d0e4b9fd3e0b78f9
   ReactAppDependencyProvider: a1fb08dfdc7ebc387b2e54cfc9decd283ed821d8
+  ReactBrownfield: e05f198df083698ed9942ace80fd90da6e9298de
   ReactCodegen: 008c319179d681a6a00966edfc67fda68f9fbb2e
   ReactCommon: 0c097b53f03d6bf166edbcd0915da32f3015dd90
-  ReactNativeBrownfield: 4cbb58bb8076bf4e4c4a9769ada50f6c6db1f6a7
   RNScreens: 0d4cb9afe052607ad0aa71f645a88bb7c7f2e64c
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: afd04ff05ebe0121a00c468a8a3c8080221cb14c
 
-PODFILE CHECKSUM: 0e2d5a1ac40562245e67fac5c121a808e048368b
+PODFILE CHECKSUM: b5dc5f822e98018cbffd7384516e146bba9f6d99
 
 COCOAPODS: 1.15.2