feat: add brownfield navigation

.changeset/hungry-donuts-appear.md

@@ -0,0 +1,6 @@
+---
+'@callstack/brownfield-navigation': minor
+'@callstack/brownfield-cli': minor
+---
+
+add brownfield navigation

.github/actions/setup/action.yml

@@ -20,6 +20,10 @@ runs:
       run: yarn install
       shell: bash
 
+    - name: Build packages
+      run: yarn build
+      shell: bash
+
     - name: Restore Turbo cache
       if: inputs.restore-turbo-cache == 'true'
       uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5

apps/AndroidApp/app/src/main/AndroidManifest.xml

@@ -13,6 +13,14 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidBrownfieldApp"
         android:usesCleartextTraffic="true">
+        <activity
+            android:name=".ReferralsActivity"
+            android:exported="false"
+            android:theme="@style/Theme.AndroidBrownfieldApp" />
+        <activity
+            android:name=".SettingsActivity"
+            android:exported="false"
+            android:theme="@style/Theme.AndroidBrownfieldApp" />
         <activity
             android:name=".MainActivity"
             android:exported="true"

apps/AndroidApp/app/src/main/java/com/callstack/brownfield/android/example/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.callstack.brownfield.android.example
 
+import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
 import android.widget.Toast
@@ -26,10 +27,12 @@ import androidx.fragment.compose.AndroidFragment
 import com.callstack.brownfield.android.example.components.GreetingCard
 import com.callstack.brownfield.android.example.components.PostMessageCard
 import com.callstack.brownfield.android.example.ui.theme.AndroidBrownfieldAppTheme
