General: Refresh the store screenshots and swap two of the six

The committed PNGs predated ~85 UI commits: the charging card, the
enforcement tier line, the adapter capability note and the setup guide
had all moved on. Re-rendered all six from the current fixtures.

Two shots also changed subject. The Samsung multi-mode shot had become
indistinguishable from the dashboard shot — same hero, chart and
full-charge card, differing only in the device line, with the multi-mode
chips it existed to show sitting below the fold. The theme-settings shot
was three rows on an otherwise empty screen. They are replaced by the
charge-conditions rule list and the battery hub, neither of which
appeared anywhere before.

The hub shot reuses HubFixtures' tile-grid content rather than a second
copy, so the store shot cannot drift from the engineering regression
shot that renders the same composable.

Author: d4rken

README.md

@@ -81,7 +81,7 @@ the extras above and is what funds continued development.
 
 ## Screenshots
 
-<img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/1_dashboard_light.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/2_full_charge_dark.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/3_samsung_multimode.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/4_setup_guide.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/5_settings.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/6_reconnect_gesture.png" width="100">
+<img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/1_dashboard_light.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/2_full_charge_dark.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/3_charge_conditions.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/4_setup_guide.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/5_battery_hub.png" width="100"><img src="https://github.com/d4rken-org/amply/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/6_reconnect_gesture.png" width="100">
 
 ## Setup & access
 

app/src/debug/java/eu/darken/amply/screenshots/ScreenshotContent.kt

@@ -12,12 +12,10 @@ import eu.darken.amply.charging.core.ChargeObservation
 import eu.darken.amply.charging.core.ChargePolicy
 import eu.darken.amply.charging.core.ChargingState
 import eu.darken.amply.charging.core.DeviceInfo
-import eu.darken.amply.charging.core.SettingProbe
 import eu.darken.amply.charging.core.access.AccessSnapshot
 import eu.darken.amply.charging.core.access.BackendStatus
 import eu.darken.amply.common.ca.toCaString
 import eu.darken.amply.common.compose.PreviewWrapper
-import eu.darken.amply.common.theming.ThemeState
 import eu.darken.amply.battery.core.BatteryReadout
 import eu.darken.amply.fullcharge.core.ChargeSessionRecord
 import eu.darken.amply.main.ui.dashboard.DashboardScreen
@@ -26,7 +24,13 @@ import eu.darken.amply.main.ui.dashboard.StatsDashboardState
 import eu.darken.amply.stats.core.ChargeCurvePoint
 import eu.darken.amply.stats.core.StatsLiveSession
 import eu.darken.amply.main.ui.settings.ChargingSettingsScreen
-import eu.darken.amply.main.ui.settings.GeneralSettingsScreen
+import eu.darken.amply.rules.core.ChargeRule
+import eu.darken.amply.rules.core.PlugKind
+import eu.darken.amply.rules.core.RuleCondition
+import eu.darken.amply.rules.core.policy
+import eu.darken.amply.rules.ui.ChargeRuleRow
+import eu.darken.amply.rules.ui.ChargeRulesScreen
+import eu.darken.amply.rules.ui.ChargeRulesUiState
 
 // Device spec shared by every Play Store screenshot. 1080x1920 (9:16) is Play's recommended phone
 // size and stays within its "longest side may not exceed 2x the shorter side" rule — 1080x2400
@@ -44,20 +48,67 @@ internal fun DashboardReadyContent() = DashboardShot(readyState())
 @Composable
 internal fun DashboardActiveContent() = DashboardShot(sessionState())
 
-@Composable
-internal fun SamsungMultiModeContent() = DashboardShot(samsungState())
-
 @Composable
 internal fun SetupGuideContent() = DashboardShot(setupNeededState())
 
+// Three healthy rules covering both condition kinds, with the topmost one currently matching — the
+// list IS the priority editor, so the shot has to show more than one row to mean anything.
 @Composable
