@onekeyfe/react-native-device-utils 6.7.0-alpha.342 → 6.7.0-alpha.343

package/android/src/main/java/com/margelo/nitro/reactnativedeviceutils/ReactNativeDeviceUtils.kt

@@ -8,6 +8,7 @@ import android.graphics.drawable.GradientDrawable
 import android.graphics.Rect
 import android.os.Build
 import android.view.Gravity
+import android.view.WindowInsetsController
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
@@ -910,8 +911,18 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
         val window = activity.window
         val decorView = window.decorView
 
-        WindowCompat.getInsetsController(window, decorView)
-          .isAppearanceLightNavigationBars = appearance.useDarkIcons
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+          // WindowInsetsControllerCompat leaves the previous value in place on
+          // Android 11-14 once the window is appearance-controlled, so runtime
+          // theme switches kept stale button colors. Use the platform API.
+          window.insetsController?.setSystemBarsAppearance(
+            if (appearance.useDarkIcons) WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS else 0,
+            WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS,
+          )
+        } else {
+          WindowCompat.getInsetsController(window, decorView)
+            .isAppearanceLightNavigationBars = appearance.useDarkIcons
+        }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
           window.isNavigationBarContrastEnforced = false
@@ -989,8 +1000,8 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
         )
         else -> Triple(0, 0, Gravity.BOTTOM)
       }
-      // Fade in from the content edge so the protection never draws a hard line
-      // against the page; the solid half keeps the buttons legible.
+      // Fade in over the first third from the content edge so the protection never
+      // draws a hard line against the page; the buttons sit on the solid rest.
       val fadeOrientation = when (gravity) {
         Gravity.LEFT -> GradientDrawable.Orientation.RIGHT_LEFT
         Gravity.RIGHT -> GradientDrawable.Orientation.LEFT_RIGHT
@@ -998,7 +1009,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
       }
       view.background = GradientDrawable(
         fadeOrientation,
-        intArrayOf(color and 0x00FFFFFF, color, color),
+        intArrayOf(color and 0x00FFFFFF, color, color, color),
       )
       if (
         layoutParams.width != width ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-device-utils",
-  "version": "6.7.0-alpha.342",
+  "version": "6.7.0-alpha.343",
   "description": "Native device, launch, system appearance and boot recovery utilities for OneKey",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",