Merge pull request #1 from xxnjdlys/agent/wear-usage-icons

fix: correct wear usage states and app icons

Author: xxnjdlys

apps/android-wear/README.md

@@ -1,6 +1,6 @@
 # Codex Usage Wear OS
 
-Wear OS dashboard for local Codex usage. The app reads live JSON from the same-LAN service and falls back to the packaged snapshot if the service is unavailable.
+Wear OS dashboard for local Codex usage. The app reads live JSON from the same-LAN service and shows a neutral no-data state until the first request succeeds.
 
 ## Configure Live Data
 
@@ -79,11 +79,7 @@ CodexUsageHttpReader
 UsageDashboard
 ```
 
-The fallback asset is:
-
-```text
-apps/android-wear/src/main/assets/codex_usage_snapshot.json
-```
+Until the first live request succeeds, the dashboard shows a neutral no-data state. Network failures keep the last successfully fetched live snapshot and never substitute packaged usage values.
 
 ## Troubleshooting
 
@@ -106,5 +102,5 @@ If the service logs `using latest session day`, Codex has not created today's lo
 - Main context number: `lastTokenUsage.totalTokens / contextWindowTokens`.
 - Model metric: `currentModel`, falling back to `limitId`.
 - Plan metric: `planType`.
-- Quota rings: 5h and 7d window usage from `primaryWindow` and `secondaryWindow`.
+- Quota rings: 5h and 7d windows selected by each rate window's `windowMinutes`, regardless of whether the service places it in `primaryWindow` or `secondaryWindow`.
 - Trend bars: hourly token-consumption trend from `trendPercent`.

apps/android-wear/src/main/java/com/yummbj/codex/usage/wear/MainActivity.kt

@@ -7,26 +7,23 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import com.yummbj.codex.usage.wear.data.CodexUsageAssetReader
 import com.yummbj.codex.usage.wear.data.CodexUsageHttpReader
 import com.yummbj.codex.usage.wear.data.CodexUsageServiceConfig
 import com.yummbj.codex.usage.wear.ui.CodexUsageWearApp
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val codexUsageSnapshot = CodexUsageAssetReader.read(this)
         setContent {
             var serviceHost by remember { mutableStateOf(CodexUsageServiceConfig.readHost(this)) }
             CodexUsageWearApp(
-                codexUsageSnapshot = codexUsageSnapshot,
                 serviceHost = serviceHost,
                 onSaveServiceHost = { host ->
                     CodexUsageServiceConfig.saveHost(this, host)
                     serviceHost = CodexUsageServiceConfig.readHost(this)
                 },
                 onRefreshSnapshot = {
-                    CodexUsageHttpReader.read(CodexUsageServiceConfig.usageUrl(serviceHost)) ?: CodexUsageAssetReader.read(this)
+                    CodexUsageHttpReader.read(CodexUsageServiceConfig.usageUrl(serviceHost))
                 },
             )
         }

apps/android-wear/src/main/java/com/yummbj/codex/usage/wear/model/CodexUsageExport.kt

@@ -16,6 +16,7 @@ data class CodexUsageExport(
     fun toUsageSnapshot(nowEpochSeconds: Long): UsageSnapshot {
         val lastActivitySecondsAgo = (nowEpochSeconds - lastActivityEpochSeconds).coerceAtLeast(0L).toInt()
         val primaryPercent = primaryWindow?.usedPercent ?: 0.0
+        val rateWindows = listOfNotNull(primaryWindow, secondaryWindow)
         val status = when {
             primaryPercent >= 100.0 -> UsageStatus.LimitReached
             primaryPercent >= 80.0 -> UsageStatus.NearLimit
@@ -33,8 +34,12 @@ data class CodexUsageExport(
                 usedTokens = lastTokenUsage.totalTokens,
                 limitTokens = contextWindowTokens,
             ),
-            fiveHourWindow = primaryWindow.toQuotaWindow(fallbackLabel = "5h"),
-            sevenDayWindow = secondaryWindow.toQuotaWindow(fallbackLabel = "7d"),
+            fiveHourWindow = rateWindows
+                .firstOrNull { it.windowMinutes == 300 }
+                .toQuotaWindow(fallbackLabel = "5h"),
+            sevenDayWindow = rateWindows
+                .firstOrNull { it.windowMinutes == 10_080 }
+                .toQuotaWindow(fallbackLabel = "7d"),
             tokensToday = tokensToday,
             trend = TrendSeries(values = trendPercent),
         )

apps/android-wear/src/main/java/com/yummbj/codex/usage/wear/ui/CodexUsageWearApp.kt

@@ -28,7 +28,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.wear.compose.material3.MaterialTheme
-import com.yummbj.codex.usage.wear.model.MockUsageSnapshots
 import com.yummbj.codex.usage.wear.model.UsageSnapshot
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -44,12 +43,12 @@ fun CodexUsageWearApp(
     onRefreshSnapshot: suspend () -> UsageSnapshot? = { null },
 ) {
     var snapshot by remember(codexUsageSnapshot) {
-        mutableStateOf(codexUsageSnapshot ?: MockUsageSnapshots.running)
+        mutableStateOf<UsageSnapshot?>(codexUsageSnapshot)
     }
     var isEditingServiceHost by remember { mutableStateOf(false) }
     val scope = rememberCoroutineScope()
 
-    LaunchedEffect(Unit) {
+    LaunchedEffect(serviceHost) {
         while (true) {
             val refreshed = onRefreshSnapshot()
             if (refreshed != null) {

apps/android-wear/src/main/java/com/yummbj/codex/usage/wear/ui/UsageDashboard.kt

@@ -54,7 +54,7 @@ import kotlin.math.roundToInt
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun UsageDashboard(
-    snapshot: UsageSnapshot,
+    snapshot: UsageSnapshot?,
     onRefreshSnapshot: () -> Unit,
     onEditServiceHost: () -> Unit = {},
     modifier: Modifier = Modifier,
@@ -68,13 +68,37 @@ fun UsageDashboard(
                 onLongClick = onEditServiceHost,
             )
             .semantics {
-                contentDescription = "Codex usage ${snapshot.context.displayText}, ${snapshot.statusLabel}"
+                contentDescription = snapshot?.let {
+                    "Codex usage ${it.context.displayText}, ${it.statusLabel}"
+                } ?: "Codex usage unavailable"
             },
         contentAlignment = Alignment.Center,
     ) {
         val scale = min(maxWidth.value / 208f, maxHeight.value / 244f).coerceAtMost(1.18f)
         val horizontalPadding = 8.dp * scale
 
+        if (snapshot == null) {
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                BasicText(
+                    text = "No data",
+                    style = TextStyle(
+                        color = Color.White,
+                        fontSize = (16 * scale).sp,
+                        fontWeight = FontWeight.SemiBold,
+                    ),
+                )
+                Spacer(Modifier.height(4.dp * scale))
+                BasicText(
+                    text = "Tap to retry",
+                    style = TextStyle(
+                        color = WatchColors.secondaryText,
+                        fontSize = (10 * scale).sp,
+                    ),
+                )
+            }
+            return@BoxWithConstraints
+        }
+
         // 主屏从上到下依次显示：上下文用量弧线、三项摘要指标、趋势柱状图、5h/7d 配额环。
         Column(
             modifier = Modifier

apps/android-wear/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+</adaptive-icon>

apps/android-wear/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png

@@ -111,4 +111,39 @@ class UsageSnapshotTest {
         assertEquals("320.4K", snapshot.tokensTodayDisplay)
         assertEquals(0.12f, snapshot.trend.normalizedValues.first())
     }
+
+    @Test
+    fun singleSevenDayPrimaryWindowMapsToSevenDayRing() {
+        val export = CodexUsageExport(
+            generatedAtEpochSeconds = 1_784_801_998,
+            lastActivityEpochSeconds = 1_784_801_995,
+            limitId = "codex",
+            currentModel = "gpt-5.6-sol",
+            planType = "prolite",
+            contextWindowTokens = 258_400,
+            lastTokenUsage = CodexTokenUsage(
+                inputTokens = 44_248,
+                cachedInputTokens = 42_752,
+                outputTokens = 565,
+                reasoningOutputTokens = 208,
+                totalTokens = 44_813,
+            ),
+            tokensToday = 9_904_228,
+            primaryWindow = CodexRateWindow(
+                usedPercent = 22.0,
+                windowMinutes = 10_080,
+                resetsAtEpochSeconds = 1_785_286_832,
+            ),
+            secondaryWindow = null,
+            trendPercent = emptyList(),
+        )
+
+        val snapshot = export.toUsageSnapshot(nowEpochSeconds = 1_784_801_998)
+
+        assertEquals("5h", snapshot.fiveHourWindow.label)
+        assertEquals(0.0, snapshot.fiveHourWindow.percent, 0.0)
+        assertEquals("--", snapshot.fiveHourWindow.resetDisplay)
+        assertEquals("7d", snapshot.sevenDayWindow.label)
+        assertEquals(22.0, snapshot.sevenDayWindow.percent, 0.0)
+    }
 }