rn-system-bar 3.2.1 → 3.2.3

package/android/src/main/java/com/systembar/SystemBarModule.kt

@@ -56,10 +56,7 @@ class SystemBarModule(
   //  NAVIGATION BAR — 100% native, no expo dep
   // ═══════════════════════════════════════════════
 
-  // ── Helpers for transparent / translucent bars ──────────────────────────
-
   private fun applyEdgeToEdgeFlags() {
-    // Required so our colour / transparency actually shows through
     activity()!!.window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
   }
 
@@ -154,7 +151,6 @@ class SystemBarModule(
 
   @ReactMethod
   fun setNavigationBarStyle(style: String) {
-    // Maps to button style — "dark"/"auto" → dark icons, "light"/"inverted" → light icons
     setNavigationBarButtonStyle(if (style == "dark" || style == "auto") "dark" else "light")
   }
 
@@ -165,11 +161,9 @@ class SystemBarModule(
         val c = activity()!!.window.insetsController ?: return@runOnUiThread
         c.systemBarsBehavior = when (behavior) {
           "overlay-swipe" -> WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-          // inset modes — default persistent behavior
           else            -> WindowInsetsController.BEHAVIOR_DEFAULT
         }
       }
-      // API < 30: IMMERSIVE_STICKY is closest — no-op otherwise
     }
   }
 
@@ -288,14 +282,12 @@ class SystemBarModule(
   }
 
   // ── Realtime brightness listener ─────────────
