feature: Add battery

rteyssandier-sep · rteyssandier-sep · commit 0570fb1a02bf · 2025-10-01T09:36:39.000+02:00
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/DeviceScreen.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/DeviceScreen.kt
@@ -23,10 +23,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import io.github.openflocon.domain.device.models.DeviceId
 import io.github.openflocon.flocondesktop.common.ui.window.FloconWindow
 import io.github.openflocon.flocondesktop.common.ui.window.createFloconWindowState
+import io.github.openflocon.flocondesktop.device.models.BatteryUiState
 import io.github.openflocon.flocondesktop.device.models.DeviceUiState
 import io.github.openflocon.flocondesktop.device.models.previewDeviceUiState
+import io.github.openflocon.flocondesktop.device.pages.BatteryPage
 import io.github.openflocon.flocondesktop.device.pages.CpuPage
 import io.github.openflocon.flocondesktop.device.pages.InfoPage
+import io.github.openflocon.flocondesktop.device.pages.MemoryPage
 import io.github.openflocon.flocondesktop.device.pages.PermissionPage
 import io.github.openflocon.library.designsystem.FloconTheme
 import io.github.openflocon.library.designsystem.components.FloconHorizontalDivider
@@ -63,7 +66,7 @@ private fun Content(
     onCloseRequest: () -> Unit,
     onAction: (DeviceAction) -> Unit
 ) {
-    val pagerState = rememberPagerState { 3 }
+    val pagerState = rememberPagerState { 5 }
 
     LaunchedEffect(uiState.contentState.selectedIndex) {
         pagerState.animateScrollToPage(uiState.contentState.selectedIndex)
@@ -104,11 +107,23 @@ private fun Content(
                                 selectedContentColor = FloconTheme.colorPalette.onSurface
                             )
                             FloconTab(
-                                text = "Permission",
+                                text = "Memory",
                                 selected = uiState.contentState.selectedIndex == 2,
                                 onClick = { onAction(DeviceAction.SelectTab(2)) },
                                 selectedContentColor = FloconTheme.colorPalette.onSurface
                             )
+                            FloconTab(
+                                text = "Permission",
+                                selected = uiState.contentState.selectedIndex == 3,
+                                onClick = { onAction(DeviceAction.SelectTab(3)) },
+                                selectedContentColor = FloconTheme.colorPalette.onSurface
+                            )
+                            FloconTab(
+                                text = "Battery",
+                                selected = uiState.contentState.selectedIndex == 4,
+                                onClick = { onAction(DeviceAction.SelectTab(4)) },
+                                selectedContentColor = FloconTheme.colorPalette.onSurface
+                            )
                         }
                         FloconHorizontalDivider(
                             modifier = Modifier.fillMaxWidth(),
@@ -132,11 +147,15 @@ private fun Content(
                             state = uiState.cpuState,
                             onAction = onAction
                         )
+                        2 -> MemoryPage(state = uiState.memoryState)
 
-                        2 -> PermissionPage(
+                        3 -> PermissionPage(
                             state = uiState.permissionState,
                             onAction = onAction
                         )
+                        4 -> BatteryPage(
+                            state = uiState.batteryState
+                        )
 
                         else -> Unit
                     }
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/DeviceViewModel.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/DeviceViewModel.kt
@@ -6,11 +6,13 @@ import io.github.openflocon.domain.adb.usecase.GetDeviceSerialUseCase
 import io.github.openflocon.domain.adb.usecase.SendCommandUseCase
 import io.github.openflocon.domain.common.getOrNull
 import io.github.openflocon.domain.device.usecase.GetCurrentDeviceIdAndPackageNameUseCase
+import io.github.openflocon.flocondesktop.device.models.BatteryUiState
 import io.github.openflocon.flocondesktop.device.models.ContentUiState
 import io.github.openflocon.flocondesktop.device.models.CpuItem
 import io.github.openflocon.flocondesktop.device.models.CpuUiState
 import io.github.openflocon.flocondesktop.device.models.DeviceUiState
 import io.github.openflocon.flocondesktop.device.models.InfoUiState
+import io.github.openflocon.flocondesktop.device.models.MemoryItem
 import io.github.openflocon.flocondesktop.device.models.MemoryUiState
 import io.github.openflocon.flocondesktop.device.models.PermissionItem
 import io.github.openflocon.flocondesktop.device.models.PermissionUiState
@@ -40,6 +42,28 @@ internal class DeviceViewModel(
             battery = ""
         )
     )
+    private val batteryState = MutableStateFlow(
+        BatteryUiState(
+            acPowered = false,
+            usbPowered = false,
+            wirelessPowered = false,
+            dockPowered = false,
+            maxChargingCurrent = 0,
+            maxChargingVoltage = 0,
+            chargeCounter = 0,
+            status = 0,
+            health = 0,
+            present = false,
+            level = 0,
+            scale = 0,
+            voltage = 0,
+            temperature = 0,
+            technology = "",
+            chargingState = 0,
+            chargingPolicy = 0,
+            capacityLevel = 0
+        )
+    )
     private val memoryState = MutableStateFlow(MemoryUiState(emptyList()))
     private val cpuState = MutableStateFlow(CpuUiState(emptyList()))
     private val permissionState = MutableStateFlow(PermissionUiState(emptyList()))
@@ -49,14 +73,16 @@ internal class DeviceViewModel(
         infoState,
         memoryState,
         cpuState,
-        permissionState
-    ) { content, info, memory, cpu, permission ->
+        permissionState,
+        batteryState
+    ) { states ->
         DeviceUiState(
-            contentState = content,
-            infoState = info,
-            memoryState = memory,
-            cpuState = cpu,
-            permissionState = permission
+            contentState = states[0] as ContentUiState,
+            infoState = states[1] as InfoUiState,
+            memoryState = states[2] as MemoryUiState,
+            cpuState = states[3] as CpuUiState,
+            permissionState = states[4] as PermissionUiState,
+            batteryState = states[5] as BatteryUiState
         )
     }
         .stateIn(
@@ -67,7 +93,8 @@ internal class DeviceViewModel(
                 infoState = infoState.value,
                 memoryState = memoryState.value,
                 cpuState = cpuState.value,
-                permissionState = permissionState.value
+                permissionState = permissionState.value,
+                batteryState = batteryState.value
             )
         )
 
@@ -106,10 +133,12 @@ internal class DeviceViewModel(
 
     private fun onRefresh() {
         refreshCpu()
+        refreshMemory()
+        refreshBattery()
         deviceInfo()
         fetchPermission()
         viewModelScope.launch {
-        //                    battery = sendCommand("shell", "dumpsys", "battery"),
+            //                    battery = sendCommand("shell", "dumpsys", "battery"),
 //                    mem = sendCommand("shell", "dumpsys", "meminfo")
         }
     }
@@ -203,9 +232,107 @@ internal class DeviceViewModel(
         }
     }
 
+    private fun refreshMemory() {
+        viewModelScope.launch(Dispatchers.IO) {
+            val output = sendCommand("shell", "dumpsys", "meminfo")
+            val regex = MEM_REGEX.toRegex()
+            val items = output.lineSequence()
+                .map { it.trim() }
+                .mapNotNull { regex.find(it) }
+                .mapNotNull {
+                    try {
+                        MemoryItem(
+                            memoryUsage = formatMemoryUsage(
+                                memoryUsageKB = it.groupValues[1].replace(",", "").toDoubleOrNull()
+                            ),
+                            processName = it.groupValues[2],
+                            pid = it.groupValues[3].toIntOrNull() ?: return@mapNotNull null
+                        )
+                    } catch (e: NumberFormatException) {
+                        // Handle parsing errors gracefully (e.g., log the error)
+                        null
+                    }
+                }
+                .toList()
+
+            memoryState.update { it.copy(list = items) }
+        }
+    }
+
+    private fun formatMemoryUsage(memoryUsageKB: Double?): String {
+        if (memoryUsageKB == null) {
+            return "N/A" // Or handle null case as appropriate
+        }
+
+        val memoryUsage = memoryUsageKB * 1024 // Convert KB to bytes
+
+        return when {
+            memoryUsage < 1024 -> String.format("%.2f B", memoryUsage)
+            memoryUsage < 1024 * 1024 -> String.format("%.2f KB", memoryUsage / 1024)
+            memoryUsage < 1024 * 1024 * 1024 -> String.format("%.2f MB", memoryUsage / (1024 * 1024))
+            else -> String.format("%.2f GB", memoryUsage / (1024 * 1024 * 1024))
+        }
+    }
+
+    private fun refreshBattery() {
+        viewModelScope.launch {
+            val batteryInfo = sendCommand("shell", "dumpsys", "battery")
+
+            batteryState.update {
+                it.copy(
+                    acPowered = AC_POWERED_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toBoolean() ?: false,
+                    usbPowered = USB_POWERED_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toBoolean() ?: false,
+                    wirelessPowered = WIRELESS_POWERED_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toBoolean()
+                        ?: false,
+                    dockPowered = DOCK_POWERED_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toBoolean() ?: false,
+                    maxChargingCurrent = MAX_CHARGING_CURRENT_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    maxChargingVoltage = MAX_CHARGING_VOLTAGE_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    chargeCounter = CHARGE_COUNTER_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    status = STATUS_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    health = HEALTH_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    present = PRESENT_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toBoolean() ?: false,
+                    level = LEVEL_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    scale = SCALE_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    voltage = VOLTAGE_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    temperature = TEMPERATURE_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    technology = TECHNOLOGY_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1),
+                    chargingState = CHARGING_STATE_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    chargingPolicy = CHARGING_POLICY_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull(),
+                    capacityLevel = CAPACITY_LEVEL_REGEX.toRegex().find(batteryInfo)?.groupValues?.get(1)?.toIntOrNull()
+                )
+            }
+        }
+    }
+
     companion object {
         private const val PERMISSION_PREFIX = "android.permission."
-        private const val CPU_REGEX = """(\d+(?:\.\d+)?)%\s+([^:]+):\s+(\d+(?:\.\d+)?)%\s+user\s+\+\s+(\d+(?:\.\d+)?)%\s+kernel\s+/ faults:\s+(\d+)\s+minor\s+(\d+)\s+major"""
+
+        // CPU
+        private const val CPU_REGEX =
+            """(\d+(?:\.\d+)?)%\s+([^:]+):\s+(\d+(?:\.\d+)?)%\s+user\s+\+\s+(\d+(?:\.\d+)?)%\s+kernel\s+/ faults:\s+(\d+)\s+minor\s+(\d+)\s+major"""
+
+        // MEM
+        private const val MEM_REGEX = """([\d,]+)K:\s+([a-zA-Z0-9._:-]+)\s+$${"pid"}\s+(\d+)(?:\s+/\s+([a-zA-Z\s]+))?$"""
+
+        // Battery
+        private const val AC_POWERED_REGEX = """AC powered:\s+(true|false)"""
+        private const val USB_POWERED_REGEX = """USB powered:\s+(true|false)"""
+        private const val WIRELESS_POWERED_REGEX = """Wireless powered:\s+(true|false)"""
+        private const val DOCK_POWERED_REGEX = """Dock powered:\s+(true|false)"""
+        private const val MAX_CHARGING_CURRENT_REGEX = """Max charging current:\s+(\d+)"""
+        private const val MAX_CHARGING_VOLTAGE_REGEX = """Max charging voltage:\s+(\d+)"""
+        private const val CHARGE_COUNTER_REGEX = """Charge counter:\s+(\d+)"""
+        private const val STATUS_REGEX = """status:\s+(\d+)"""
+        private const val HEALTH_REGEX = """health:\s+(\d+)"""
+        private const val PRESENT_REGEX = """present:\s+(true|false)"""
+        private const val LEVEL_REGEX = """level:\s+(\d+)"""
+        private const val SCALE_REGEX = """scale:\s+(\d+)"""
+        private const val VOLTAGE_REGEX = """voltage:\s+(\d+)"""
+        private const val TEMPERATURE_REGEX = """temperature:\s+(\d+)"""
+        private const val TECHNOLOGY_REGEX = """technology:\s+([a-zA-Z-]+)"""
+        private const val CHARGING_STATE_REGEX = """Charging state:\s+(\d+)"""
+        private const val CHARGING_POLICY_REGEX = """Charging policy:\s+(\d+)"""
+        private const val CAPACITY_LEVEL_REGEX = """Capacity level:\s+(\d+)"""
     }
 
 }
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/models/BatteryUiState.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/models/BatteryUiState.kt
@@ -0,0 +1,46 @@
+package io.github.openflocon.flocondesktop.device.models
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class BatteryUiState(
+    val acPowered: Boolean?,
+    val usbPowered: Boolean?,
+    val wirelessPowered: Boolean?,
+    val dockPowered: Boolean?,
+    val maxChargingCurrent: Int?,
+    val maxChargingVoltage: Int?,
+    val chargeCounter: Int?,
+    val status: Int?,
+    val health: Int?,
+    val present: Boolean?,
+    val level: Int?,
+    val scale: Int?,
+    val voltage: Int?,
+    val temperature: Int?,
+    val technology: String?,
+    val chargingState: Int?,
+    val chargingPolicy: Int?,
+    val capacityLevel: Int?
+)
+
+fun previewBatteryUiState() = BatteryUiState(
+    acPowered = true,
+    usbPowered = false,
+    wirelessPowered = true,
+    dockPowered = false,
+    maxChargingCurrent = 100,
+    maxChargingVoltage = 100,
+    chargeCounter = 100,
+    status = 100,
+    health = 100,
+    present = true,
+    level = 100,
+    scale = 100,
+    voltage = 100,
+    temperature = 100,
+    technology = "Technology",
+    chargingState = 100,
+    chargingPolicy = 100,
+    capacityLevel = 100
+)
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/models/DeviceUiState.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/models/DeviceUiState.kt
@@ -8,13 +8,15 @@ data class DeviceUiState(
     val infoState: InfoUiState,
     val cpuState: CpuUiState,
     val memoryState: MemoryUiState,
-    val permissionState: PermissionUiState
+    val permissionState: PermissionUiState,
+    val batteryState: BatteryUiState
 )
 
 internal fun previewDeviceUiState() = DeviceUiState(
     contentState = previewContentUiState(),
     cpuState = previewCpuUiState(),
     memoryState = previewMemoryUiState(),
     infoState = previewInfoUiState(),
-    permissionState = previewPermissionUiState()
+    permissionState = previewPermissionUiState(),
+    batteryState = previewBatteryUiState()
 )
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/models/MemoryUiState.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/models/MemoryUiState.kt
@@ -9,7 +9,9 @@ data class MemoryUiState(
 
 @Immutable
 data class MemoryItem(
-    val name: String
+    val memoryUsage: String,
+    val processName: String,
+    val pid: Int
 )
 
 fun previewMemoryUiState() = MemoryUiState(
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/pages/BatteryPage.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/pages/BatteryPage.kt
diff --git a/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/pages/MemoryPage.kt b/FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/device/pages/MemoryPage.kt

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ data class MemoryUiState(`
`9`	`9`
`10`	`10`	`@Immutable`
`11`	`11`	`data class MemoryItem(`
`12`		`- val name: String`
	`12`	`+ val memoryUsage: String,`
	`13`	`+ val processName: String,`
	`14`	`+ val pid: Int`
`13`	`15`	`)`
`14`	`16`
`15`	`17`	`fun previewMemoryUiState() = MemoryUiState(`