Merge pull request #85 from patrickkabwe/feat/new-nitro

Feat/new nitro

Author: patrickkabwe

.github/workflows/ios-build.yml

@@ -38,9 +38,9 @@ env:
   USE_CCACHE: 1
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: true
-    
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_new:
     name: Build iOS Example App (new architecture)
@@ -49,6 +49,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: oven-sh/setup-bun@v2
 
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
       - name: Install npm dependencies (bun)
         run: bun install
 
@@ -95,6 +100,11 @@ jobs:
       - name: Install npm dependencies (bun)
         run: bun install
 
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
       - name: Disable new architecture in Podfile
         run: sed -i "" "s/ENV\['RCT_NEW_ARCH_ENABLED'\] = '1'/ENV['RCT_NEW_ARCH_ENABLED'] = '0'/g" example/ios/Podfile
 
@@ -133,4 +143,4 @@ jobs:
           -configuration Debug \
           -destination 'platform=iOS Simulator,name=iPhone 16' \
           build \
-          CODE_SIGNING_ALLOWED=NO | xcpretty"
+          CODE_SIGNING_ALLOWED=NO | xcpretty"

README.md

@@ -19,7 +19,7 @@ A Simple React Native Nitro module for in-app browser.
 
 
 ```sh
-bun install react-native-nitro-in-app-browser react-native-nitro-modules@0.26.3
+bun install react-native-nitro-in-app-browser react-native-nitro-modules@0.28.0
 cd ios && pod install && cd ..
 ```
 

bun.lock

@@ -1,7 +1,5 @@
 module.exports = {
   arrowParens: 'avoid',
-  bracketSameLine: true,
-  bracketSpacing: false,
   singleQuote: true,
   trailingComma: 'all',
 };

example/.prettierrc.js

@@ -1,10 +1,9 @@
 import React from 'react';
-import {Button, SafeAreaView, StyleSheet} from 'react-native';
-import NitroInAppBrowser, {
-  NitroInAppBrowserPresentationStyle,
-} from 'react-native-nitro-in-app-browser';
+import {Alert, Button, StyleSheet} from 'react-native';
+import NitroInAppBrowser from 'react-native-nitro-in-app-browser';
+import {SafeAreaProvider, SafeAreaView} from 'react-native-safe-area-context';
 
-const App = () => {
+const AppWrapper = () => {
   return (
     <SafeAreaView style={styles.container}>
       <Button
@@ -15,17 +14,30 @@ const App = () => {
               barColor: 'purple',
               controlColor: '#000000',
               dismissButtonLabel: 'close',
-              presentationStyle: NitroInAppBrowserPresentationStyle.FullScreen,
+              presentationStyle: 'fullScreen',
             });
           } catch (error) {
-            console.error(error);
+            Alert.alert('Error', (error as Error).message, [
+              {
+                text: 'OK',
+                onPress: () => {},
+              },
+            ]);
           }
         }}
       />
     </SafeAreaView>
   );
 };
 
+const App = () => {
+  return (
+    <SafeAreaProvider>
+      <AppWrapper />
+    </SafeAreaProvider>
+  );
+};
+
 export default App;
 
 const styles = StyleSheet.create({

example/App.tsx

@@ -6,11 +6,11 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
+
+
 
 class MainApplication : Application(), ReactApplication {
 
@@ -35,10 +35,6 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
+    loadReactNative(this)
   }
 }

example/android/app/src/main/java/com/nitroinappbrowserexample/MainApplication.kt

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
-        kotlinVersion = "2.0.21"
+        kotlinVersion = "2.1.20"
     }
     repositories {
         google()

example/android/build.gradle

@@ -37,3 +37,8 @@ newArchEnabled=true
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
+
+# Use this property to enable edge-to-edge display support.
+# This allows your app to draw behind system bars for an immersive UI.
+# Note: Only works with ReactActivity and should not be used with custom Activity.
+edgeToEdgeEnabled=false

example/android/gradle.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME