jiggag · jiggag · Dec 25, 2023 · Dec 23, 2023 · Dec 25, 2023
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby '>= 2.6.10'
-gem 'cocoapods', '~> 1.12'
+gem 'cocoapods', '~> 1.13'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
 
 gem 'fastlane'
 gem 'fastlane-plugin-firebase_app_distribution'
diff --git a/__tests__/App.test.tsx b/__tests__/App.test.tsx
@@ -4,7 +4,7 @@ import { it } from '@jest/globals';
 import { render } from '@testing-library/react-native';
 import { App } from '../src/App';
 
-// Note: import explicitly to use the types shiped with jest.
+// Note: import explicitly to use the types shipped with jest.
 
 jest.mock('@notifee/react-native', () => ({
   requestPermission: jest.fn(() => ({

diff --git a/__tests__/__snapshots__/App.test.tsx.snap b/__tests__/__snapshots__/App.test.tsx.snap
@@ -33,11 +33,17 @@ exports[`renders correctly 1`] = `
       onAppear={[Function]}
       onDisappear={[Function]}
       onDismissed={[Function]}
+      onGestureCancel={[Function]}
       onHeaderBackButtonClicked={[Function]}
       onNativeDismissCancelled={[Function]}
       onTransitionProgress={[Function]}
       onWillDisappear={[Function]}
       replaceAnimation="push"
+      sheetAllowedDetents="large"
+      sheetCornerRadius={-1}
+      sheetExpandsWhenScrolledToEdge={true}
+      sheetGrabberVisible={false}
+      sheetLargestUndimmedDetent="all"
       stackPresentation="push"
       style={
         {
@@ -50,110 +56,123 @@ exports[`renders correctly 1`] = `
       }
       swipeDirection="horizontal"
     >
-      <RNSScreenStackHeaderConfig
-        backButtonInCustomView={false}
-        backgroundColor="rgb(255, 255, 255)"
-        color="rgb(0, 122, 255)"
-        direction="ltr"
-        disableBackButtonMenu={false}
-        hidden={false}
-        hideBackButton={false}
-        largeTitleHideShadow={false}
-        title="Main"
-        titleColor="rgb(28, 28, 30)"
-        topInsetEnabled={false}
-        translucent={false}
-      />
       <View
+        accessibilityElementsHidden={false}
+        importantForAccessibility="auto"
         style={
-          [
-            {
-              "flex": 1,
-            },
-            {
-              "backgroundColor": "rgb(242, 242, 242)",
-            },
-            undefined,
-          ]
+          {
+            "flex": 1,
+            "flexDirection": "column-reverse",
+          }
         }
       >
-        <RCTSafeAreaView>
-          <RCTScrollView
-            contentInsetAdjustmentBehavior="automatic"
-          >
-            <View>
-              <Text
-                style={
-                  {
-                    "fontSize": 24,
-                    "fontWeight": "600",
-                  }
-                }
-              >
-                Starter (Main)
-              </Text>
-              <View
-                accessibilityRole="button"
-                accessibilityState={
-                  {
-                    "busy": undefined,
-                    "checked": undefined,
-                    "disabled": undefined,
-                    "expanded": undefined,
-                    "selected": undefined,
+        <View
+          collapsable={false}
+          style={
+            [
+              {
+                "flex": 1,
+              },
+              {
+                "backgroundColor": "rgb(242, 242, 242)",
+              },
+              undefined,
+            ]
+          }
+        >
+          <RCTSafeAreaView>
+            <RCTScrollView
+              contentInsetAdjustmentBehavior="automatic"
+            >
+              <View>
+                <Text
+                  style={
+                    {
+                      "fontSize": 24,
+                      "fontWeight": "600",
+                    }
                   }
-                }
-                accessibilityValue={
-                  {
-                    "max": undefined,
-                    "min": undefined,
-                    "now": undefined,
-                    "text": undefined,
+                >
+                  Starter (Main)
+                </Text>
+                <View
+                  accessibilityRole="button"
+                  accessibilityState={
+                    {
+                      "busy": undefined,
+                      "checked": undefined,
+                      "disabled": undefined,
+                      "expanded": undefined,
+                      "selected": undefined,
+                    }
                   }
-                }
-                accessible={true}
-                collapsable={false}
-                focusable={true}
-                onClick={[Function]}
-                onResponderGrant={[Function]}
-                onResponderMove={[Function]}
-                onResponderRelease={[Function]}
-                onResponderTerminate={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
-                style={
-                  {
-                    "opacity": 1,
+                  accessibilityValue={
+                    {
+                      "max": undefined,
+                      "min": undefined,
+                      "now": undefined,
+                      "text": undefined,
+                    }
                   }
-                }
-              >
-                <View
+                  accessible={true}
+                  collapsable={false}
+                  focusable={true}
+                  onClick={[Function]}
+                  onResponderGrant={[Function]}
+                  onResponderMove={[Function]}
+                  onResponderRelease={[Function]}
+                  onResponderTerminate={[Function]}
+                  onResponderTerminationRequest={[Function]}
+                  onStartShouldSetResponder={[Function]}
                   style={
-                    [
-                      {},
-                    ]
+                    {
+                      "opacity": 1,
+                    }
                   }
                 >
-                  <Text
+                  <View
                     style={
                       [
-                        {
-                          "color": "#007AFF",
-                          "fontSize": 18,
-                          "margin": 8,
-                          "textAlign": "center",
-                        },
+                        {},
                       ]
                     }
                   >
-                    Go Detail
-                  </Text>
+                    <Text
+                      style={
+                        [
+                          {
+                            "color": "#007AFF",
+                            "fontSize": 18,
+                            "margin": 8,
+                            "textAlign": "center",
+                          },
+                        ]
+                      }
+                    >
+                      Go Detail
+                    </Text>
+                  </View>
                 </View>
               </View>
-            </View>
-          </RCTScrollView>
-        </RCTSafeAreaView>
+            </RCTScrollView>
+          </RCTSafeAreaView>
+        </View>
       </View>
+      <RNSScreenStackHeaderConfig
+        backButtonInCustomView={false}
+        backTitleVisible={true}
+        backgroundColor="rgb(255, 255, 255)"
+        color="rgb(0, 122, 255)"
+        direction="ltr"
+        disableBackButtonMenu={false}
+        hidden={false}
+        hideBackButton={false}
+        largeTitleHideShadow={false}
+        title="Main"
+        titleColor="rgb(28, 28, 30)"
+        topInsetEnabled={false}
+        translucent={false}
+      />
     </RNSScreen>
   </RNSScreenStack>
 </RNCSafeAreaProvider>

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("com.android.application")
     id("com.facebook.react")
     id("com.google.gms.google-services")
-    id("org.jetbrains.kotlin.android") version "1.6.10"
+    id("org.jetbrains.kotlin.android")
 }
 
 /**
@@ -78,6 +78,7 @@ val hermesEnabled = Constants.HERMES_ENABLED == "true"
 android {
     compileSdk = Constants.COMPILE_SDK_VERSION
     ndkVersion = Constants.NDK_VERSION
+    buildToolsVersion = Constants.BUILD_TOOLS_VERSION
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -133,14 +134,7 @@ dependencies {
     implementation("androidx.multidex:multidex:2.0.1")
     implementation("androidx.appcompat:appcompat:1.4.0")
     implementation("com.google.firebase:firebase-bom:29.0.4")
-
-    debugImplementation("com.facebook.flipper:flipper:${Constants.FLIPPER_VERSION}")
-
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${Constants.FLIPPER_VERSION}") {
-        exclude(group = "com.squareup.okhttp3", module = "okhttp")
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${Constants.FLIPPER_VERSION}")
+    implementation("com.facebook.react:flipper-integration")
 
     if (hermesEnabled) {
         implementation("com.facebook.react:hermes-android")

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -2,12 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+        tools:ignore="GoogleAppIndexingWarning" />
 </manifest>
diff --git a/android/app/src/debug/java/com/jiggag/rnstarter/ReactNativeFlipper.kt b/android/app/src/debug/java/com/jiggag/rnstarter/ReactNativeFlipper.kt
diff --git a/android/app/src/main/java/com/jiggag/rnstarter/MainActivity.kt b/android/app/src/main/java/com/jiggag/rnstarter/MainActivity.kt
@@ -3,7 +3,6 @@ package com.jiggag.rnstarter
 import android.os.Bundle
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.concurrentReactEnabled
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
 import com.facebook.react.defaults.DefaultReactActivityDelegate
 
@@ -12,20 +11,12 @@ class MainActivity : ReactActivity() {
     super.onCreate(savedInstanceState)
   }
 
-  override fun getMainComponentName(): String {
-    return "RNStarter"
-  }
+  override fun getMainComponentName(): String = "RNStarter"
 
   /**
-   * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
-   * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
-   * (aka React 18) with two boolean flags.
+   * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
+   * which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
    */
-  override fun createReactActivityDelegate(): ReactActivityDelegate {
-    return DefaultReactActivityDelegate(
-      this,
-      mainComponentName,  // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-      fabricEnabled
-    )
-  }
+  override fun createReactActivityDelegate(): ReactActivityDelegate =
+    DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
 }