@onekeyfe/react-native-device-utils 3.0.94 → 3.0.95

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

@@ -6,10 +6,17 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.Rect
 import android.os.Build
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
 import com.margelo.nitro.nativelogger.OneKeyLog
 import androidx.preference.PreferenceManager
 import androidx.core.content.ContextCompat
 import androidx.core.util.Consumer
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.window.layout.FoldingFeature
 import androidx.window.layout.WindowInfoTracker
 import androidx.window.layout.WindowLayoutInfo
@@ -28,6 +35,11 @@ data class Listener(
   val callback: (Boolean) -> Unit
 )
 
+private data class NavigationBarAppearance(
+  val color: Int,
+  val useDarkIcons: Boolean,
+)
+
 @DoNotStrip
 class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEventListener {
 
@@ -42,6 +54,8 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
     private const val RECOVERY_PREFS_NAME = "onekey_recovery"
     private const val BOOT_FAIL_COUNT_KEY = "consecutive_boot_fail_count"
     private const val RECOVERY_ACTION_KEY = "recovery_action"
+    private const val NAVIGATION_BAR_PROTECTION_VIEW_TAG =
+      "com.onekeyfe.reactnativedeviceutils.navigationBarProtection"
 
     @JvmStatic
     var staticStartupTime: Long? = null
@@ -237,6 +251,7 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
   private var isObservingLayoutChanges = false
   private var nextListenerId = 0.0
   private var isDualScreenDeviceDetected: Boolean? = null
+  @Volatile private var navigationBarAppearance: NavigationBarAppearance? = null
 
   init {
       NitroModules.applicationContext?.let { ctx ->
@@ -850,8 +865,161 @@ class ReactNativeDeviceUtils : HybridReactNativeDeviceUtilsSpec(), LifecycleEven
     }
   }
 
+  // MARK: - System Navigation Bar
+
+  override fun setNavigationBarAppearance(
+    r: Double,
+    g: Double,
+    b: Double,
+    a: Double,
+    useDarkIcons: Boolean,
+  ) {
+    val requestedColor = Color.argb(
+      a.toInt().coerceIn(0, 255),
+      r.toInt().coerceIn(0, 255),
+      g.toInt().coerceIn(0, 255),
+      b.toInt().coerceIn(0, 255),
+    )
+    val appearance = NavigationBarAppearance(
+      color = if (
+        Build.VERSION.SDK_INT < Build.VERSION_CODES.O && useDarkIcons
+      ) Color.BLACK else requestedColor,
+      useDarkIcons = useDarkIcons,
+    )
+    navigationBarAppearance = appearance
+    getCurrentActivity()?.let { applyNavigationBarAppearance(it, appearance) }
+  }
+
+  @Suppress("DEPRECATION")
+  private fun applyNavigationBarAppearance(
+    activity: Activity,
+    appearance: NavigationBarAppearance,
+  ) {
+    activity.runOnUiThread {
+      try {
+        val window = activity.window
+        val decorView = window.decorView
+
+        WindowCompat.getInsetsController(window, decorView)
+          .isAppearanceLightNavigationBars = appearance.useDarkIcons
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+          window.isNavigationBarContrastEnforced = false
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+          // Android 15 enforces edge-to-edge. Keep the platform bar transparent
+          // and draw the requested color only behind three-button navigation.
+          window.navigationBarColor = Color.TRANSPARENT
+          installNavigationBarProtection(decorView, appearance.color)
+        } else {
+          removeNavigationBarProtection(decorView)
+          window.navigationBarColor = appearance.color
+        }
+      } catch (e: Exception) {
+        OneKeyLog.error(
+          "DeviceUtils",
+          "Failed to update navigation bar appearance: ${e.message}",
+        )
+      }
+    }
+  }
+
+  private fun installNavigationBarProtection(decorView: View, color: Int) {
+    val decorContainer = decorView as? ViewGroup ?: return
+    val protectionView = findNavigationBarProtection(decorContainer) ?: View(
+      decorContainer.context
+    ).also { view ->
+      view.tag = NAVIGATION_BAR_PROTECTION_VIEW_TAG
+      view.isClickable = false
+      view.isFocusable = false
+      view.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+      decorContainer.addView(
+        view,
+        FrameLayout.LayoutParams(
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          0,
+          Gravity.BOTTOM,
+        ),
+      )
+    }
+
+    protectionView.setBackgroundColor(color)
+    protectionView.visibility = View.VISIBLE
+    protectionView.bringToFront()
+    ViewCompat.setOnApplyWindowInsetsListener(protectionView) { view, windowInsets ->
+      val navigationBarInsets = windowInsets.getInsets(
+        WindowInsetsCompat.Type.navigationBars()
+      )
+      val tappableElementInsets = windowInsets.getInsets(
+        WindowInsetsCompat.Type.tappableElement()
+      )
+      val leftInset = minOf(navigationBarInsets.left, tappableElementInsets.left)
+      val rightInset = minOf(navigationBarInsets.right, tappableElementInsets.right)
+      val bottomInset = minOf(navigationBarInsets.bottom, tappableElementInsets.bottom)
+      val layoutParams = view.layoutParams as FrameLayout.LayoutParams
+      val (width, height, gravity) = when {
+        leftInset > 0 -> Triple(
+          leftInset,
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          Gravity.LEFT,
+        )
+        rightInset > 0 -> Triple(
+          rightInset,
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          Gravity.RIGHT,
+        )
+        bottomInset > 0 -> Triple(
+          ViewGroup.LayoutParams.MATCH_PARENT,
+          bottomInset,
+          Gravity.BOTTOM,
+        )
+        else -> Triple(0, 0, Gravity.BOTTOM)
+      }
+      if (
+        layoutParams.width != width ||
+        layoutParams.height != height ||
+        layoutParams.gravity != gravity
+      ) {
+        layoutParams.width = width
+        layoutParams.height = height
+        layoutParams.gravity = gravity
+        view.layoutParams = layoutParams
+      }
+      view.visibility = if (
+        leftInset > 0 || rightInset > 0 || bottomInset > 0
+      ) View.VISIBLE else View.INVISIBLE
+
+      // This view is only a visual protection; descendants still need the insets.
+      windowInsets
+    }
+    ViewCompat.requestApplyInsets(protectionView)
+  }
+
+  private fun findNavigationBarProtection(decorContainer: ViewGroup): View? {
+    for (index in 0 until decorContainer.childCount) {
+      val child = decorContainer.getChildAt(index)
+      if (child.tag == NAVIGATION_BAR_PROTECTION_VIEW_TAG) {
+        return child
+      }
+    }
+    return null
+  }
+
+  private fun removeNavigationBarProtection(decorView: View) {
+    val decorContainer = decorView as? ViewGroup ?: return
+    val protectionView = findNavigationBarProtection(decorContainer) ?: return
+    ViewCompat.setOnApplyWindowInsetsListener(protectionView, null)
+    decorContainer.removeView(protectionView)
+  }
+
     override fun onHostResume() {
         startObservingLayoutChanges()
+        val activity = getCurrentActivity()
+        val appearance = navigationBarAppearance
+        if (activity != null && appearance != null) {
+            applyNavigationBarAppearance(activity, appearance)
+        }
     }
 
     override fun onHostPause() {

package/ios/ReactNativeDeviceUtils.swift

@@ -163,6 +163,16 @@ class ReactNativeDeviceUtils: HybridReactNativeDeviceUtilsSpec {
         }
     }
 
