Battery: Regroup the battery hub details by subject

Promoting five readings into the tile grid left the detail sections named
after what they used to hold ("Charging", "Health", "Electrical"), which no
longer described their contents. The rows are now split by what the fact is
about: "This battery" carries technology, battery health, charge cycles and
charge remaining, "This charger" carries the power source and the charger's
advertised maximum.

"Charge counter" was the raw Android property name (BATTERY_PROPERTY_CHARGE_
COUNTER) surfacing in the UI and read as the cell's capacity. It is the charge
currently in the cell, tracking the battery level, so it now reads "Charge
remaining". "Health" becomes "Battery health", which also removes the
title/row text collision the hub test had to work around.

The battery section is deliberately first: unplugged, both charger rows read
"Not reported", so a charger-first order would open the list with two empty
rows in the most common state.

Author: d4rken

app/src/main/java/eu/darken/amply/main/ui/battery/BatteryHubScreen.kt

@@ -151,9 +151,11 @@ fun BatteryHubScreen(
                     onOpenMetric = onOpenMetric,
                 )
             }
-            item { ChargingSection(data) }
-            item { HealthSection(data) }
-            item { ElectricalSection(data) }
+            // Battery before charger: unplugged, both charger rows read "Not reported", and a
+            // charger-first order would open the section list with two empty rows in the most
+            // common state. Keep this order.
+            item { BatterySection(data) }
+            item { ChargerSection(data) }
         }
     }
 }
@@ -267,25 +269,15 @@ private fun BatteryMetric.accentColor(): Color = when (this) {
     BatteryMetric.VOLTAGE, BatteryMetric.CURRENT -> MaterialTheme.colorScheme.secondary
 }
 
+/** Facts about the cell itself. Voltage, current and charge power moved up into the tile grid. */
 @Composable
-private fun ChargingSection(readout: BatteryReadout) {
+private fun BatterySection(readout: BatteryReadout) {
     val notReported = stringResource(R.string.battery_value_not_reported)
-    DetailSection(stringResource(R.string.battery_detail_section_charging)) {
-        DetailRow(
-            stringResource(R.string.battery_detail_power_source),
-            batteryPlugLabel(readout.plugged)?.let { stringResource(it) } ?: notReported,
-        )
+    DetailSection(stringResource(R.string.battery_detail_section_battery)) {
         DetailRow(
             stringResource(R.string.battery_detail_technology),
             readout.technology ?: notReported,
         )
-    }
-}
-
-@Composable
-private fun HealthSection(readout: BatteryReadout) {
-    val notReported = stringResource(R.string.battery_value_not_reported)
-    DetailSection(stringResource(R.string.battery_detail_section_health)) {
         DetailRow(
             stringResource(R.string.battery_detail_health),
             stringResource(batteryHealthLabel(readout.health)),
@@ -294,15 +286,22 @@ private fun HealthSection(readout: BatteryReadout) {
             stringResource(R.string.battery_detail_cycle_count),
             readout.cycleCount?.toString() ?: notReported,
         )
+        DetailRow(
+            stringResource(R.string.battery_detail_charge_counter),
+            formatChargeCounter(readout.chargeCounterMicroampHours) ?: notReported,
+        )
     }
 }
 
+/** Facts about whatever is currently plugged in. */
 @Composable
-private fun ElectricalSection(readout: BatteryReadout) {
+private fun ChargerSection(readout: BatteryReadout) {
     val notReported = stringResource(R.string.battery_value_not_reported)
-    // Voltage, current and charge power moved up into the tile grid; what stays here is the pair
-    // that has no live series to chart.
-    DetailSection(stringResource(R.string.battery_detail_section_electrical)) {
+    DetailSection(stringResource(R.string.battery_detail_section_charger)) {
+        DetailRow(
+            stringResource(R.string.battery_detail_power_source),
+            batteryPlugLabel(readout.plugged)?.let { stringResource(it) } ?: notReported,
+        )
         // Advertised, not measured: what the connected supply claims. Nothing connected means nothing
         // to claim, so the extras are only read through while on a charger.
         DetailRow(
@@ -311,10 +310,6 @@ private fun ElectricalSection(readout: BatteryReadout) {
                 ?.let { StatsFormat.power(StatsPowerCalculator.advertisedMaxMilliwatts(it)) }
                 ?: notReported,
         )
-        DetailRow(
-            stringResource(R.string.battery_detail_charge_counter),
-            formatChargeCounter(readout.chargeCounterMicroampHours) ?: notReported,
-        )
     }
 }
 

app/src/main/res/values/strings.xml

@@ -508,16 +508,15 @@
     <string name="battery_hub_teaser_loading">Loading…</string>
     <string name="battery_hub_teaser_unavailable">Statistics are unavailable right now</string>
     <string name="battery_hub_teaser_open_action">View charge session</string>
-    <string name="battery_detail_section_charging">Charging</string>
-    <string name="battery_detail_section_health">Health</string>
-    <string name="battery_detail_section_electrical">Electrical</string>
+    <string name="battery_detail_section_battery">This battery</string>
+    <string name="battery_detail_section_charger">This charger</string>
     <string name="battery_detail_status">Status</string>
     <string name="battery_detail_power_source">Power source</string>
     <string name="battery_detail_technology">Technology</string>
-    <string name="battery_detail_health">Health</string>
+    <string name="battery_detail_health">Battery health</string>
     <string name="battery_detail_cycle_count">Charge cycles</string>
     <string name="battery_detail_charger_max">Charger max</string>
-    <string name="battery_detail_charge_counter">Charge counter</string>
+    <string name="battery_detail_charge_counter">Charge remaining</string>
 
     <!-- Per-metric tiles and their detail screen -->
     <string name="battery_metric_open_action">Open metric details</string>

app/src/test/java/eu/darken/amply/main/ui/battery/BatteryHubScreenTest.kt

@@ -9,7 +9,6 @@ import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onAllNodesWithTag
 import androidx.compose.ui.test.onAllNodesWithText
-import androidx.compose.ui.test.onFirst
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
@@ -149,8 +148,14 @@ class BatteryHubScreenTest {
             R.string.battery_detail_cycle_count,
             R.string.battery_detail_charger_max,
             R.string.battery_detail_charge_counter,
-            // "Health" is both a section title and a row label, so match the first of either.
-        ).forEach { res -> compose.onAllNodesWithText(string(res)).onFirst().assertExists() }
+        ).forEach { res -> compose.onNodeWithText(string(res)).assertExists() }
+    }
+
+    @Test
+    fun `the detail rows are grouped into a battery and a charger section`() {
+        render(charging)
+        compose.onNodeWithText(string(R.string.battery_detail_section_battery)).assertExists()
+        compose.onNodeWithText(string(R.string.battery_detail_section_charger)).assertExists()
     }
 
     @Test