Fix schedule widget theme sync

Author: alvin000009238

AGENTS.md

@@ -84,7 +84,7 @@
 - 從 Widget 或 `scoreapp://schedule` deep link 進入 app 時，不得繞過生物識別鎖；若存在 biometric session，`MainActivity` 必須先顯示 `BiometricLockScreen`。課表頁網路 repository 要優先使用已解鎖的 in-memory active session；存在 biometric session 時不得 fallback 到一般 `SessionStore`，避免繞過鎖或誤顯示未登入。
 - Widget 本體不得讀取一般 session、biometric session、cookie 或 token；只能讀 `GradeCacheStore` 的 widget 專用課表快照。課表查詢成功或從舊的學生課表快取載入成功時，要同步寫入 widget 快照；登出、學生快取清除或生物識別資料失效時要清掉該快照並刷新 widget。
 - `ArchitectureBoundaryTest` 會防止 Widget 重新依賴登入狀態，並檢查 PIN 解鎖必須先 activate in-memory session 再解除鎖定；修改 widget、課表或生物識別流程時要保留這些邊界。
-- Widget 的設定由 Android 原生的 Widget 配置活動（Configuration Activity）即 `WidgetConfigurationActivity` 進行。它支援在新增 Widget 時跳出設定，且在 `schedule_widget_info.xml` 宣告為 `widgetFeatures="reconfigurable"`，使得使用者長按 Widget 時可以重新設定。設定項目會透過 `GradeCacheStore` 持久化，並呼叫 `ScheduleWidget().updateAll(...)` 即時更新。
+- Widget 的設定由 Android 原生的 Widget 配置活動（Configuration Activity）即 `WidgetConfigurationActivity` 進行。它支援在新增 Widget 時跳出設定，且在 `schedule_widget_info.xml` 宣告為 `widgetFeatures="reconfigurable"`，使得使用者長按 Widget 時可以重新設定。設定項目會透過 `GradeCacheStore` 持久化，並透過 `syncAllScheduleWidgets(...)` / `syncScheduleWidget(...)` 同步課表資料、顯示偏好與 theme state 到 Glance state 後即時更新。
 
 ## Android 成績匯出
 

android/app/src/main/java/com/clhs/score/MainActivity.kt

@@ -160,7 +160,7 @@ class MainActivity : androidx.fragment.app.FragmentActivity() {
                 }
 
                 LaunchedEffect(appSettings.themeMode, appSettings.dynamicColor, appSettings.amoledBlack) {
-                    com.clhs.score.widget.syncAllScheduleWidgets(applicationContext)
+                    com.clhs.score.widget.syncAllScheduleWidgets(applicationContext, appSettings)
                 }
 
                 val useFakeData = BuildConfig.USE_FAKE_DATA || appSettings.demoMode

android/app/src/main/java/com/clhs/score/widget/ScheduleWidget.kt

@@ -62,6 +62,9 @@ val WidgetShowTeacherKey = booleanPreferencesKey("widget_show_teacher")
 val WidgetShowClassroomKey = booleanPreferencesKey("widget_show_classroom")
 val WidgetShowTimeKey = booleanPreferencesKey("widget_show_time")
 val WidgetScheduleReportKey = stringPreferencesKey("widget_schedule_report")
+val WidgetThemeModeKey = stringPreferencesKey("widget_theme_mode")
+val WidgetDynamicColorKey = booleanPreferencesKey("widget_dynamic_color")
+val WidgetAmoledBlackKey = booleanPreferencesKey("widget_amoled_black")
 private val WidgetJson = Json { ignoreUnknownKeys = true }
 
 fun getWidgetColorProviders(context: Context, settings: AppSettings) = run {
@@ -105,32 +108,32 @@ class ScheduleWidget : GlanceAppWidget() {
         val prefs = cacheStore.getWidgetPreferences()
         val report = cacheStore.loadWidgetScheduleReport()
         val reportStr = report?.let { WidgetJson.encodeToString(it) }
+        val appSettings = settingsRepository.settings.first()
 
         updateAppWidgetState(context, id) { state ->
-            state.syncScheduleWidgetState(prefs, reportStr)
+            state.syncScheduleWidgetState(prefs, reportStr, appSettings)
         }
 
-        val appSettings = settingsRepository.settings.first()
-
         provideContent {
-            val colors = getWidgetColorProviders(context, appSettings)
+            val colors = getWidgetColorProviders(context, currentWidgetSettings(appSettings))
             GlanceTheme(colors = colors) {
                 ScheduleWidgetContent()
             }
         }
     }
 }
 