-internal fun SettingsContent() = PreviewWrapper {
-    GeneralSettingsScreen(
-        state = ThemeState(),
+internal fun ChargeConditionsContent() = PreviewWrapper {
+    ChargeRulesScreen(
+        state = ChargeRulesUiState(
+            rows = listOf(
+                ruleRow(
+                    id = "car",
+                    label = "Car",
+                    condition = RuleCondition.BluetoothDevice("AA:BB:CC:DD:EE:FF", "Car audio"),
+                    policy = ChargePolicy.Unrestricted,
+                    active = true,
+                    canMoveUp = false,
+                ),
+                ruleRow(
+                    id = "dock",
+                    label = "Desk dock",
+                    condition = RuleCondition.ChargerType(setOf(PlugKind.DOCK, PlugKind.WIRELESS)),
+                    policy = ChargePolicy.FixedLimit(80),
+                ),
+                ruleRow(
+                    id = "bedside",
+                    label = "Overnight",
+                    condition = RuleCondition.BluetoothDevice("11:22:33:44:55:66", "Bedside speaker"),
+                    policy = ChargePolicy.Adaptive,
+                    canMoveDown = false,
+                ),
+            ),
+        ),
         onBack = {},
-        onModeChange = {},
-        onStyleChange = {},
-        onColorChange = {},
+        onAdd = {},
+        onEdit = {},
+        onDelete = {},
+        onEnabledChange = { _, _ -> },
+        onMove = { _, _ -> },
+        onFixBluetoothPermission = {},
+    )
+}
+
+private fun ruleRow(
+    id: String,
+    label: String,
+    condition: RuleCondition,
+    policy: ChargePolicy,
+    active: Boolean = false,
+    canMoveUp: Boolean = true,
+    canMoveDown: Boolean = true,
+): ChargeRuleRow {
+    val rule = ChargeRule(id = id, label = label, condition = condition, policyId = policy.stableId)
+    return ChargeRuleRow(
+        rule = rule,
+        policy = rule.policy,
+        active = active,
+        unsupportedCondition = false,
+        unsupportedPolicy = false,
+        canMoveUp = canMoveUp,
+        canMoveDown = canMoveDown,
     )
 }
 
@@ -245,48 +296,6 @@ private fun sessionState() = DashboardUiState(
     ),
 )
 
-// Samsung One UI 8 multi-mode: four fixed limits plus pause-at-full, shown as chips.
-private fun samsungState() = DashboardUiState(
-    onboardingComplete = true,
-    batteryReadout = holdingAtLimit(),
-    stats = liveStats(),
-    charging = ChargingState(
-        device = DeviceInfo(
-            "samsung",
-            "SM-X210",
-            36,
-            "preview",
-            oneUiVersion = 80000,
-            protectBatteryProbe = SettingProbe.PRESENT,
-        ),
-        adapterName = "Samsung battery protection".toCaString(),
-        adapterId = "samsung-oneui8-v1",
-        supportedPolicies = listOf(
-            ChargePolicy.FixedLimit(80),
-            ChargePolicy.FixedLimit(85),
-            ChargePolicy.FixedLimit(90),
-            ChargePolicy.FixedLimit(95),
-            ChargePolicy.PauseAtFull,
-            ChargePolicy.Unrestricted,
-        ),
-        reconnectSupported = false,
-        controlEnabled = true,
-        access = AccessSnapshot(
-            direct = BackendStatus(
-                available = true,
-                granted = true,
-                detail = "Charge-control access granted".toCaString(),
-            ),
-            shizuku = BackendStatus(
-                available = false,
-                granted = false,
-                detail = "Shizuku not installed".toCaString(),
-            ),
-        ),
-        observation = ChargeObservation.Verified(ChargePolicy.FixedLimit(80), BackendKind.DIRECT_WSS),
-    ),
-)
-
 // Pixel before access is granted: the dashboard leads with the setup guide.
 private fun setupNeededState() = DashboardUiState(
     // Capture is off here: this shot is about the setup guide, and the charging card showing its
@@ -326,17 +335,17 @@ private fun PreviewDashboardReady() = DashboardReadyContent()
 @Composable
 private fun PreviewDashboardActive() = DashboardActiveContent()
 
-@Preview(name = "3 - Samsung multi-mode", device = DS, showSystemUi = true)
+@Preview(name = "3 - Charge conditions", device = DS, showSystemUi = true)
 @Composable
-private fun PreviewSamsungMultiMode() = SamsungMultiModeContent()
+private fun PreviewChargeConditions() = ChargeConditionsContent()
 
 @Preview(name = "4 - Setup guide", device = DS, showSystemUi = true)
 @Composable
 private fun PreviewSetupGuide() = SetupGuideContent()
 
-@Preview(name = "5 - Settings", device = DS, showSystemUi = true)
+@Preview(name = "5 - Battery hub", device = DS, showSystemUi = true)
 @Composable
-private fun PreviewSettings() = SettingsContent()
+private fun PreviewBatteryHub() = HubTileGridContent()
 
 @Preview(name = "6 - Reconnect gesture", device = DS, showSystemUi = true)
 @Composable

app/src/screenshotTest/kotlin/eu/darken/amply/screenshots/PlayStoreScreenshots.kt

@@ -20,17 +20,19 @@ fun FullChargeActive() = DashboardActiveContent()
 @PreviewTest
 @PlayStoreLocales
 @Composable
-fun SamsungMultiMode() = SamsungMultiModeContent()
+fun ChargeConditions() = ChargeConditionsContent()
 
 @PreviewTest
 @PlayStoreLocales
 @Composable
 fun SetupGuide() = SetupGuideContent()
 
+// Shares HubFixtures' tile-grid content with the engineering hub shots — one fixture, two capture
+// dirs, so the store shot can never drift from the regression one.
 @PreviewTest
 @PlayStoreLocales
 @Composable
-fun Settings() = SettingsContent()
+fun BatteryHub() = HubTileGridContent()
 
 @PreviewTest
 @PlayStoreLocales

fastlane/copy_screenshots.sh

@@ -23,14 +23,14 @@ screen_file() {
     case "$1" in
         DashboardReady) echo "1_dashboard_light" ;;
         FullChargeActive) echo "2_full_charge_dark" ;;
-        SamsungMultiMode) echo "3_samsung_multimode" ;;
+        ChargeConditions) echo "3_charge_conditions" ;;
         SetupGuide) echo "4_setup_guide" ;;
-        Settings) echo "5_settings" ;;
+        BatteryHub) echo "5_battery_hub" ;;
         ReconnectGesture) echo "6_reconnect_gesture" ;;
         *) return 1 ;;
     esac
 }
-EXPECTED_FILES=(1_dashboard_light 2_full_charge_dark 3_samsung_multimode 4_setup_guide 5_settings 6_reconnect_gesture)
+EXPECTED_FILES=(1_dashboard_light 2_full_charge_dark 3_charge_conditions 4_setup_guide 5_battery_hub 6_reconnect_gesture)
 EXPECTED_PER_LOCALE=${#EXPECTED_FILES[@]}
 
 # ImageMagick flattens the alpha channel (Play rejects transparent PNGs) and reports dimensions.