+    public func setNavigationBarAppearance(
+        r: Double,
+        g: Double,
+        b: Double,
+        a: Double,
+        useDarkIcons: Bool
+    ) throws -> Void {
+        // Android-only system UI.
+    }
+
     // MARK: - LaunchOptionsManager
 
     func getLaunchOptions() throws -> Promise<LaunchOptions> {

package/lib/typescript/src/ReactNativeDeviceUtils.nitro.d.ts

@@ -31,6 +31,14 @@ export interface ReactNativeDeviceUtils extends HybridObject<{
     getWindowRects(): Promise<DualScreenInfoRect[]>;
     getHingeBounds(): Promise<DualScreenInfoRect>;
     changeBackgroundColor(r: number, g: number, b: number, a: number): void;
+    /**
+     * Updates the Android system navigation bar from the UI runtime.
+     * Color channels use the [0, 255] range. `useDarkIcons` should be true for
+     * light backgrounds. Android API 24-25 cannot render dark navigation icons,
+     * so those versions use an opaque black background fallback when requested.
+     * This is a no-op on iOS.
+     */
+    setNavigationBarAppearance(r: number, g: number, b: number, a: number, useDarkIcons: boolean): void;
     addSpanningChangedListener(callback: (isSpanning: boolean) => void): number;
     removeSpanningChangedListener(id: number): void;
     setUserInterfaceStyle(style: UserInterfaceStyle): void;

package/nitrogen/generated/android/c++/JHybridReactNativeDeviceUtilsSpec.cpp

@@ -138,6 +138,10 @@ namespace margelo::nitro::reactnativedeviceutils {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* r */, double /* g */, double /* b */, double /* a */)>("changeBackgroundColor");
     method(_javaPart, r, g, b, a);
   }
+  void JHybridReactNativeDeviceUtilsSpec::setNavigationBarAppearance(double r, double g, double b, double a, bool useDarkIcons) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(double /* r */, double /* g */, double /* b */, double /* a */, jboolean /* useDarkIcons */)>("setNavigationBarAppearance");
+    method(_javaPart, r, g, b, a, useDarkIcons);
+  }
   double JHybridReactNativeDeviceUtilsSpec::addSpanningChangedListener(const std::function<void(bool /* isSpanning */)>& callback) {
     static const auto method = _javaPart->javaClassStatic()->getMethod<double(jni::alias_ref<JFunc_void_bool::javaobject> /* callback */)>("addSpanningChangedListener_cxx");
     auto __result = method(_javaPart, JFunc_void_bool_cxx::fromCpp(callback));

package/nitrogen/generated/android/c++/JHybridReactNativeDeviceUtilsSpec.hpp

@@ -60,6 +60,7 @@ namespace margelo::nitro::reactnativedeviceutils {
     std::shared_ptr<Promise<std::vector<DualScreenInfoRect>>> getWindowRects() override;
     std::shared_ptr<Promise<DualScreenInfoRect>> getHingeBounds() override;
     void changeBackgroundColor(double r, double g, double b, double a) override;
+    void setNavigationBarAppearance(double r, double g, double b, double a, bool useDarkIcons) override;
     double addSpanningChangedListener(const std::function<void(bool /* isSpanning */)>& callback) override;
     void removeSpanningChangedListener(double id) override;
     void setUserInterfaceStyle(UserInterfaceStyle style) override;

package/nitrogen/generated/android/kotlin/com/margelo/nitro/reactnativedeviceutils/HybridReactNativeDeviceUtilsSpec.kt

@@ -54,6 +54,10 @@ abstract class HybridReactNativeDeviceUtilsSpec: HybridObject() {
   @Keep
   abstract fun changeBackgroundColor(r: Double, g: Double, b: Double, a: Double): Unit
   
+  @DoNotStrip
+  @Keep
+  abstract fun setNavigationBarAppearance(r: Double, g: Double, b: Double, a: Double, useDarkIcons: Boolean): Unit
+  
   abstract fun addSpanningChangedListener(callback: (isSpanning: Boolean) -> Unit): Double
   
   @DoNotStrip

package/nitrogen/generated/ios/c++/HybridReactNativeDeviceUtilsSpecSwift.hpp

@@ -134,6 +134,12 @@ namespace margelo::nitro::reactnativedeviceutils {
         std::rethrow_exception(__result.error());
       }
     }
+    inline void setNavigationBarAppearance(double r, double g, double b, double a, bool useDarkIcons) override {
+      auto __result = _swiftPart.setNavigationBarAppearance(std::forward<decltype(r)>(r), std::forward<decltype(g)>(g), std::forward<decltype(b)>(b), std::forward<decltype(a)>(a), std::forward<decltype(useDarkIcons)>(useDarkIcons));
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+    }
     inline double addSpanningChangedListener(const std::function<void(bool /* isSpanning */)>& callback) override {
       auto __result = _swiftPart.addSpanningChangedListener(callback);
       if (__result.hasError()) [[unlikely]] {

package/nitrogen/generated/ios/swift/HybridReactNativeDeviceUtilsSpec.swift

@@ -19,6 +19,7 @@ public protocol HybridReactNativeDeviceUtilsSpec_protocol: HybridObject {
   func getWindowRects() throws -> Promise<[DualScreenInfoRect]>
   func getHingeBounds() throws -> Promise<DualScreenInfoRect>
   func changeBackgroundColor(r: Double, g: Double, b: Double, a: Double) throws -> Void
+  func setNavigationBarAppearance(r: Double, g: Double, b: Double, a: Double, useDarkIcons: Bool) throws -> Void
   func addSpanningChangedListener(callback: @escaping (_ isSpanning: Bool) -> Void) throws -> Double
   func removeSpanningChangedListener(id: Double) throws -> Void
   func setUserInterfaceStyle(style: UserInterfaceStyle) throws -> Void

package/nitrogen/generated/ios/swift/HybridReactNativeDeviceUtilsSpec_cxx.swift

@@ -214,6 +214,17 @@ open class HybridReactNativeDeviceUtilsSpec_cxx {
     }
   }
   
+  @inline(__always)
+  public final func setNavigationBarAppearance(r: Double, g: Double, b: Double, a: Double, useDarkIcons: Bool) -> bridge.Result_void_ {
+    do {
+      try self.__implementation.setNavigationBarAppearance(r: r, g: g, b: b, a: a, useDarkIcons: useDarkIcons)
+      return bridge.create_Result_void_()
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_void_(__exceptionPtr)
+    }
+  }
+  
   @inline(__always)
   public final func addSpanningChangedListener(callback: bridge.Func_void_bool) -> bridge.Result_double_ {
     do {

package/nitrogen/generated/shared/c++/HybridReactNativeDeviceUtilsSpec.cpp

@@ -20,6 +20,7 @@ namespace margelo::nitro::reactnativedeviceutils {
       prototype.registerHybridMethod("getWindowRects", &HybridReactNativeDeviceUtilsSpec::getWindowRects);
       prototype.registerHybridMethod("getHingeBounds", &HybridReactNativeDeviceUtilsSpec::getHingeBounds);
       prototype.registerHybridMethod("changeBackgroundColor", &HybridReactNativeDeviceUtilsSpec::changeBackgroundColor);
+      prototype.registerHybridMethod("setNavigationBarAppearance", &HybridReactNativeDeviceUtilsSpec::setNavigationBarAppearance);
       prototype.registerHybridMethod("addSpanningChangedListener", &HybridReactNativeDeviceUtilsSpec::addSpanningChangedListener);
       prototype.registerHybridMethod("removeSpanningChangedListener", &HybridReactNativeDeviceUtilsSpec::removeSpanningChangedListener);
       prototype.registerHybridMethod("setUserInterfaceStyle", &HybridReactNativeDeviceUtilsSpec::setUserInterfaceStyle);

package/nitrogen/generated/shared/c++/HybridReactNativeDeviceUtilsSpec.hpp

@@ -77,6 +77,7 @@ namespace margelo::nitro::reactnativedeviceutils {
       virtual std::shared_ptr<Promise<std::vector<DualScreenInfoRect>>> getWindowRects() = 0;
       virtual std::shared_ptr<Promise<DualScreenInfoRect>> getHingeBounds() = 0;
       virtual void changeBackgroundColor(double r, double g, double b, double a) = 0;
+      virtual void setNavigationBarAppearance(double r, double g, double b, double a, bool useDarkIcons) = 0;
       virtual double addSpanningChangedListener(const std::function<void(bool /* isSpanning */)>& callback) = 0;
       virtual void removeSpanningChangedListener(double id) = 0;
       virtual void setUserInterfaceStyle(UserInterfaceStyle style) = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-device-utils",
-  "version": "3.0.94",
+  "version": "3.0.95",
   "description": "react-native-device-utils",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/ReactNativeDeviceUtils.nitro.ts

@@ -48,6 +48,20 @@ export interface ReactNativeDeviceUtils
   getWindowRects(): Promise<DualScreenInfoRect[]>;
   getHingeBounds(): Promise<DualScreenInfoRect>;
   changeBackgroundColor(r: number, g: number, b: number, a: number): void;
+  /**
+   * Updates the Android system navigation bar from the UI runtime.
+   * Color channels use the [0, 255] range. `useDarkIcons` should be true for
+   * light backgrounds. Android API 24-25 cannot render dark navigation icons,
+   * so those versions use an opaque black background fallback when requested.
+   * This is a no-op on iOS.
+   */
+  setNavigationBarAppearance(
+    r: number,
+    g: number,
+    b: number,
+    a: number,
+    useDarkIcons: boolean
+  ): void;
   addSpanningChangedListener(callback: (isSpanning: boolean) => void): number;
   removeSpanningChangedListener(id: number): void;
   setUserInterfaceStyle(style: UserInterfaceStyle): void;