rn-system-bar 3.2.2 → 3.2.4

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

@@ -503,232 +503,10 @@ class SystemBarModule(
     displayListener = null
   }
 
-  // ═══════════════════════════════════════════════
-  //  APP-ONLY CAST  (MediaRouter — Chromecast / TV)
-  // ═══════════════════════════════════════════════
-
-  private val mediaRouter: android.media.MediaRouter by lazy {
-    reactContext.getSystemService(Context.MEDIA_ROUTER_SERVICE) as android.media.MediaRouter
-  }
-
-  private var appCastState    = "idle"
-  private var connectedRoute: android.media.MediaRouter.RouteInfo? = null
-  private var appCastCallback: android.media.MediaRouter.Callback? = null
-  private val discoveredRoutes = mutableMapOf<String, android.media.MediaRouter.RouteInfo>()
-
-  // ── 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")
-    m.putNull("signalStrength")
-    m.putBoolean("requiresPairing", false)
-    return m
-  }
-
-  private fun buildAppCastMap(): WritableMap {
-    val map = Arguments.createMap()
-    map.putString("state", appCastState)
-    map.putNull("error")
-
-    val devArr = Arguments.createArray()
-    for (r in discoveredRoutes.values) devArr.pushMap(routeToMap(r))
-    map.putArray("devices", devArr)
-
-    val connected = connectedRoute
-    if (connected != null) map.putMap("connectedDevice", routeToMap(connected))
-    else                   map.putNull("connectedDevice")
-
-    return map
-  }
-
-  private fun emitAppCastChange(error: String? = null) {
-    val map = buildAppCastMap()
-    if (error != null) map.putString("error", error)
-    emit("SystemBar_AppCastChange", map)
-  }
-
-  // ── Scan ──────────────────────────────────────
-
-  @ReactMethod
-  fun startAppCastScan() {
-    if (appCastCallback != null) return
-    appCastState = "scanning"
-    discoveredRoutes.clear()
-
-    val cb = object : android.media.MediaRouter.Callback() {
-
-      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 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 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
-      ) {}
-    }
-
-    appCastCallback = cb
-    mainHandler.post {
-      mediaRouter.addCallback(
-        android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO,
-        cb,
-        // CALLBACK_FLAG_REQUEST_DISCOVERY is typed as BigInteger in newer SDK bindings
-        android.media.MediaRouter.CALLBACK_FLAG_REQUEST_DISCOVERY.toInt() or
-        android.media.MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN.toInt()
-      )
-    }
-    emitAppCastChange()
-  }
-
-  @ReactMethod
-  fun stopAppCastScan() {
-    appCastCallback?.let { mainHandler.post { mediaRouter.removeCallback(it) } }
-    appCastCallback = null
-    if (appCastState == "scanning") {
-      appCastState = "idle"
-      emitAppCastChange()
-    }
-  }
-
-  // ── Connect / Disconnect ──────────────────────
-
-  @ReactMethod
-  fun connectAppCast(deviceId: String, pairingPin: String?) {
-    val route = discoveredRoutes[deviceId]
-    if (route == null) {
-      val err = Arguments.createMap()
-      err.putString("state", appCastState)
-      err.putString("error", "Device not found: $deviceId")
-      err.putNull("connectedDevice")
-      err.putArray("devices", Arguments.createArray())
-      emit("SystemBar_AppCastChange", err)
-      return
-    }
-    appCastState = "connecting"
-    emitAppCastChange()
-    mainHandler.post {
-      try {
-        mediaRouter.selectRoute(android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO, route)
-      } catch (e: Exception) {
-        appCastState = "idle"
-        emitAppCastChange(error = e.message ?: "Connection failed")
-      }
-    }
-  }
-
-  @ReactMethod
-  fun disconnectAppCast() {
-    if (connectedRoute == null) return
-    appCastState = "disconnecting"
-    emitAppCastChange()
-    mainHandler.post {
-      try {
-        val defaultRoute = mediaRouter.getDefaultRoute()
-        mediaRouter.selectRoute(android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO, defaultRoute)
-        connectedRoute = null
-        appCastState   = "idle"
-        emitAppCastChange()
-      } catch (e: Exception) {
-        appCastState = "idle"
-        emitAppCastChange(error = e.message ?: "Disconnect failed")
-      }
-    }
-  }
-
-  @ReactMethod
-  fun getAppCastInfo(promise: Promise) {
-    try { promise.resolve(buildAppCastMap()) }
-    catch (e: Exception) { promise.reject("APP_CAST_ERROR", e.message, e) }
-  }
-
   // ── Cleanup ───────────────────────────────────
   override fun onCatalystInstanceDestroy() {
     stopBrightnessListener()
     stopVolumeListener()
     stopSystemScreencastListener()
-    stopAppCastScan()
   }
 }