+import com.callstack.nativebrownfieldnavigation.BrownfieldNavigationDelegate
+import com.callstack.nativebrownfieldnavigation.BrownfieldNavigationManager
 import com.callstack.reactnativebrownfield.ReactNativeFragment
 import com.callstack.reactnativebrownfield.constants.ReactNativeFragmentArgNames
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), BrownfieldNavigationDelegate {
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
 
@@ -39,6 +42,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(null)
         enableEdgeToEdge()
+        BrownfieldNavigationManager.setDelegate(this)
 
         if (savedInstanceState == null) {
             ReactNativeHostManager.initialize(application) {
@@ -65,6 +69,19 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
+
+    override fun navigateToSettings() {
+        startActivity(Intent(this, SettingsActivity::class.java))
+    }
+
+    override fun navigateToReferrals(userId: String) {
+        startActivity(
+            Intent(this, ReferralsActivity::class.java).putExtra(
+                ReferralsActivity.EXTRA_USER_ID,
+                userId
+            )
+        )
+    }
 }
 
 @Composable

apps/AndroidApp/app/src/main/java/com/callstack/brownfield/android/example/ReferralsActivity.kt

@@ -0,0 +1,63 @@
+package com.callstack.brownfield.android.example
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.callstack.brownfield.android.example.ui.theme.AndroidBrownfieldAppTheme
+
+class ReferralsActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+
+        val userId = intent.getStringExtra(EXTRA_USER_ID).orEmpty()
+
+        setContent {
+            AndroidBrownfieldAppTheme {
+                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                    Column(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(innerPadding)
+                            .padding(24.dp),
+                        verticalArrangement = Arrangement.spacedBy(16.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Text(
+                            text = "Referrals",
+                            style = MaterialTheme.typography.headlineMedium
+                        )
+                        Text(
+                            text = "Opened from BrownfieldNavigation.navigateToReferrals(userId).",
+                            textAlign = TextAlign.Center
+                        )
+                        Text(
+                            text = "userId: $userId",
+                            style = MaterialTheme.typography.bodyLarge
+                        )
+                        Button(onClick = { finish() }) {
+                            Text("Go back")
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    companion object {
+        const val EXTRA_USER_ID = "extra_user_id"
+    }
+}

apps/AndroidApp/app/src/main/java/com/callstack/brownfield/android/example/SettingsActivity.kt

@@ -0,0 +1,53 @@
+package com.callstack.brownfield.android.example
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.callstack.brownfield.android.example.ui.theme.AndroidBrownfieldAppTheme
+
+class SettingsActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+
+        setContent {
+            AndroidBrownfieldAppTheme {
+                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                    Column(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(innerPadding)
+                            .padding(24.dp),
+                        verticalArrangement = Arrangement.spacedBy(16.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally
+                    ) {
+                        Text(
+                            text = "Settings",
+                            style = MaterialTheme.typography.headlineMedium
+                        )
+                        Text(
+                            text = "Opened from BrownfieldNavigation.navigateToSettings().",
+                            textAlign = TextAlign.Center
+                        )
+                        Button(onClick = { finish() }) {
+                            Text("Go back")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

apps/AppleApp/Brownfield Apple App.xcodeproj/project.pbxproj

@@ -7,14 +7,16 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		7926B0E22F4E5A6400694E68 /* BrownfieldLib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DA2F4E5A6100694E68 /* BrownfieldLib.xcframework */; };
-		7926B0E32F4E5A6400694E68 /* BrownfieldLib.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DA2F4E5A6100694E68 /* BrownfieldLib.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		7926B0E42F4E5A6600694E68 /* hermesvm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DC2F4E5A6100694E68 /* hermesvm.xcframework */; };
-		7926B0E52F4E5A6600694E68 /* hermesvm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DC2F4E5A6100694E68 /* hermesvm.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		7926B0E62F4E5A6700694E68 /* ReactBrownfield.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DD2F4E5A6100694E68 /* ReactBrownfield.xcframework */; };
-		7926B0E72F4E5A6700694E68 /* ReactBrownfield.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DD2F4E5A6100694E68 /* ReactBrownfield.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		7926B0E82F4E5A6800694E68 /* Brownie.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DB2F4E5A6100694E68 /* Brownie.xcframework */; };
-		7926B0E92F4E5A6800694E68 /* Brownie.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7926B0DB2F4E5A6100694E68 /* Brownie.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		614B23922F50633200CB6363 /* BrownfieldLib.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 614B238D2F50633200CB6363 /* BrownfieldLib.xcframework */; };
+		614B23932F50633200CB6363 /* BrownfieldLib.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 614B238D2F50633200CB6363 /* BrownfieldLib.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		614B23942F50633200CB6363 /* Brownie.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 614B238E2F50633200CB6363 /* Brownie.xcframework */; };
+		614B23952F50633200CB6363 /* Brownie.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 614B238E2F50633200CB6363 /* Brownie.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		614B23962F50633200CB6363 /* BrownfieldNavigation.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 614B238F2F50633200CB6363 /* BrownfieldNavigation.xcframework */; };
+		614B23972F50633200CB6363 /* BrownfieldNavigation.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 614B238F2F50633200CB6363 /* BrownfieldNavigation.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		614B23982F50633200CB6363 /* hermesvm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 614B23902F50633200CB6363 /* hermesvm.xcframework */; };
+		614B23992F50633200CB6363 /* hermesvm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 614B23902F50633200CB6363 /* hermesvm.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		614B239A2F50633200CB6363 /* ReactBrownfield.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 614B23912F50633200CB6363 /* ReactBrownfield.xcframework */; };
+		614B239B2F50633200CB6363 /* ReactBrownfield.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 614B23912F50633200CB6363 /* ReactBrownfield.xcframework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -24,21 +26,23 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				7926B0E92F4E5A6800694E68 /* Brownie.xcframework in Embed Frameworks */,
-				7926B0E52F4E5A6600694E68 /* hermesvm.xcframework in Embed Frameworks */,
-				7926B0E72F4E5A6700694E68 /* ReactBrownfield.xcframework in Embed Frameworks */,
-				7926B0E32F4E5A6400694E68 /* BrownfieldLib.xcframework in Embed Frameworks */,
+				614B23972F50633200CB6363 /* BrownfieldNavigation.xcframework in Embed Frameworks */,
+				614B23952F50633200CB6363 /* Brownie.xcframework in Embed Frameworks */,
+				614B239B2F50633200CB6363 /* ReactBrownfield.xcframework in Embed Frameworks */,
+				614B23992F50633200CB6363 /* hermesvm.xcframework in Embed Frameworks */,
+				614B23932F50633200CB6363 /* BrownfieldLib.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		7926B0DA2F4E5A6100694E68 /* BrownfieldLib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BrownfieldLib.xcframework; path = package/BrownfieldLib.xcframework; sourceTree = "<group>"; };
-		7926B0DB2F4E5A6100694E68 /* Brownie.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Brownie.xcframework; path = package/Brownie.xcframework; sourceTree = "<group>"; };
-		7926B0DC2F4E5A6100694E68 /* hermesvm.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermesvm.xcframework; path = package/hermesvm.xcframework; sourceTree = "<group>"; };
-		7926B0DD2F4E5A6100694E68 /* ReactBrownfield.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ReactBrownfield.xcframework; path = package/ReactBrownfield.xcframework; sourceTree = "<group>"; };
+		614B238D2F50633200CB6363 /* BrownfieldLib.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BrownfieldLib.xcframework; path = package/BrownfieldLib.xcframework; sourceTree = "<group>"; };
+		614B238E2F50633200CB6363 /* Brownie.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Brownie.xcframework; path = package/Brownie.xcframework; sourceTree = "<group>"; };
+		614B238F2F50633200CB6363 /* BrownfieldNavigation.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BrownfieldNavigation.xcframework; path = package/BrownfieldNavigation.xcframework; sourceTree = "<group>"; };
+		614B23902F50633200CB6363 /* hermesvm.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermesvm.xcframework; path = package/hermesvm.xcframework; sourceTree = "<group>"; };
+		614B23912F50633200CB6363 /* ReactBrownfield.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ReactBrownfield.xcframework; path = package/ReactBrownfield.xcframework; sourceTree = "<group>"; };
 		793C76A72EEBF938008A2A34 /* Brownfield Apple App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Brownfield Apple App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -55,25 +59,35 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7926B0E82F4E5A6800694E68 /* Brownie.xcframework in Frameworks */,
-				7926B0E62F4E5A6700694E68 /* ReactBrownfield.xcframework in Frameworks */,
-				7926B0E42F4E5A6600694E68 /* hermesvm.xcframework in Frameworks */,
-				7926B0E22F4E5A6400694E68 /* BrownfieldLib.xcframework in Frameworks */,
+				614B23962F50633200CB6363 /* BrownfieldNavigation.xcframework in Frameworks */,
+				614B23942F50633200CB6363 /* Brownie.xcframework in Frameworks */,
+				614B239A2F50633200CB6363 /* ReactBrownfield.xcframework in Frameworks */,
+				614B23982F50633200CB6363 /* hermesvm.xcframework in Frameworks */,
+				614B23922F50633200CB6363 /* BrownfieldLib.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		6108E5322F40A26800EA8FA1 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				614B238D2F50633200CB6363 /* BrownfieldLib.xcframework */,
+				614B238F2F50633200CB6363 /* BrownfieldNavigation.xcframework */,
+				614B238E2F50633200CB6363 /* Brownie.xcframework */,
+				614B23902F50633200CB6363 /* hermesvm.xcframework */,
+				614B23912F50633200CB6363 /* ReactBrownfield.xcframework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		793C769E2EEBF938008A2A34 = {
 			isa = PBXGroup;
 			children = (
 				793C76A92EEBF938008A2A34 /* Brownfield Apple App */,
+				6108E5322F40A26800EA8FA1 /* Frameworks */,
 				793C76A82EEBF938008A2A34 /* Products */,
-				7926B0DA2F4E5A6100694E68 /* BrownfieldLib.xcframework */,
-				7926B0DB2F4E5A6100694E68 /* Brownie.xcframework */,
-				7926B0DC2F4E5A6100694E68 /* hermesvm.xcframework */,
-				7926B0DD2F4E5A6100694E68 /* ReactBrownfield.xcframework */,
 			);
 			sourceTree = "<group>";
 		};

