react-native-screens 3.31.0 → 3.32.0

package/README.md

@@ -106,6 +106,7 @@ Screens are already integrated with the React Native's most popular navigation l
 
 | library version | react-native version |
 | ------- | -------------------- |
+| 3.32.0+ | 0.71.0+              |
 | 3.30.0+ | 0.68.0+              |
 | 3.14.0+ | 0.64.0+              |
 | 3.0.0+  | 0.62.0+              |
@@ -119,6 +120,7 @@ Here's a table with summary of supported `react-native` versions when Fabric is
 
 | library version | react-native version |
 | ------- | -------------------- |
+| 3.32.0+ | 0.74.0+              |
 | 3.28.0+ | 0.73.0+              |
 | 3.21.0+ | 0.72.0+              |
 | 3.19.0+ | 0.71.0+              |
@@ -233,3 +235,7 @@ This project has been build and is maintained thanks to the support from [Shopif
 [![shopify](https://avatars1.githubusercontent.com/u/8085?v=3&s=100 'Shopify.com')](https://shopify.com)
 [![expo](https://avatars2.githubusercontent.com/u/12504344?v=3&s=100 'Expo.io')](https://expo.io)
 [![swm](https://logo.swmansion.com/logo?color=white&variant=desktop&width=150&tag=react-native-reanimated-github 'Software Mansion')](https://swmansion.com)
+
+## React Native Screens is created by Software Mansion
+
+Since 2012 [Software Mansion](https://swmansion.com) is a software agency with experience in building web and mobile apps. We are Core React Native Contributors and experts in dealing with all kinds of React Native issues. We can help you build your next dream product – [Hire us](https://swmansion.com/contact/projects?utm_source=screens&utm_medium=readme).

package/RNScreens.podspec

@@ -63,6 +63,7 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => platform, :tvos => "11.0", :visionos => "1.0" }
   s.source       = { :git => "https://github.com/software-mansion/react-native-screens.git", :tag => "#{s.version}" }
   s.source_files = source_files
+  s.project_header_files = "cpp/**/*.h" # Don't expose C++ headers publicly to allow importing framework into Swift files
   s.requires_arc = true
 
   if defined?(install_modules_dependencies()) != nil

package/android/build.gradle

@@ -22,6 +22,10 @@ buildscript {
     }
 }
 
+def isRunningInContextOfScreensRepo() {
+    return project == rootProject
+}
+
 def isNewArchitectureEnabled() {
     // To opt-in for the New Architecture, you can either:
     // - Set `newArchEnabled` to true inside the `gradle.properties` file
@@ -31,7 +35,7 @@ def isNewArchitectureEnabled() {
 }
 
 // spotless is only accessible within react-native-screens repo
-if (project == rootProject) {
+if (isRunningInContextOfScreensRepo()) {
     apply from: 'spotless.gradle'
 }
 
@@ -58,7 +62,7 @@ def resolveReactNativeDirectory() {
     }
 
     def reactNativeFromAppNodeModules = file("${projectDir}/../../react-native")
-    if (reactNativeFromAppNodeModules.exists()) {
+    if (!isRunningInContextOfScreensRepo() && reactNativeFromAppNodeModules.exists()) {
         return reactNativeFromAppNodeModules
     }
 
@@ -68,7 +72,7 @@ def resolveReactNativeDirectory() {
     }
 
     throw new GradleException(
-        "[RNScreens] Unable to resolve react-native location in node_modules. You should project extension property (in `app/build.gradle`) `REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
+        "[RNScreens] Unable to resolve react-native location in node_modules. You should add project extension property (in `app/build.gradle`) `REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
     )
 }
 
@@ -152,7 +156,6 @@ android {
             } else {
                 srcDirs += [
                     "src/paper/java",
-                    "build/generated/source/codegen/java"
                 ]
             }
         }
@@ -193,3 +196,79 @@ dependencies {
         }
     }
 }
+
+def isScreensExampleApp() {
+    return project.hasProperty('isScreensExampleApp') && project.property('isScreensExampleApp') == "true"
+}
+
+def getAbsoluteCodegenArtifactsPaperDestination() {
+    if (!project.hasProperty('codegenArtifactsPaperDestination')) {
+        throw new Exception('[RNScreens] Please fill codegenArtifactsPaperDestination variable in android/gradle.properties correct path to paper paper destination')
+    }
+
+    return "${project.rootDir}/../../${project.property('codegenArtifactsPaperDestination')}"
+}
+
+def getAbsoluteCodegenArtifactsSource() {
+    if (!project.hasProperty('codegenArtifactsSource')) {
+        throw new Exception('[RNScreens] Please fill codegenArtifactsSource variable in android/gradle.properties correct path to codegenerated artifacts')
+    }
+
+    return "${project.rootDir}/../../${project.property('codegenArtifactsSource')}"
+}
+
+
+tasks.register("copyCodegenArtifacts") {
+    group 'After build tasks'
+    description 'Tasks which copy codegen artifacts to paper architecture'
+    
+    if (!isScreensExampleApp() || !isNewArchitectureEnabled()) {
+        return
+    }
+
+    dependsOn tasks.generateCodegenArtifactsFromSchema
+
+    doLast {
+
+        def absoluteCodegenArtifactsPaperDestination = getAbsoluteCodegenArtifactsPaperDestination()
+        def absoluteCodegenArtifactsSource = getAbsoluteCodegenArtifactsSource()
+
+        def existingFiles = fileTree(absoluteCodegenArtifactsPaperDestination).matching {
+            include '**/*.java'
+        }
+
+        def generatedFiles = fileTree(absoluteCodegenArtifactsSource).matching {
+            include '**/*.java'
+        }
+
+        def existingFilesMap = [:]
+
+        existingFiles.forEach { existingFile ->
+            existingFilesMap[existingFile.name] = 1
+        }
+
+        generatedFiles.forEach { generatedFile -> 
+            if (!existingFilesMap.containsKey(generatedFile.name)) {
+                logger.warn("[RNScreens] ${generatedFile.name} not found in paper dir, if it's used in Android you need to copy it manually and implement yourself before using auto-copy feature")
+            }
+        }
+
+        if (existingFiles.size() == 0) {
+            logger.warn("[RNScreens] Paper destination with codegen interfaces is empty. This might be okay if you don't have any interfaces/delegates used in Android, if that's not the case please check if codegenArtifactsPaperDestination in android/gradle.properties is correct")
+        }
+
+        if (existingFiles.size() > generatedFiles.size()) {
+            throw new Exception("[RNScreens] Number od generated artifacts should be greather then or equal to paper interfaces. Please check if codegenArtifactsSource in android/gradle.properties is correct")
+        }
+
+        copy {
+            from absoluteCodegenArtifactsSource
+            include existingFiles.collect { it.name }
+            into absoluteCodegenArtifactsPaperDestination
+        }
+    }
+}
+
+if (isScreensExampleApp() && isNewArchitectureEnabled()) {
+    tasks.generateCodegenArtifactsFromSchema.finalizedBy('copyCodegenArtifacts')
+}

package/android/src/main/cpp/jni-adapter.cpp

@@ -1,110 +1,103 @@
-#include <array>
-#include <mutex>
 #include <jni.h>
 #include <jsi/jsi.h>
+#include <array>
+#include <mutex>
 #include "RNScreensTurboModule.h"
 
 using namespace facebook;
 
 jobject globalThis;
 
-extern "C"
-JNIEXPORT void JNICALL
-Java_com_swmansion_rnscreens_ScreensModule_nativeInstall(JNIEnv *env, jobject thiz, jlong jsiPtr) {
-    auto runtime = reinterpret_cast<jsi::Runtime*>(jsiPtr);
-    if (!runtime) {
-        return;
-    }
-    jsi::Runtime &rt = *runtime;
-    globalThis = env->NewGlobalRef(thiz);
-    JavaVM* jvm;
-    env->GetJavaVM(&jvm);
+extern "C" JNIEXPORT void JNICALL
+Java_com_swmansion_rnscreens_ScreensModule_nativeInstall(
+    JNIEnv *env,
+    jobject thiz,
+    jlong jsiPtr) {
+  auto runtime = reinterpret_cast<jsi::Runtime *>(jsiPtr);
+  if (!runtime) {
+    return;
+  }
+  jsi::Runtime &rt = *runtime;
+  globalThis = env->NewGlobalRef(thiz);
+  JavaVM *jvm;
+  env->GetJavaVM(&jvm);
 
-    const auto &startTransition = [jvm](int stackTag) -> std::array<int, 2> {
-        JNIEnv* currentEnv;
-        if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
-            return {0, 0};
-        }
-        jclass javaClass = currentEnv->GetObjectClass(globalThis);
-        jmethodID methodID = currentEnv->GetMethodID(
-                javaClass,
-                "startTransition",
-                "(Ljava/lang/Integer;)[I"
-        );
-        jclass integerClass = currentEnv->FindClass("java/lang/Integer");
-        jmethodID integerConstructor = currentEnv->GetMethodID(integerClass, "<init>", "(I)V");
-        jobject integerArg = currentEnv->NewObject(integerClass, integerConstructor, stackTag);
-        jintArray resultArray = (jintArray) currentEnv->CallObjectMethod(
-                globalThis,
-                methodID,
-                integerArg
-        );
-        std::array<int, 2> result = {-1, -1};
-        jint* elements = currentEnv->GetIntArrayElements(resultArray, nullptr);
-        if (elements != nullptr) {
-            result[0] = elements[0];
-            result[1] = elements[1];
-            currentEnv->ReleaseIntArrayElements(resultArray, elements, JNI_ABORT);
-        }
-        return result;
-    };
+  const auto &startTransition = [jvm](int stackTag) -> std::array<int, 2> {
+    JNIEnv *currentEnv;
+    if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
+      return {0, 0};
+    }
+    jclass javaClass = currentEnv->GetObjectClass(globalThis);
+    jmethodID methodID = currentEnv->GetMethodID(
+        javaClass, "startTransition", "(Ljava/lang/Integer;)[I");
+    jclass integerClass = currentEnv->FindClass("java/lang/Integer");
+    jmethodID integerConstructor =
+        currentEnv->GetMethodID(integerClass, "<init>", "(I)V");
+    jobject integerArg =
+        currentEnv->NewObject(integerClass, integerConstructor, stackTag);
+    jintArray resultArray = (jintArray)currentEnv->CallObjectMethod(
+        globalThis, methodID, integerArg);
+    std::array<int, 2> result = {-1, -1};
+    jint *elements = currentEnv->GetIntArrayElements(resultArray, nullptr);
+    if (elements != nullptr) {
+      result[0] = elements[0];
+      result[1] = elements[1];
+      currentEnv->ReleaseIntArrayElements(resultArray, elements, JNI_ABORT);
+    }
+    return result;
+  };
 
-    const auto &updateTransition = [jvm](int stackTag, double progress){
-        JNIEnv* currentEnv;
-        if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
-            return;
-        }
-        jclass javaClass = currentEnv->GetObjectClass(globalThis);
-        jmethodID methodID = currentEnv->GetMethodID(
-                javaClass,
-                "updateTransition",
-                "(D)V"
-        );
-        currentEnv->CallVoidMethod(globalThis, methodID, progress);
-    };
+  const auto &updateTransition = [jvm](int stackTag, double progress) {
+    JNIEnv *currentEnv;
+    if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
+      return;
+    }
+    jclass javaClass = currentEnv->GetObjectClass(globalThis);
+    jmethodID methodID =
+        currentEnv->GetMethodID(javaClass, "updateTransition", "(D)V");
+    currentEnv->CallVoidMethod(globalThis, methodID, progress);
+  };
 
-    const auto &finishTransition = [jvm](int stackTag, bool canceled){
-        JNIEnv* currentEnv;
-        if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
-            return;
-        }
-        jclass javaClass = currentEnv->GetObjectClass(globalThis);
-        jmethodID methodID = currentEnv->GetMethodID(
-                javaClass,
-                "finishTransition",
-                "(Ljava/lang/Integer;Z)V"
-        );
-        jclass integerClass = currentEnv->FindClass("java/lang/Integer");
-        jmethodID integerConstructor = currentEnv->GetMethodID(integerClass, "<init>", "(I)V");
-        jobject integerArg = currentEnv->NewObject(integerClass, integerConstructor, stackTag);
-        currentEnv->CallVoidMethod(globalThis, methodID, integerArg, canceled);
-    };
+  const auto &finishTransition = [jvm](int stackTag, bool canceled) {
+    JNIEnv *currentEnv;
+    if (jvm->AttachCurrentThread(&currentEnv, nullptr) != JNI_OK) {
+      return;
+    }
+    jclass javaClass = currentEnv->GetObjectClass(globalThis);
+    jmethodID methodID = currentEnv->GetMethodID(
+        javaClass, "finishTransition", "(Ljava/lang/Integer;Z)V");
+    jclass integerClass = currentEnv->FindClass("java/lang/Integer");
+    jmethodID integerConstructor =
+        currentEnv->GetMethodID(integerClass, "<init>", "(I)V");
+    jobject integerArg =
+        currentEnv->NewObject(integerClass, integerConstructor, stackTag);
+    currentEnv->CallVoidMethod(globalThis, methodID, integerArg, canceled);
+  };
 
-    const auto &disableSwipeBackForTopScreen = [](int _stackTag){
-        // no implementation for Android
-    };
+  const auto &disableSwipeBackForTopScreen = [](int _stackTag) {
+    // no implementation for Android
+  };
 
-    auto rnScreensModule = std::make_shared<RNScreens::RNScreensTurboModule>(
-        startTransition,
-        updateTransition,
-        finishTransition,
-        disableSwipeBackForTopScreen
-    );
-    auto rnScreensModuleHostObject = jsi::Object::createFromHostObject(rt, rnScreensModule);
-    rt.global().setProperty(
-        rt,
-        RNScreens::RNScreensTurboModule::MODULE_NAME,
-        std::move(rnScreensModuleHostObject)
-    );
+  auto rnScreensModule = std::make_shared<RNScreens::RNScreensTurboModule>(
+      startTransition,
+      updateTransition,
+      finishTransition,
+      disableSwipeBackForTopScreen);
+  auto rnScreensModuleHostObject =
+      jsi::Object::createFromHostObject(rt, rnScreensModule);
+  rt.global().setProperty(
+      rt,
+      RNScreens::RNScreensTurboModule::MODULE_NAME,
+      std::move(rnScreensModuleHostObject));
 }
 
 void JNICALL JNI_OnUnload(JavaVM *jvm, void *) {
-    JNIEnv *env;
-    if (jvm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
-        return;
-    }
-    if (globalThis != nullptr) {
-        env->DeleteGlobalRef(globalThis);
-        globalThis = nullptr;
-    }
+  JNIEnv *env;
+  if (jvm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK) {
+    return;
+  }
+  if (globalThis != nullptr) {
+    env->DeleteGlobalRef(globalThis);
+    globalThis = nullptr;
+  }
 }

package/android/src/main/java/com/swmansion/rnscreens/CustomSearchView.kt

@@ -1,10 +1,12 @@
 package com.swmansion.rnscreens
 
+import android.annotation.SuppressLint
 import android.content.Context
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
 
+@SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
 class CustomSearchView(context: Context, fragment: Fragment) : SearchView(context) {
     /*
         CustomSearchView uses some variables from SearchView. They are listed below with links to documentation

package/android/src/main/java/com/swmansion/rnscreens/CustomToolbar.kt

@@ -1,7 +1,9 @@
 package com.swmansion.rnscreens
 
+import android.annotation.SuppressLint
 import android.content.Context
 import androidx.appcompat.widget.Toolbar
 
 // This class is used to store config closer to search bar
+@SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
 open class CustomToolbar(context: Context, val config: ScreenStackHeaderConfig) : Toolbar(context)

package/android/src/main/java/com/swmansion/rnscreens/Screen.kt

@@ -18,7 +18,7 @@ import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.UIManagerModule
 import com.swmansion.rnscreens.events.HeaderHeightChangeEvent
 
-@SuppressLint("ViewConstructor")
+@SuppressLint("ViewConstructor") // Only we construct this view, it is never inflated.
 class Screen(context: ReactContext?) : FabricEnabledViewGroup(context) {
     val fragment: Fragment?
         get() = fragmentWrapper?.fragment
@@ -80,7 +80,7 @@ class Screen(context: ReactContext?) : FabricEnabledViewGroup(context) {
     private fun updateScreenSizePaper(width: Int, height: Int) {
         val reactContext = context as ReactContext
         reactContext.runOnNativeModulesQueueThread(
-            object : GuardedRunnable(reactContext) {
+            object : GuardedRunnable(reactContext.exceptionHandler) {
                 override fun runGuarded() {
                     reactContext
                         .getNativeModule(UIManagerModule::class.java)
@@ -216,6 +216,20 @@ class Screen(context: ReactContext?) : FabricEnabledViewGroup(context) {
             fragmentWrapper?.let { ScreenWindowTraits.setNavigationBarColor(this, it.tryGetActivity()) }
         }
 
+    var isNavigationBarTranslucent: Boolean? = null
+        set(navigationBarTranslucent) {
+            if (navigationBarTranslucent != null) {
+                ScreenWindowTraits.applyDidSetNavigationBarAppearance()
+            }
+            field = navigationBarTranslucent
+            fragmentWrapper?.let {
+                ScreenWindowTraits.setNavigationBarTranslucent(
+                    this,
+                    it.tryGetActivity(),
+                )
+            }
+        }
+
     var isNavigationBarHidden: Boolean? = null
         set(navigationBarHidden) {
             if (navigationBarHidden != null) {
@@ -276,6 +290,6 @@ class Screen(context: ReactContext?) : FabricEnabledViewGroup(context) {
     }
 
     enum class WindowTraits {
-        ORIENTATION, COLOR, STYLE, TRANSLUCENT, HIDDEN, ANIMATED, NAVIGATION_BAR_COLOR, NAVIGATION_BAR_HIDDEN
+        ORIENTATION, COLOR, STYLE, TRANSLUCENT, HIDDEN, ANIMATED, NAVIGATION_BAR_COLOR, NAVIGATION_BAR_TRANSLUCENT, NAVIGATION_BAR_HIDDEN
     }
 }

package/android/src/main/java/com/swmansion/rnscreens/ScreenContainerViewManager.kt

@@ -6,9 +6,22 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.LayoutShadowNode
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNSScreenContainerManagerDelegate
+import com.facebook.react.viewmanagers.RNSScreenContainerManagerInterface
 
 @ReactModule(name = ScreenContainerViewManager.REACT_CLASS)
-class ScreenContainerViewManager : ViewGroupManager<ScreenContainer>() {
+class ScreenContainerViewManager : ViewGroupManager<ScreenContainer>(), RNSScreenContainerManagerInterface<ScreenContainer> {
+    private val delegate: ViewManagerDelegate<ScreenContainer>
+
+    init {
+        delegate = RNSScreenContainerManagerDelegate<ScreenContainer, ScreenContainerViewManager>(this)
+    }
+
+    protected override fun getDelegate(): ViewManagerDelegate<ScreenContainer> {
+        return delegate
+    }
+
     override fun getName(): String = REACT_CLASS
 
     override fun createViewInstance(reactContext: ThemedReactContext): ScreenContainer = ScreenContainer(reactContext)

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackFragment.kt

@@ -62,7 +62,8 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
 
     override fun setToolbarShadowHidden(hidden: Boolean) {
         if (isToolbarShadowHidden != hidden) {
-            appBarLayout?.targetElevation = if (hidden) 0f else PixelUtil.toPixelFromDIP(4f)
+            appBarLayout?.elevation = if (hidden) 0f else PixelUtil.toPixelFromDIP(4f)
+            appBarLayout?.stateListAnimator = null
             isToolbarShadowHidden = hidden
         }
     }
@@ -125,7 +126,7 @@ class ScreenStackFragment : ScreenFragment, ScreenStackFragmentWrapper {
 
         view?.addView(appBarLayout)
         if (isToolbarShadowHidden) {
-            appBarLayout?.targetElevation = 0f
+            appBarLayout?.elevation = 0f
         }
         toolbar?.let { appBarLayout?.addView(recycleView(it)) }
         setHasOptionsMenu(true)

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfig.kt

@@ -2,12 +2,14 @@ package com.swmansion.rnscreens
 
 import android.content.Context
 import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.os.Build
 import android.text.TextUtils
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.View.OnClickListener
 import android.view.ViewGroup
+import android.view.WindowInsets
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
@@ -82,7 +84,9 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
         // we want to save the top inset before the status bar can be hidden, which would resolve in
         // inset being 0
         if (headerTopInset == null) {
-            headerTopInset = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+            headerTopInset = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
+                rootWindowInsets.getInsets(WindowInsets.Type.systemBars()).top
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
                 rootWindowInsets.systemWindowInsetTop
             else
             // Hacky fallback for old android. Before Marshmallow, the status bar height was always 25
@@ -228,7 +232,7 @@ class ScreenStackHeaderConfig(context: Context) : ViewGroup(context) {
 
         // color
         if (tintColor != 0) {
-            toolbar.navigationIcon?.setColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
+            toolbar.navigationIcon?.colorFilter = PorterDuffColorFilter(tintColor, PorterDuff.Mode.SRC_ATOP)
         }
 
         // subviews

package/android/src/main/java/com/swmansion/rnscreens/ScreenStackHeaderConfigViewManager.kt

@@ -201,4 +201,8 @@ class ScreenStackHeaderConfigViewManager : ViewGroupManager<ScreenStackHeaderCon
     override fun setDisableBackButtonMenu(view: ScreenStackHeaderConfig?, value: Boolean) {
         logNotAvailable("disableBackButtonMenu")
     }
+
+    override fun setBackButtonDisplayMode(view: ScreenStackHeaderConfig?, value: String?) {
+        logNotAvailable("backButtonDisplayMode")
+    }
 }

package/android/src/main/java/com/swmansion/rnscreens/ScreenViewManager.kt

@@ -142,6 +142,11 @@ open class ScreenViewManager : ViewGroupManager<Screen>(), RNSScreenManagerInter
         view.navigationBarColor = navigationBarColor
     }
 
+    @ReactProp(name = "navigationBarTranslucent")
+    override fun setNavigationBarTranslucent(view: Screen, navigationBarTranslucent: Boolean) {
+        view.isNavigationBarTranslucent = navigationBarTranslucent
+    }
+
     @ReactProp(name = "navigationBarHidden")
     override fun setNavigationBarHidden(view: Screen, navigationBarHidden: Boolean) {
         view.isNavigationBarHidden = navigationBarHidden

package/android/src/main/java/com/swmansion/rnscreens/ScreenWindowTraits.kt

@@ -11,6 +11,7 @@ import android.os.Build
 import android.view.ViewParent
 import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.facebook.react.bridge.GuardedRunnable
@@ -60,7 +61,7 @@ object ScreenWindowTraits {
         val animated = screenForAnimated?.isStatusBarAnimated ?: false
 
         UiThreadUtil.runOnUiThread(
-            object : GuardedRunnable(context) {
+            object : GuardedRunnable(context.exceptionHandler) {
                 override fun runGuarded() {
                     val window = activity.window
                     val curColor: Int = window.statusBarColor
@@ -105,7 +106,7 @@ object ScreenWindowTraits {
         val screenForTranslucent = findScreenForTrait(screen, WindowTraits.TRANSLUCENT)
         val translucent = screenForTranslucent?.isStatusBarTranslucent ?: false
         UiThreadUtil.runOnUiThread(
-            object : GuardedRunnable(context) {
+            object : GuardedRunnable(context.exceptionHandler) {
                 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
                 override fun runGuarded() {
                     // If the status bar is translucent hook into the window insets calculations
@@ -185,6 +186,20 @@ object ScreenWindowTraits {
         window.navigationBarColor = color
     }
 
+    internal fun setNavigationBarTranslucent(screen: Screen, activity: Activity?) {
+        if (activity == null) {
+            return
+        }
+
+        val window = activity.window
+
+        val screenForNavBarTranslucent = findScreenForTrait(screen, WindowTraits.NAVIGATION_BAR_TRANSLUCENT)
+        val translucent = screenForNavBarTranslucent?.isNavigationBarTranslucent ?: false
+
+        // Following method controls whether to display edge-to-edge content that draws behind the navigation bar
+        WindowCompat.setDecorFitsSystemWindows(window, !translucent)
+    }
+
     internal fun setNavigationBarHidden(screen: Screen, activity: Activity?) {
         if (activity == null) {
             return
@@ -221,6 +236,7 @@ object ScreenWindowTraits {
         }
         if (didSetNavigationBarAppearance) {
             setNavigationBarColor(screen, activity)
+            setNavigationBarTranslucent(screen, activity)
             setNavigationBarHidden(screen, activity)
         }
     }
@@ -281,6 +297,7 @@ object ScreenWindowTraits {
             WindowTraits.HIDDEN -> screen.isStatusBarHidden != null
             WindowTraits.ANIMATED -> screen.isStatusBarAnimated != null
             WindowTraits.NAVIGATION_BAR_COLOR -> screen.navigationBarColor != null
+            WindowTraits.NAVIGATION_BAR_TRANSLUCENT -> screen.isNavigationBarTranslucent != null
             WindowTraits.NAVIGATION_BAR_HIDDEN -> screen.isNavigationBarHidden != null
         }
     }

package/android/src/main/java/com/swmansion/rnscreens/ScreensModule.kt

@@ -25,7 +25,7 @@ class ScreensModule(private val reactContext: ReactApplicationContext)
             } else {
                 Log.e("[RNScreens]", "Could not install JSI bindings.")
             }
-        } catch (exception: Exception) {
+        } catch (exception: UnsatisfiedLinkError) {
             Log.w("[RNScreens]", "Could not load RNScreens module.")
         }
     }