package/index.ts

@@ -13,7 +13,9 @@ export { setGlobalThemeMode, useTheme } from "./src/useTheme";
 
 // React hooks
 export {
-  useAppCast,
+  useBattery,
+  useFontScale,
+  useNetwork,
   useScreencast,
   useSystemBar,
   useSystemScreencast,
@@ -25,5 +27,4 @@ export {
 export type {
   SystemBarConfig,
   ThemedSystemBarConfig,
-  UseAppCastReturn,
 } from "./src/useSystemBar";

package/ios/SystemBarModule.m

@@ -1,5 +1,5 @@
 // ─────────────────────────────────────────────
-//  rn-system-bar · SystemBarModule.m  v6
+//  rn-system-bar · SystemBarModule.m
 //  Objective-C bridge — exposes Swift to React Native
 // ─────────────────────────────────────────────
 
@@ -41,13 +41,6 @@ RCT_EXTERN_METHOD(getSystemScreencastInfo:(RCTPromiseResolveBlock)resolve reject
 RCT_EXTERN_METHOD(startSystemScreencastListener)
 RCT_EXTERN_METHOD(stopSystemScreencastListener)
 
-// App-only Cast (Android MediaRouter — stubs on iOS)
-RCT_EXTERN_METHOD(startAppCastScan)
-RCT_EXTERN_METHOD(stopAppCastScan)
-RCT_EXTERN_METHOD(connectAppCast:(NSString *)deviceId pairingPin:(NSString *)pairingPin)
-RCT_EXTERN_METHOD(disconnectAppCast)
-RCT_EXTERN_METHOD(getAppCastInfo:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-
 // Font Scale
 RCT_EXTERN_METHOD(getFontScaleInfo:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(startFontScaleListener)

package/ios/SystemBarModule.swift

@@ -1,6 +1,5 @@
 // ─────────────────────────────────────────────
-//  rn-system-bar · SystemBarModule.swift  v5
-//  New: Network, Battery, Haptics, Screencast, FontScale
+//  rn-system-bar · SystemBarModule.swift
 // ─────────────────────────────────────────────
 
 import Foundation
@@ -18,7 +17,7 @@ class SystemBarModule: RCTEventEmitter {
     return [
       "SystemBar_NetworkChange",
       "SystemBar_BatteryChange",
-      "SystemBar_ScreencastChange",
+      "SystemBar_SystemScreencastChange",
       "SystemBar_FontScaleChange",
     ]
   }
@@ -77,6 +76,9 @@ class SystemBarModule: RCTEventEmitter {
     DispatchQueue.main.async { UIApplication.shared.isIdleTimerDisabled = enable }
   }
 
+  // setSecureScreen — iOS doesn't support this via public API (no-op)
+  @objc func setSecureScreen(_ enable: Bool) {}
+
   // ═══════════════════════════════════════════════
   //  ORIENTATION
   // ═══════════════════════════════════════════════
@@ -85,11 +87,11 @@ class SystemBarModule: RCTEventEmitter {
     DispatchQueue.main.async {
       var mask: UIInterfaceOrientationMask
       switch mode {
-      case "portrait":       mask = .portrait
-      case "landscape":      mask = .landscape
-      case "landscape-left": mask = .landscapeLeft
-      case "landscape-right":mask = .landscapeRight
-      default:               mask = .all
+      case "portrait":        mask = .portrait
+      case "landscape":       mask = .landscape
+      case "landscape-left":  mask = .landscapeLeft
+      case "landscape-right": mask = .landscapeRight
+      default:                mask = .all
       }
       if #available(iOS 16.0, *) {
         (UIApplication.shared.connectedScenes.first as? UIWindowScene)?
@@ -101,14 +103,13 @@ class SystemBarModule: RCTEventEmitter {
   }
 
   // ═══════════════════════════════════════════════
-  //  🆕 NETWORK INFO
+  //  NETWORK INFO
   // ═══════════════════════════════════════════════
 
   private func currentNetworkMap() -> [String: Any] {
     var isConnected = false
     var type = "unknown"
 
-    // Use NWPathMonitor snapshot via reachability
     if let reachability = SCNetworkReachabilityCreateWithName(nil, "apple.com") {
       var flags: SCNetworkReachabilityFlags = []
       SCNetworkReachabilityGetFlags(reachability, &flags)
@@ -118,13 +119,12 @@ class SystemBarModule: RCTEventEmitter {
       else                       { type = "none"      }
     }
 
-    let airplaneMode = false // iOS doesn't expose this to apps
     return [
-      "type":                type,
-      "isConnected":         isConnected,
-      "isAirplaneMode":      airplaneMode,
-      "ssid":                NSNull(),
-      "cellularGeneration":  NSNull(),
+      "type":               type,
+      "isConnected":        isConnected,
+      "isAirplaneMode":     false,   // iOS does not expose this to apps
+      "ssid":               NSNull(),
+      "cellularGeneration": NSNull(),
     ]
   }
 
@@ -145,23 +145,24 @@ class SystemBarModule: RCTEventEmitter {
   }
 
   @objc func stopNetworkListener() {
-    networkMonitor?.cancel(); networkMonitor = nil
+    networkMonitor?.cancel()
+    networkMonitor = nil
   }
 
   // ═══════════════════════════════════════════════
-  //  🆕 BATTERY
+  //  BATTERY
   // ═══════════════════════════════════════════════
 
   private func currentBatteryMap() -> [String: Any] {
     UIDevice.current.isBatteryMonitoringEnabled = true
-    let raw   = UIDevice.current.batteryLevel  // -1 if unknown
+    let raw   = UIDevice.current.batteryLevel   // -1 if unknown
     let level = raw >= 0 ? Int(raw * 100) : -1
     let state: String
     switch UIDevice.current.batteryState {
-    case .charging:    state = "charging"
-    case .full:        state = "full"
-    case .unplugged:   state = "discharging"
-    default:           state = "unknown"
+    case .charging:  state = "charging"
+    case .full:      state = "full"
+    case .unplugged: state = "discharging"
+    default:         state = "unknown"
     }
     let isCharging = state == "charging" || state == "full"
     return [
@@ -183,10 +184,12 @@ class SystemBarModule: RCTEventEmitter {
     UIDevice.current.isBatteryMonitoringEnabled = true
     let nc = NotificationCenter.default
     batteryObservers = [
-      nc.addObserver(forName: UIDevice.batteryLevelDidChangeNotification,  object: nil, queue: .main) { [weak self] _ in
+      nc.addObserver(forName: UIDevice.batteryLevelDidChangeNotification,
+                     object: nil, queue: .main) { [weak self] _ in
         self?.emit("SystemBar_BatteryChange", body: self?.currentBatteryMap() ?? [:])
       },
-      nc.addObserver(forName: UIDevice.batteryStateDidChangeNotification, object: nil, queue: .main) { [weak self] _ in
+      nc.addObserver(forName: UIDevice.batteryStateDidChangeNotification,
+                     object: nil, queue: .main) { [weak self] _ in
         self?.emit("SystemBar_BatteryChange", body: self?.currentBatteryMap() ?? [:])
       },
     ]
@@ -199,7 +202,7 @@ class SystemBarModule: RCTEventEmitter {
   }
 
   // ═══════════════════════════════════════════════
-  //  🆕 HAPTIC FEEDBACK
+  //  HAPTIC FEEDBACK
   // ═══════════════════════════════════════════════
 
   @objc func haptic(_ pattern: String) {
@@ -226,8 +229,7 @@ class SystemBarModule: RCTEventEmitter {
   }
 
   // ═══════════════════════════════════════════════
-  //  🆕 SYSTEM SCREENCAST  (external display / AirPlay mirror)
-  //  Detects OS-level external screens via UIScreen.
+  //  SYSTEM SCREENCAST  (external display / AirPlay mirror)
   // ═══════════════════════════════════════════════
 
   private func currentSystemScreencastMap() -> [String: Any] {
@@ -251,7 +253,8 @@ class SystemBarModule: RCTEventEmitter {
     screencastObserver = NotificationCenter.default.addObserver(
       forName: UIScreen.didConnectNotification, object: nil, queue: .main
     ) { [weak self] _ in
-      self?.emit("SystemBar_SystemScreencastChange", body: self?.currentSystemScreencastMap() ?? [:])
+      self?.emit("SystemBar_SystemScreencastChange",
+                 body: self?.currentSystemScreencastMap() ?? [:])
     }
   }
 
@@ -261,45 +264,30 @@ class SystemBarModule: RCTEventEmitter {
   }
 
   // ═══════════════════════════════════════════════
-  //  APP-ONLY CAST  (Android MediaRouter — iOS stubs)
-  //  AirPlay is system-managed on iOS; no public API for app-only casting.
-  // ═══════════════════════════════════════════════
-
-  @objc func startAppCastScan() {
-    // iOS: AirPlay is system-managed — no-op. Emit idle state.
-    emit("SystemBar_AppCastChange", body: [
-      "state": "idle", "devices": [], "connectedDevice": NSNull(), "error": NSNull()
-    ])
-  }
-  @objc func stopAppCastScan() {}
-
-  @objc func connectAppCast(_ deviceId: String, pairingPin: String?) {
-    emit("SystemBar_AppCastChange", body: [
-      "state": "idle", "devices": [], "connectedDevice": NSNull(),
-      "error": "App-only cast not supported on iOS"
-    ])
-  }
-
-  @objc func disconnectAppCast() {}
-
-  @objc
-  func getAppCastInfo(_ resolve: @escaping RCTPromiseResolveBlock,
-                      rejecter reject: RCTPromiseRejectBlock) {
-    resolve([
-      "state": "idle", "devices": [], "connectedDevice": NSNull(), "error": NSNull()
-    ])
-  }
-
-  // setSecureScreen — iOS doesn't support this via public API (no-op)
-  @objc func setSecureScreen(_ enable: Bool) {}
-
-  // ═══════════════════════════════════════════════
-  //  🆕 FONT SCALE
+  //  FONT SCALE
   // ═══════════════════════════════════════════════
 
   private func currentFontScaleMap() -> [String: Any] {
+    let category = UIApplication.shared.preferredContentSizeCategory
+    // Map Apple's content size category to a numeric scale factor
+    let scale: Double
+    switch category {
+    case .extraSmall:                         scale = 0.82
+    case .small:                              scale = 0.88
+    case .medium:                             scale = 0.94
+    case .large:                              scale = 1.00   // default
+    case .extraLarge:                         scale = 1.12
+    case .extraExtraLarge:                    scale = 1.24
+    case .extraExtraExtraLarge:               scale = 1.35
+    case .accessibilityMedium:                scale = 1.60
+    case .accessibilityLarge:                 scale = 1.90
+    case .accessibilityExtraLarge:            scale = 2.35
+    case .accessibilityExtraExtraLarge:       scale = 2.75
+    case .accessibilityExtraExtraExtraLarge:  scale = 3.12
+    default:                                  scale = 1.00
+    }
     return [
-      "fontScale": Double(UIApplication.shared.preferredContentSizeCategory == .large ? 1.0 : 1.0),
+      "fontScale": scale,
       "density":   Double(UIScreen.main.scale),
     ]
   }
@@ -323,16 +311,15 @@ class SystemBarModule: RCTEventEmitter {
     fontScaleObserver = nil
   }
 
-  // ── Android-only stubs ─────────────────────
+  // ── Android-only stubs (no-op on iOS) ─────────
   @objc func setNavigationBarColor(_ color: String) {}
   @objc func setNavigationBarVisibility(_ mode: String) {}
   @objc func setNavigationBarButtonStyle(_ style: String) {}
   @objc func setNavigationBarStyle(_ style: String) {}
   @objc func setNavigationBarBehavior(_ behavior: String) {}
-  // color: hex | "transparent" | "translucent" — Android only
   @objc func setStatusBarColor(_ color: String) {}
-  @objc func setVolumeHUDVisible(_ visible: Bool) {}
-  @objc func immersiveMode(_ enable: Bool) {}
   @objc func setStatusBarStyle(_ style: String) {}
   @objc func setStatusBarVisibility(_ visible: Bool) {}
+  @objc func setVolumeHUDVisible(_ visible: Bool) {}
+  @objc func immersiveMode(_ enable: Bool) {}
 }

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./src/SystemBar";
 export * from "./src/types";
 export { setGlobalThemeMode, useTheme } from "./src/useTheme";
-export { useAppCast, useScreencast, useSystemBar, useSystemScreencast, useTheme as useThemeHook, useThemeSystemBar, } from "./src/useSystemBar";
-export type { SystemBarConfig, ThemedSystemBarConfig, UseAppCastReturn, } from "./src/useSystemBar";
+export { useBattery, useFontScale, useNetwork, useScreencast, useSystemBar, useSystemScreencast, useTheme as useThemeHook, useThemeSystemBar, } from "./src/useSystemBar";
+export type { SystemBarConfig, ThemedSystemBarConfig, } from "./src/useSystemBar";

package/lib/index.js

@@ -17,7 +17,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useThemeSystemBar = exports.useThemeHook = exports.useSystemScreencast = exports.useSystemBar = exports.useScreencast = exports.useAppCast = exports.useTheme = exports.setGlobalThemeMode = void 0;
+exports.useThemeSystemBar = exports.useThemeHook = exports.useSystemScreencast = exports.useSystemBar = exports.useScreencast = exports.useNetwork = exports.useFontScale = exports.useBattery = exports.useTheme = exports.setGlobalThemeMode = void 0;
 // All imperative JS/TS APIs
 __exportStar(require("./src/SystemBar"), exports);
 // All TypeScript types
@@ -28,7 +28,9 @@ Object.defineProperty(exports, "setGlobalThemeMode", { enumerable: true, get: fu
 Object.defineProperty(exports, "useTheme", { enumerable: true, get: function () { return useTheme_1.useTheme; } });
 // React hooks
 var useSystemBar_1 = require("./src/useSystemBar");
-Object.defineProperty(exports, "useAppCast", { enumerable: true, get: function () { return useSystemBar_1.useAppCast; } });
+Object.defineProperty(exports, "useBattery", { enumerable: true, get: function () { return useSystemBar_1.useBattery; } });
+Object.defineProperty(exports, "useFontScale", { enumerable: true, get: function () { return useSystemBar_1.useFontScale; } });
+Object.defineProperty(exports, "useNetwork", { enumerable: true, get: function () { return useSystemBar_1.useNetwork; } });
 Object.defineProperty(exports, "useScreencast", { enumerable: true, get: function () { return useSystemBar_1.useScreencast; } });
 Object.defineProperty(exports, "useSystemBar", { enumerable: true, get: function () { return useSystemBar_1.useSystemBar; } });
 Object.defineProperty(exports, "useSystemScreencast", { enumerable: true, get: function () { return useSystemBar_1.useSystemScreencast; } });