rn-system-bar 3.2.3 → 3.2.5

package/android/src/main/AndroidManifest.xml

@@ -6,4 +6,12 @@
         android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" />
 
-</manifest>
+    <!-- Required for network state / listener -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+
+    <!-- Required for haptic feedback / vibration -->
+    <uses-permission android:name="android.permission.VIBRATE" />
+
+</manifest>

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

@@ -10,13 +10,22 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.ActivityInfo
+import android.content.res.Configuration
 import android.graphics.Color
 import android.hardware.display.DisplayManager
 import android.media.AudioManager
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.os.BatteryManager
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.os.VibrationEffect
+import android.os.Vibrator
+import android.os.VibratorManager
 import android.provider.Settings
+import android.util.DisplayMetrics
 import android.view.View
 import android.view.WindowInsets
 import android.view.WindowInsetsController
@@ -503,225 +512,215 @@ class SystemBarModule(
     displayListener = null
   }
 
+
   // ═══════════════════════════════════════════════
-  //  APP-ONLY CAST  (MediaRouter — Chromecast / TV)
+  //  NETWORK
   // ═══════════════════════════════════════════════
 
-  private val mediaRouter: android.media.MediaRouter by lazy {
-    reactContext.getSystemService(Context.MEDIA_ROUTER_SERVICE) as android.media.MediaRouter
-  }
+  private fun connectivityManager() =
+    reactContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+  private fun buildNetworkMap(): WritableMap {
+    val cm  = connectivityManager()
+    val map = Arguments.createMap()
 
-  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>()
+    val net  = cm.activeNetwork
+    val caps = if (net != null) cm.getNetworkCapabilities(net) else null
 
-  // ── Helpers ───────────────────────────────────
+    val isConnected = caps != null &&
+      (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) ||
+       caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED))
 
-  private fun routeId(r: android.media.MediaRouter.RouteInfo): String =
-    r.name?.toString()?.replace(" ", "_")?.plus("_${r.hashCode()}") ?: r.hashCode().toString()
+    val type = when {
+      caps == null                                               -> "none"
+      caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)     -> "wifi"
+      caps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> "cellular"
+      caps.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> "ethernet"
+      else                                                      -> "unknown"
+    }
 