apps/AppleApp/Brownfield Apple App/BrownfieldAppleApp.swift

@@ -2,6 +2,8 @@ import BrownfieldLib
 import Brownie
 import ReactBrownfield
 import SwiftUI
+import UIKit
+import BrownfieldNavigation
 
 class AppDelegate: NSObject, UIApplicationDelegate {
     var window: UIWindow?
@@ -18,6 +20,55 @@ class AppDelegate: NSObject, UIApplicationDelegate {
     }
 }
 
+public class RNNavigationDelegate: BrownfieldNavigationDelegate {
+    public func navigateToSettings() {
+        present(SettingsScreen())
+    }
+
+    public func navigateToReferrals(userId: String) {
+        present(ReferralsScreen(userId: userId))
+    }
+
+    private func present<Content: View>(_ view: Content) {
+        DispatchQueue.main.async {
+            let hostingController = UIHostingController(rootView: view)
+
+            guard let topController = UIApplication.shared.topMostViewController() else {
+                return
+            }
+
+            if let navigationController = topController.navigationController {
+                navigationController.pushViewController(hostingController, animated: true)
+                return
+            }
+
+            let navigationController = UINavigationController(rootViewController: hostingController)
+            topController.present(navigationController, animated: true)
+        }
+    }
+}
+
+private extension UIApplication {
+    func topMostViewController(
+        base: UIViewController? = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .flatMap { $0.windows }
+            .first(where: { $0.isKeyWindow })?.rootViewController
+    ) -> UIViewController? {
+        if let navigationController = base as? UINavigationController {
+            return topMostViewController(base: navigationController.visibleViewController)
+        }
+        if let tabBarController = base as? UITabBarController,
+           let selected = tabBarController.selectedViewController {
+            return topMostViewController(base: selected)
+        }
+        if let presented = base?.presentedViewController {
+            return topMostViewController(base: presented)
+        }
+        return base
+    }
+}
+
 @main
 struct BrownfieldAppleApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
@@ -27,6 +78,21 @@ struct BrownfieldAppleApp: App {
         ReactNativeBrownfield.shared.startReactNative {
             print("React Native has been loaded")
         }
+
+//        let mgr = ReactBrownfield.BrownfieldNavigationManager.shared
+//        print("SWIFT mgr:", Unmanaged.passUnretained(mgr).toOpaque())
+//        print("SWIFT class:", NSStringFromClass(type(of: mgr)))
+//        print("SWIFT bundle:", Bundle(for: ReactBrownfield.BrownfieldNavigationManager.self).bundlePath)
+//        ReactBrownfield.BrownfieldNavigationManager.shared.setDelegate(navigationDelegate: RNNavigationDelegate())
+
+        let mgr = BrownfieldNavigationManager.shared
+        print("11 SWIFT mgr:", Unmanaged.passUnretained(mgr).toOpaque())
+        print("11 SWIFT class:", NSStringFromClass(type(of: mgr)))
+        print("11 SWIFT bundle:", Bundle(for: BrownfieldNavigationManager.self).bundlePath)
+
+        mgr.setDelegate(
+            navigationDelegate: RNNavigationDelegate()
+        )
 
         #if USE_EXPO_HOST
             ReactNativeBrownfield.shared.ensureExpoModulesProvider()