-suspend fun syncAllScheduleWidgets(context: Context) {
+suspend fun syncAllScheduleWidgets(context: Context, settings: AppSettings? = null) {
     val cacheStore = GradeCacheStore(context)
     val prefs = cacheStore.getWidgetPreferences()
     val report = cacheStore.loadWidgetScheduleReport()
     val reportStr = report?.let { WidgetJson.encodeToString(it) }
+    val appSettings = settings ?: SettingsRepository(context).settings.first()
 
     val glanceIds = GlanceAppWidgetManager(context).getGlanceIds(ScheduleWidget::class.java)
     glanceIds.forEach { glanceId ->
         updateAppWidgetState(context, glanceId) { state ->
-            state.syncScheduleWidgetState(prefs, reportStr)
+            state.syncScheduleWidgetState(prefs, reportStr, appSettings)
         }
         ScheduleWidget().update(context, glanceId)
     }
@@ -141,28 +144,45 @@ suspend fun syncScheduleWidget(context: Context, appWidgetId: Int) {
     val prefs = cacheStore.getWidgetPreferences()
     val report = cacheStore.loadWidgetScheduleReport()
     val reportStr = report?.let { WidgetJson.encodeToString(it) }
+    val appSettings = SettingsRepository(context).settings.first()
     val glanceId = GlanceAppWidgetManager(context).getGlanceIdBy(appWidgetId)
 
     updateAppWidgetState(context, glanceId) { state ->
-        state.syncScheduleWidgetState(prefs, reportStr)
+        state.syncScheduleWidgetState(prefs, reportStr, appSettings)
     }
     ScheduleWidget().update(context, glanceId)
 }
 
 private fun MutablePreferences.syncScheduleWidgetState(
     prefs: Triple<Boolean, Boolean, Boolean>,
-    reportStr: String?
+    reportStr: String?,
+    settings: AppSettings,
 ) {
     this[WidgetShowTeacherKey] = prefs.first
     this[WidgetShowClassroomKey] = prefs.second
     this[WidgetShowTimeKey] = prefs.third
+    this[WidgetThemeModeKey] = settings.themeMode.name
+    this[WidgetDynamicColorKey] = settings.dynamicColor
+    this[WidgetAmoledBlackKey] = settings.amoledBlack
     if (reportStr != null) {
         this[WidgetScheduleReportKey] = reportStr
     } else {
         remove(WidgetScheduleReportKey)
     }
 }
 
+@Composable
+private fun currentWidgetSettings(fallback: AppSettings): AppSettings {
+    val themeMode = currentState(key = WidgetThemeModeKey)
+        ?.let { runCatching { ThemeMode.valueOf(it) }.getOrNull() }
+        ?: fallback.themeMode
+    return fallback.copy(
+        themeMode = themeMode,
+        dynamicColor = currentState(key = WidgetDynamicColorKey) ?: fallback.dynamicColor,
+        amoledBlack = currentState(key = WidgetAmoledBlackKey) ?: fallback.amoledBlack,
+    )
+}
+
 @Composable
 fun ScheduleWidgetContent() {
     val showTeacher = currentState(key = WidgetShowTeacherKey) ?: true

android/app/src/test/java/com/clhs/score/ArchitectureBoundaryTest.kt

@@ -191,7 +191,7 @@ class ArchitectureBoundaryTest {
         val source = readSource("app/src/main/java/com/clhs/score/MainActivity.kt")
 
         assertTrue(source.contains("LaunchedEffect(appSettings.themeMode, appSettings.dynamicColor, appSettings.amoledBlack)"))
-        assertTrue(source.contains("com.clhs.score.widget.syncAllScheduleWidgets(applicationContext)"))
+        assertTrue(source.contains("com.clhs.score.widget.syncAllScheduleWidgets(applicationContext, appSettings)"))
     }
 
     @Test
@@ -233,6 +233,10 @@ class ArchitectureBoundaryTest {
         assertTrue("Widget must read preferences via GradeCacheStore initially", source.contains("cacheStore.getWidgetPreferences()"))
         assertTrue("Widget must sync data to Glance State to support reactive updates", source.contains("updateAppWidgetState"))
         assertTrue("Widget content must read preferences using currentState", source.contains("currentState(key ="))
+        assertTrue("Widget theme mode must be part of Glance state", source.contains("WidgetThemeModeKey"))
+        assertTrue("Widget dynamic color setting must be part of Glance state", source.contains("WidgetDynamicColorKey"))
+        assertTrue("Widget AMOLED setting must be part of Glance state", source.contains("WidgetAmoledBlackKey"))
+        assertTrue("Widget colors must use the current Glance theme settings", source.contains("getWidgetColorProviders(context, currentWidgetSettings(appSettings))"))
     }
 
     @Test