chore: refresh v1.2.1

Author: alvin000009238

CHANGELOG.md

@@ -1,10 +1,14 @@
 # Changelog
 
-## [1.2.1] - 2026-06-20
+## [1.2.1] - 2026-06-21
+
+### Features
+- 更新成績頁下拉重新整理的載入樣式，讓重新整理狀態更符合新版介面風格。
 
 ### Bug Fixes
 - 改善 WebView 登入流程的除錯資訊，當登入頁面資料解析失敗時更容易定位問題。
 - 修正測試資料檢查，讓假資料驗證與最新資料格式一致。
+- 修正深色模式切換成績模擬器、我的課表與設定頁時，畫面短暫閃白的問題。
 
 ### Performance Improvements
 - 優化成績趨勢折線圖的點擊與繪製處理，減少互動時不必要的重複計算。

android/app/build.gradle.kts

@@ -114,7 +114,7 @@ dependencies {
     implementation("androidx.compose.foundation:foundation")
 
     implementation("androidx.compose.material:material-icons-core")
-    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material3:material3:1.5.0-alpha08")
     implementation("androidx.compose.runtime:runtime")
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")

android/app/src/main/java/com/clhs/score/ui/GradesScreen.kt

@@ -34,6 +34,7 @@ import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
@@ -49,6 +50,8 @@ import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -104,7 +107,7 @@ private enum class GradesDestination(
     Advanced("更多", "more_horiz"),
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun GradesScreen(
     state: GradesUiState,
@@ -281,13 +284,22 @@ fun GradesScreen(
         containerColor = MaterialTheme.colorScheme.surface,
     ) { padding ->
         val isRefreshing = state.isLoadingStructure || state.isLoadingGrades
+        val pullToRefreshState = rememberPullToRefreshState()
 
         PullToRefreshBox(
             isRefreshing = isRefreshing,
             onRefresh = onReload,
+            state = pullToRefreshState,
             modifier = Modifier
                 .fillMaxSize()
                 .padding(padding),
+            indicator = {
+                PullToRefreshDefaults.LoadingIndicator(
+                    state = pullToRefreshState,
+                    isRefreshing = isRefreshing,
+                    modifier = Modifier.align(Alignment.TopCenter),
+                )
+            },
         ) {
             Column(modifier = Modifier.fillMaxSize()) {
                 if (state.isLoadingStructure || state.isLoadingGrades || state.isLoadingComparison || state.isLoadingTrend) {

android/app/src/main/java/com/clhs/score/ui/theme/ScoreTheme.kt

@@ -1,14 +1,19 @@
 package com.clhs.score.ui.theme
 
+import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import com.clhs.score.data.ThemeMode
@@ -155,6 +160,7 @@ fun ScoreTheme(
     if (!view.isInEditMode) {
         androidx.compose.runtime.SideEffect {
             val window = (view.context as android.app.Activity).window
+            window.setBackgroundDrawable(ColorDrawable(colorScheme.background.toArgb()))
             androidx.core.view.WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !useDark
             androidx.core.view.WindowCompat.getInsetsController(window, view).isAppearanceLightNavigationBars = !useDark
         }
@@ -168,7 +174,12 @@ fun ScoreTheme(
         MaterialTheme(
             colorScheme = colorScheme,
             shapes = ScoreShapes,
-            content = content,
-        )
+        ) {
+            Surface(
+                modifier = Modifier.fillMaxSize(),
+                color = colorScheme.background,
+                content = content,
+            )
+        }
     }
 }