-  /**
-   * 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
+    map.putString("type",        type)
+    map.putBoolean("isConnected", isConnected)
+    val airplaneMode = Settings.Global.getInt(
+      reactContext.contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0) == 1
+    map.putBoolean("isAirplaneMode", airplaneMode)
+    map.putNull("ssid")
+    map.putNull("cellularGeneration")
+    return map
   }
 
-  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
+  @ReactMethod
+  fun getNetworkInfo(promise: Promise) {
+    try { promise.resolve(buildNetworkMap()) }
+    catch (e: Exception) { promise.reject("NETWORK_ERROR", e.message, e) }
   }
 
-  private fun buildAppCastMap(): WritableMap {
-    val map = Arguments.createMap()
-    map.putString("state", appCastState)
-    map.putNull("error")
+  private var networkCallback: ConnectivityManager.NetworkCallback? = null
 
-    val devArr = Arguments.createArray()
-    for (r in discoveredRoutes.values) devArr.pushMap(routeToMap(r))
-    map.putArray("devices", devArr)
+  @ReactMethod
+  fun startNetworkListener() {
+    if (networkCallback != null) return
+    val cb = object : ConnectivityManager.NetworkCallback() {
+      override fun onAvailable(network: android.net.Network)    { emit("SystemBar_NetworkChange", buildNetworkMap()) }
+      override fun onLost(network: android.net.Network)         { emit("SystemBar_NetworkChange", buildNetworkMap()) }
+      override fun onCapabilitiesChanged(
+        network: android.net.Network,
+        caps: NetworkCapabilities
+      ) { emit("SystemBar_NetworkChange", buildNetworkMap()) }
+    }
+    networkCallback = cb
+    val request = NetworkRequest.Builder().build()
+    connectivityManager().registerNetworkCallback(request, cb)
+  }
 
-    val connected = connectedRoute
-    if (connected != null) map.putMap("connectedDevice", routeToMap(connected))
-    else                   map.putNull("connectedDevice")
+  @ReactMethod
+  fun stopNetworkListener() {
+    networkCallback?.let {
+      try { connectivityManager().unregisterNetworkCallback(it) } catch (_: Exception) {}
+    }
+    networkCallback = null
+  }
 
+  // ═══════════════════════════════════════════════
+  //  BATTERY
+  // ═══════════════════════════════════════════════
+
+  private fun buildBatteryMap(): WritableMap {
+    val map    = Arguments.createMap()
+    val intent = reactContext.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+
+    val level  = intent?.getIntExtra(BatteryManager.EXTRA_LEVEL,  -1) ?: -1
+    val scale  = intent?.getIntExtra(BatteryManager.EXTRA_SCALE, 100) ?: 100
+    val pct    = if (scale > 0) (level * 100 / scale) else -1
+
+    val status = intent?.getIntExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN)
+    val state  = when (status) {
+      BatteryManager.BATTERY_STATUS_CHARGING                    -> "charging"
+      BatteryManager.BATTERY_STATUS_FULL                        -> "full"
+      BatteryManager.BATTERY_STATUS_DISCHARGING,
+      BatteryManager.BATTERY_STATUS_NOT_CHARGING                -> "discharging"
+      else                                                      -> "unknown"
+    }
+    val isCharging = state == "charging" || state == "full"
+
+    map.putInt("level",          pct)
+    map.putString("state",       state)
+    map.putBoolean("isCharging", isCharging)
+    map.putBoolean("isLow",      pct in 0..20 && !isCharging)
     return map
   }
 
-  private fun emitAppCastChange(error: String? = null) {
-    val map = buildAppCastMap()
-    if (error != null) map.putString("error", error)
-    emit("SystemBar_AppCastChange", map)
+  @ReactMethod
+  fun getBatteryInfo(promise: Promise) {
+    try { promise.resolve(buildBatteryMap()) }
+    catch (e: Exception) { promise.reject("BATTERY_ERROR", e.message, e) }
   }
 
-  // ── Scan ──────────────────────────────────────
+  private var batteryReceiver: BroadcastReceiver? = null
 
   @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()
+  fun startBatteryListener() {
+    if (batteryReceiver != null) return
+    val receiver = object : BroadcastReceiver() {
+      override fun onReceive(ctx: Context?, intent: Intent?) {
+        emit("SystemBar_BatteryChange", buildBatteryMap())
       }
+    }
+    batteryReceiver = receiver
+    val filter = IntentFilter().apply {
+      addAction(Intent.ACTION_BATTERY_CHANGED)
+      addAction(Intent.ACTION_BATTERY_LOW)
+      addAction(Intent.ACTION_BATTERY_OKAY)
+      addAction(Intent.ACTION_POWER_CONNECTED)
+      addAction(Intent.ACTION_POWER_DISCONNECTED)
+    }
+    reactContext.registerReceiver(receiver, filter)
+  }
 
-      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()
-      }
+  @ReactMethod
+  fun stopBatteryListener() {
+    batteryReceiver?.let { try { reactContext.unregisterReceiver(it) } catch (_: Exception) {} }
+    batteryReceiver = null
+  }
 
-      override fun onRouteChanged(
-        router: android.media.MediaRouter,
-        route: android.media.MediaRouter.RouteInfo
-      ) {
-        val id = routeId(route)
-        if (!route.isDefaultRoute()) discoveredRoutes[id] = route
-        emitAppCastChange()
-      }
+  // ═══════════════════════════════════════════════
+  //  HAPTICS
+  // ═══════════════════════════════════════════════
 
-      override fun onRouteSelected(
-        router: android.media.MediaRouter,
-        type: Int,
-        route: android.media.MediaRouter.RouteInfo
-      ) {
-        if (route.isDefaultRoute()) return
-        connectedRoute = route
-        appCastState   = "connected"
-        emitAppCastChange()
-      }
+  private fun vibrator(): Vibrator =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      (reactContext.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager)
+        .defaultVibrator
+    } else {
+      @Suppress("DEPRECATION")
+      reactContext.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
+    }
 
-      override fun onRouteUnselected(
-        router: android.media.MediaRouter,
-        type: Int,
-        route: android.media.MediaRouter.RouteInfo
-      ) {
-        if (appCastState != "idle") {
-          connectedRoute = null
-          appCastState   = "idle"
-          emitAppCastChange()
+  @ReactMethod
+  fun haptic(pattern: String) {
+    try {
+      val vib = vibrator()
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        val effect = when (pattern) {
+          "light"     -> VibrationEffect.createOneShot(30,  80)
+          "medium"    -> VibrationEffect.createOneShot(50,  150)
+          "heavy"     -> VibrationEffect.createOneShot(80,  255)
+          "success"   -> VibrationEffect.createWaveform(longArrayOf(0, 40, 60, 40),         intArrayOf(0, 180, 0, 255),          -1)
+          "warning"   -> VibrationEffect.createWaveform(longArrayOf(0, 60, 40, 60),         intArrayOf(0, 200, 0, 200),          -1)
+          "error"     -> VibrationEffect.createWaveform(longArrayOf(0, 80, 40, 80, 40, 80), intArrayOf(0, 255, 0, 255, 0, 255),  -1)
+          "selection" -> VibrationEffect.createOneShot(20,  60)
+          else        -> VibrationEffect.createOneShot(50,  150)
         }
+        vib.vibrate(effect)
+      } else {
+        @Suppress("DEPRECATION")
+        vib.vibrate(when (pattern) {
+          "light"     -> 30L
+          "heavy"     -> 80L
+          "selection" -> 20L
+          else        -> 50L
+        })
       }
+    } catch (_: Exception) {}
+  }
 
-      // ── 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
-      ) {}
-    }
+  // ═══════════════════════════════════════════════
+  //  FONT SCALE
+  // ═══════════════════════════════════════════════
 
-    appCastCallback = cb
-    mainHandler.post {
-      mediaRouter.addCallback(
-        android.media.MediaRouter.ROUTE_TYPE_LIVE_VIDEO,
-        cb,
-        // 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()
+  private fun buildFontScaleMap(): WritableMap {
+    val map     = Arguments.createMap()
+    val config  = reactContext.resources.configuration
+    val metrics = reactContext.resources.displayMetrics
+    map.putDouble("fontScale", config.fontScale.toDouble())
+    map.putDouble("density",   metrics.density.toDouble())
+    return map
   }
 
   @ReactMethod
-  fun stopAppCastScan() {
-    appCastCallback?.let { mainHandler.post { mediaRouter.removeCallback(it) } }
-    appCastCallback = null
-    if (appCastState == "scanning") {
-      appCastState = "idle"
-      emitAppCastChange()
-    }
+  fun getFontScaleInfo(promise: Promise) {
+    try { promise.resolve(buildFontScaleMap()) }
+    catch (e: Exception) { promise.reject("FONTSCALE_ERROR", e.message, e) }
   }
 
-  // ── Connect / Disconnect ──────────────────────
+  private var fontScaleReceiver: BroadcastReceiver? = null
 
   @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")
+  fun startFontScaleListener() {
+    if (fontScaleReceiver != null) return
+    val receiver = object : BroadcastReceiver() {
+      override fun onReceive(ctx: Context?, intent: Intent?) {
+        emit("SystemBar_FontScaleChange", buildFontScaleMap())
       }
     }
+    fontScaleReceiver = receiver
+    reactContext.registerReceiver(receiver, IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED))
   }
 
   @ReactMethod
-  fun getAppCastInfo(promise: Promise) {
-    try { promise.resolve(buildAppCastMap()) }
-    catch (e: Exception) { promise.reject("APP_CAST_ERROR", e.message, e) }
+  fun stopFontScaleListener() {
+    fontScaleReceiver?.let { try { reactContext.unregisterReceiver(it) } catch (_: Exception) {} }
+    fontScaleReceiver = null
   }
 
   // ── Cleanup ───────────────────────────────────
@@ -729,6 +728,8 @@ class SystemBarModule(
     stopBrightnessListener()
     stopVolumeListener()
     stopSystemScreencastListener()
-    stopAppCastScan()
+    stopNetworkListener()
+    stopBatteryListener()
+    stopFontScaleListener()
   }
 }

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)