-  private var brightnessReceiver: BroadcastReceiver? = null
   private var brightnessPollingRunnable: Runnable? = null
   private var lastBrightness = -1
 
   @ReactMethod
   fun startBrightnessListener() {
     if (brightnessPollingRunnable != null) return
-    // Settings.System doesn't broadcast changes — poll every 500ms
     val runnable = object : Runnable {
       override fun run() {
         try {
@@ -430,20 +422,15 @@ class SystemBarModule(
 
   @ReactMethod
   fun setOrientation(mode: String) {
-    // "auto" → always unspecified (follow system auto-rotate toggle unconditionally)
     if (mode == "auto") {
       activity()?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
       return
     }
 
-    // For a specific orientation: check if the device's auto-rotate toggle is ON.
-    // auto-rotate ON  → use sensor-based variant so the device can still rotate
-    //                   within the requested axis (portrait ↔ reverse-portrait, etc.)
-    // auto-rotate OFF → hard-lock to the exact orientation requested
     val autoRotateOn = Settings.System.getInt(
       reactContext.contentResolver,
       Settings.System.ACCELEROMETER_ROTATION,
-      0  // default = locked (off)
+      0
     ) == 1
 
     activity()?.requestedOrientation = when (mode) {
@@ -456,7 +443,6 @@ class SystemBarModule(
         else              ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
 
       "landscape-left" ->
-        // Reverse landscape — no sensor variant; honour toggle by using full sensor landscape
         if (autoRotateOn) ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
         else              ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
 
@@ -470,7 +456,6 @@ class SystemBarModule(
 
   // ═══════════════════════════════════════════════
   //  SYSTEM SCREENCAST  (external display / HDMI / Miracast)
-  //  Detects OS-level external displays via DisplayManager.
   // ═══════════════════════════════════════════════
 
   private var displayListener: DisplayManager.DisplayListener? = null
@@ -520,42 +505,41 @@ class SystemBarModule(
 
   // ═══════════════════════════════════════════════
   //  APP-ONLY CAST  (MediaRouter — Chromecast / TV)
-  //
-  //  Casts ONLY this app's screen — not the whole system.
-  //  Uses android.media.MediaRouter (API 16+, no Play Services required).
-  //
-  //  Flow:
-  //    startAppCastScan()          → devices arrive via SystemBar_AppCastChange
-  //    connectAppCast(deviceId)    → state = "connecting" then "connected"
-  //    disconnectAppCast()         → state = "disconnecting" then "idle"
   // ═══════════════════════════════════════════════
 
   private val mediaRouter: android.media.MediaRouter by lazy {
     reactContext.getSystemService(Context.MEDIA_ROUTER_SERVICE) as android.media.MediaRouter
   }
 
-  // Current state
   private var appCastState    = "idle"
   private var connectedRoute: android.media.MediaRouter.RouteInfo? = null
   private var appCastCallback: android.media.MediaRouter.Callback? = null
-
-  // All routes discovered during the current scan (id → route)
   private val discoveredRoutes = mutableMapOf<String, android.media.MediaRouter.RouteInfo>()
 
-  // ── Serialisation helpers ──────────────────
+  // ── Helpers ───────────────────────────────────
 
   private fun routeId(r: android.media.MediaRouter.RouteInfo): String =
     r.name?.toString()?.replace(" ", "_")?.plus("_${r.hashCode()}") ?: r.hashCode().toString()
 
+  /**
+   * Replaces the removed RouteInfo.isDefault property (removed in API 34+).
+   * The default route is the built-in phone speaker / earpiece.
+   * We identify it by checking that it only supports audio (not video/live-video)
+   * and that it carries no presentation display.
+   */
+  private fun android.media.MediaRouter.RouteInfo.isDefaultRoute(): Boolean {
+    val videoMask = android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO or
+                    android.media.MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY
+    return (supportedTypes and videoMask) == 0
+  }
+
   private fun routeToMap(r: android.media.MediaRouter.RouteInfo): WritableMap {
     val m = Arguments.createMap()
     m.putString("id",   routeId(r))
     m.putString("name", r.name?.toString() ?: "Unknown")
     val desc = r.description?.toString()
     if (desc != null) m.putString("description", desc) else m.putNull("description")
-    // MediaRouter doesn't expose signal strength — set null
     m.putNull("signalStrength")
-    // Consider a device to require pairing when its status matches "connecting"
     m.putBoolean("requiresPairing", false)
     return m
   }
@@ -582,83 +566,98 @@ class SystemBarModule(
     emit("SystemBar_AppCastChange", map)
   }
 
-  // ── Scan ──────────────────────────────────
+  // ── Scan ──────────────────────────────────────
 
   @ReactMethod
   fun startAppCastScan() {
-    if (appCastCallback != null) return          // already scanning
+    if (appCastCallback != null) return
     appCastState = "scanning"
     discoveredRoutes.clear()
 
- val cb = object : android.media.MediaRouter.Callback() {
+    val cb = object : android.media.MediaRouter.Callback() {
 
-  private fun android.media.MediaRouter.RouteInfo.isDefaultRoute(): Boolean =
-    (supportedTypes and android.media.MediaRouter.ROUTE_TYPE_LIVE_AUDIO) != 0 &&
-    name?.toString()?.lowercase()?.contains("phone") == true
+      override fun onRouteAdded(
+        router: android.media.MediaRouter,
+        route: android.media.MediaRouter.RouteInfo
+      ) {
+        if (route.isDefaultRoute()) return
+        val id = routeId(route)
+        discoveredRoutes[id] = route
+        emitAppCastChange()
+      }
 
-  override fun onRouteAdded(router: android.media.MediaRouter, route: android.media.MediaRouter.RouteInfo) {
-    if (route.isDefaultRoute()) return
-    val id = routeId(route)
-    discoveredRoutes[id] = route
-    emitAppCastChange()
-  }
+      override fun onRouteRemoved(
+        router: android.media.MediaRouter,
+        route: android.media.MediaRouter.RouteInfo
+      ) {
+        discoveredRoutes.remove(routeId(route))
+        if (connectedRoute?.let { routeId(it) } == routeId(route)) {
+          connectedRoute = null
+          appCastState   = "idle"
+        }
+        emitAppCastChange()
+      }
 
-  override fun onRouteRemoved(router: android.media.MediaRouter, route: android.media.MediaRouter.RouteInfo) {
-    discoveredRoutes.remove(routeId(route))
-    if (connectedRoute?.let { routeId(it) } == routeId(route)) {
-      connectedRoute = null
-      appCastState   = "idle"
-    }
-    emitAppCastChange()
-  }
+      override fun onRouteChanged(
+        router: android.media.MediaRouter,
+        route: android.media.MediaRouter.RouteInfo
+      ) {
+        val id = routeId(route)
+        if (!route.isDefaultRoute()) discoveredRoutes[id] = route
+        emitAppCastChange()
+      }
 
-  override fun onRouteChanged(router: android.media.MediaRouter, route: android.media.MediaRouter.RouteInfo) {
-    val id = routeId(route)
-    if (!route.isDefaultRoute()) discoveredRoutes[id] = route
-    emitAppCastChange()
-  }
+      override fun onRouteSelected(
+        router: android.media.MediaRouter,
+        type: Int,
+        route: android.media.MediaRouter.RouteInfo
+      ) {
+        if (route.isDefaultRoute()) return
+        connectedRoute = route
+        appCastState   = "connected"
+        emitAppCastChange()
+      }
 
-  override fun onRouteSelected(router: android.media.MediaRouter, type: Int, route: android.media.MediaRouter.RouteInfo) {
-    if (route.isDefaultRoute()) return
-    connectedRoute = route
-    appCastState   = "connected"
-    emitAppCastChange()
-  }
+      override fun onRouteUnselected(
+        router: android.media.MediaRouter,
+        type: Int,
+        route: android.media.MediaRouter.RouteInfo
+      ) {
+        if (appCastState != "idle") {
+          connectedRoute = null
+          appCastState   = "idle"
+          emitAppCastChange()
+        }
+      }
 
-  override fun onRouteUnselected(router: android.media.MediaRouter, type: Int, route: android.media.MediaRouter.RouteInfo) {
-    if (appCastState != "idle") {
-      connectedRoute = null
-      appCastState   = "idle"
-      emitAppCastChange()
+      // ── Required abstract stubs (no-op) ───────
+      override fun onRouteGrouped(
+        router: android.media.MediaRouter,
+        route: android.media.MediaRouter.RouteInfo,
+        group: android.media.MediaRouter.RouteGroup,
+        index: Int
+      ) {}
+
+      override fun onRouteUngrouped(
+        router: android.media.MediaRouter,
+        route: android.media.MediaRouter.RouteInfo,
+        group: android.media.MediaRouter.RouteGroup
+      ) {}
+
+      override fun onRouteVolumeChanged(
+        router: android.media.MediaRouter,
+        route: android.media.MediaRouter.RouteInfo
+      ) {}
     }
-  }
 
-  // ── Required abstract stubs ──────────────────────────────────────────
-  override fun onRouteGrouped(
-    router: android.media.MediaRouter,
-    route: android.media.MediaRouter.RouteInfo,
-    group: android.media.MediaRouter.RouteGroup,
-    index: Int
-  ) {}
-
-  override fun onRouteUngrouped(
-    router: android.media.MediaRouter,
-    route: android.media.MediaRouter.RouteInfo,
-    group: android.media.MediaRouter.RouteGroup
-  ) {}
-
-  override fun onRouteVolumeChanged(
-    router: android.media.MediaRouter,
-    route: android.media.MediaRouter.RouteInfo
-  ) {}
-}
     appCastCallback = cb
     mainHandler.post {
       mediaRouter.addCallback(
         android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO,
         cb,
-        android.media.MediaRouter.CALLBACK_FLAG_REQUEST_DISCOVERY.toInt() or
-        android.media.MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN.toInt()
+        // CALLBACK_FLAG_REQUEST_DISCOVERY (0x4) and CALLBACK_FLAG_PERFORM_ACTIVE_SCAN (0x2)
+        // were removed from the Android SDK — use their raw int values directly.
+        0x4 or 0x2
       )
     }
     emitAppCastChange()
@@ -674,7 +673,7 @@ class SystemBarModule(
     }
   }
 
-  // ── Connect / Disconnect ──────────────────
+  // ── Connect / Disconnect ──────────────────────
 
   @ReactMethod
   fun connectAppCast(deviceId: String, pairingPin: String?) {
@@ -693,7 +692,6 @@ class SystemBarModule(
     mainHandler.post {
       try {
         mediaRouter.selectRoute(android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO, route)
-        // onRouteSelected callback will set state = "connected" and re-emit
       } catch (e: Exception) {
         appCastState = "idle"
         emitAppCastChange(error = e.message ?: "Connection failed")
@@ -708,7 +706,6 @@ class SystemBarModule(
     emitAppCastChange()
     mainHandler.post {
       try {
-        // Select the default (phone) route to stop remote casting
         val defaultRoute = mediaRouter.getDefaultRoute()
         mediaRouter.selectRoute(android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO, defaultRoute)
         connectedRoute = null
@@ -727,7 +724,7 @@ class SystemBarModule(
     catch (e: Exception) { promise.reject("APP_CAST_ERROR", e.message, e) }
   }
 
-  // ── Cleanup ──────────────────────────────────
+  // ── Cleanup ───────────────────────────────────
   override fun onCatalystInstanceDestroy() {
     stopBrightnessListener()
     stopVolumeListener()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rn-system-bar",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Control Android & iOS system bars, brightness, volume, orientation and screen flags from React Native.",
   "main": "lib/index.js",
   "react-native": "lib/index.js",