From 6bf797e2a9d7495a0746f0cd886cc3fe23f1369b Mon Sep 17 00:00:00 2001 From: flykhan Date: Sun, 26 Apr 2026 23:18:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=85=E8=89=B2=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E9=80=82=E9=85=8D=EF=BC=8C=E7=99=BD=E5=AD=97/=E9=87=91?= =?UTF-8?q?=E5=AD=97=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E4=B8=BA=E6=B7=B1?= =?UTF-8?q?=E8=89=B2=E5=AD=97/=E6=9A=97=E8=93=9D=E5=AD=97=EF=BC=8C?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E5=85=A8=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/unogame/MainActivity.kt | 5 +- .../com/unogame/ui/components/PlayerHand.kt | 3 +- .../com/unogame/ui/screens/GameOverScreen.kt | 22 ++++---- .../java/com/unogame/ui/screens/GameScreen.kt | 12 ++--- .../com/unogame/ui/screens/LobbyMenuScreen.kt | 4 +- .../com/unogame/ui/screens/LobbyScreen.kt | 28 +++++----- .../unogame/ui/screens/LocalSetupScreen.kt | 33 ++++++------ .../com/unogame/ui/screens/MainMenuScreen.kt | 4 +- .../unogame/ui/screens/ModeSelectScreen.kt | 6 +-- .../com/unogame/ui/screens/RulesHelpScreen.kt | 4 +- .../unogame/ui/screens/ScoreboardScreen.kt | 6 +-- .../com/unogame/ui/screens/SettingsScreen.kt | 52 +++++++++---------- .../main/java/com/unogame/ui/theme/TableBg.kt | 16 +++--- .../main/java/com/unogame/ui/theme/Theme.kt | 3 ++ 14 files changed, 103 insertions(+), 95 deletions(-) diff --git a/app/src/main/java/com/unogame/MainActivity.kt b/app/src/main/java/com/unogame/MainActivity.kt index aea39ae..e618e9d 100644 --- a/app/src/main/java/com/unogame/MainActivity.kt +++ b/app/src/main/java/com/unogame/MainActivity.kt @@ -11,6 +11,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme import androidx.compose.runtime.* import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.navigation.NavBackStackEntry import androidx.navigation.NavType @@ -195,7 +196,9 @@ fun UnoApp() { CompositionLocalProvider( LocalCardTheme provides cardTheme, LocalTableBg provides tableBg, - LocalCardScale provides cardScale + LocalCardScale provides cardScale, + LocalTextOnTable provides if (tableBg.isDark) Color.White else Color(0xFF222222), + LocalAccentOnTable provides if (tableBg.isDark) GoldAccent else Color(0xFF1A237E) ) { val enterAnim: (AnimatedContentTransitionScope.() -> EnterTransition) = { fadeIn(animationSpec = tween(300)) + slideInHorizontally(animationSpec = tween(350)) { it / 4 } diff --git a/app/src/main/java/com/unogame/ui/components/PlayerHand.kt b/app/src/main/java/com/unogame/ui/components/PlayerHand.kt index 867a57d..475ad1f 100644 --- a/app/src/main/java/com/unogame/ui/components/PlayerHand.kt +++ b/app/src/main/java/com/unogame/ui/components/PlayerHand.kt @@ -15,6 +15,7 @@ import androidx.compose.ui.unit.sp import com.unogame.model.Card import com.unogame.model.CardColor import com.unogame.ui.theme.LocalCardScale +import com.unogame.ui.theme.LocalTextOnTable @Composable fun PlayerHand( @@ -31,7 +32,7 @@ fun PlayerHand( Column(modifier = modifier) { Text( "你的手牌 (${cards.size})", - color = Color.White.copy(alpha = 0.7f), + color = LocalTextOnTable.current.copy(alpha = 0.7f), fontSize = 14.sp, modifier = Modifier.padding(bottom = 8.dp) ) diff --git a/app/src/main/java/com/unogame/ui/screens/GameOverScreen.kt b/app/src/main/java/com/unogame/ui/screens/GameOverScreen.kt index d6c90f0..f39bc81 100644 --- a/app/src/main/java/com/unogame/ui/screens/GameOverScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/GameOverScreen.kt @@ -55,7 +55,7 @@ fun GameOverScreen( text = if (isYouWinner) "恭喜你赢了！" else "游戏结束", fontSize = 36.sp, fontWeight = FontWeight.Black, - color = GoldAccent, + color = LocalAccentOnTable.current, textAlign = TextAlign.Center ) @@ -64,7 +64,7 @@ fun GameOverScreen( Text( text = if (isYouWinner) "你是UNO冠军！" else "$winnerName 赢得了比赛", fontSize = 18.sp, - color = Color.White.copy(alpha = 0.8f), + color = LocalTextOnTable.current.copy(alpha = 0.8f), textAlign = TextAlign.Center ) @@ -74,7 +74,7 @@ fun GameOverScreen( text = "+$points 分", fontSize = 32.sp, fontWeight = FontWeight.Black, - color = GoldAccent + color = LocalAccentOnTable.current ) Spacer(modifier = Modifier.height(12.dp)) Row( @@ -82,20 +82,20 @@ fun GameOverScreen( horizontalArrangement = Arrangement.SpaceEvenly ) { Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text("难度", color = Color.White.copy(alpha = 0.5f), fontSize = 12.sp) - Text(difficulty, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Bold) + Text("难度", color = LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 12.sp) + Text(difficulty, color = LocalTextOnTable.current, fontSize = 14.sp, fontWeight = FontWeight.Bold) } Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text("时长", color = Color.White.copy(alpha = 0.5f), fontSize = 12.sp) - Text(durationText, color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Bold) + Text("时长", color = LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 12.sp) + Text(durationText, color = LocalTextOnTable.current, fontSize = 14.sp, fontWeight = FontWeight.Bold) } Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text("人数", color = Color.White.copy(alpha = 0.5f), fontSize = 12.sp) - Text("${playerCount}人", color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Bold) + Text("人数", color = LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 12.sp) + Text("${playerCount}人", color = LocalTextOnTable.current, fontSize = 14.sp, fontWeight = FontWeight.Bold) } Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text("轮次", color = Color.White.copy(alpha = 0.5f), fontSize = 12.sp) - Text("$turnNumber 轮", color = Color.White, fontSize = 14.sp, fontWeight = FontWeight.Bold) + Text("轮次", color = LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 12.sp) + Text("$turnNumber 轮", color = LocalTextOnTable.current, fontSize = 14.sp, fontWeight = FontWeight.Bold) } } } diff --git a/app/src/main/java/com/unogame/ui/screens/GameScreen.kt b/app/src/main/java/com/unogame/ui/screens/GameScreen.kt index 7eee230..2c74e0e 100644 --- a/app/src/main/java/com/unogame/ui/screens/GameScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/GameScreen.kt @@ -112,7 +112,7 @@ fun GameScreen( ) { Text( "方向: ${if (gameState.direction == 1) "→ 顺时" else "← 逆时"}", - color = Color.White.copy(alpha = 0.6f), + color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp ) if (flipped) { @@ -125,7 +125,7 @@ fun GameScreen( } Text( "牌堆: ${gameState.drawPileCount}张", - color = Color.White.copy(alpha = 0.6f), + color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp ) } @@ -200,7 +200,7 @@ fun GameScreen( Spacer(modifier = Modifier.height(4.dp)) Text( "摸牌", - color = if (isMyTurn) GoldAccent else Color.Gray, + color = if (isMyTurn) LocalAccentOnTable.current else LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 12.sp ) } @@ -208,7 +208,7 @@ fun GameScreen( Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( text = "当前弃牌堆", - color = Color.White.copy(alpha = 0.5f), + color = LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 12.sp ) Spacer(modifier = Modifier.height(4.dp)) @@ -242,7 +242,7 @@ fun GameScreen( Text( if (isMyTurn) "⚠ 你必须摸 ${gameState.pendingDrawCount} 张牌" else "下家需摸 ${gameState.pendingDrawCount} 张牌", - color = if (isMyTurn) UnoRed else Color.White.copy(alpha = 0.6f), + color = if (isMyTurn) UnoRed else LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center, @@ -253,7 +253,7 @@ fun GameScreen( // Current turn indicator Text( text = if (isMyTurn) "轮到你了！" else "等待: ${currentPlayer.name}", - color = if (isMyTurn) GoldAccent else Color.White.copy(alpha = 0.6f), + color = if (isMyTurn) LocalAccentOnTable.current else LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 18.sp, fontWeight = FontWeight.Bold, textAlign = TextAlign.Center, diff --git a/app/src/main/java/com/unogame/ui/screens/LobbyMenuScreen.kt b/app/src/main/java/com/unogame/ui/screens/LobbyMenuScreen.kt index c4eb857..1bfeba8 100644 --- a/app/src/main/java/com/unogame/ui/screens/LobbyMenuScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/LobbyMenuScreen.kt @@ -33,9 +33,9 @@ fun LobbyMenuScreen( verticalAlignment = Alignment.CenterVertically ) { IconButton(onClick = onBack) { - Icon(Icons.Default.ArrowBack, "返回", tint = Color.White) + Icon(Icons.Default.ArrowBack, "返回", tint = LocalTextOnTable.current) } - Text("联机模式", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.White) + Text("联机模式", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = LocalTextOnTable.current) } Spacer(modifier = Modifier.height(40.dp)) diff --git a/app/src/main/java/com/unogame/ui/screens/LobbyScreen.kt b/app/src/main/java/com/unogame/ui/screens/LobbyScreen.kt index 006a35f..e4813b5 100644 --- a/app/src/main/java/com/unogame/ui/screens/LobbyScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/LobbyScreen.kt @@ -58,17 +58,17 @@ fun LobbyScreen( horizontalArrangement = Arrangement.SpaceBetween ) { IconButton(onClick = onBack) { - Icon(Icons.Default.ArrowBack, "返回", tint = Color.White) + Icon(Icons.Default.ArrowBack, "返回", tint = LocalTextOnTable.current) } Text( text = if (isHost) "房间大厅" else "加入游戏", fontSize = 24.sp, fontWeight = FontWeight.Bold, - color = Color.White + color = LocalTextOnTable.current ) Text( text = if (isHost) "房主" else "玩家", - color = GoldAccent + color = LocalAccentOnTable.current ) } @@ -94,14 +94,14 @@ fun LobbyScreen( // Host lobby Text( text = "等待玩家加入... (${players.size}/10)", - color = Color.White.copy(alpha = 0.7f), + color = LocalTextOnTable.current.copy(alpha = 0.7f), fontSize = 16.sp ) if (hostIp.isNotEmpty()) { Spacer(modifier = Modifier.height(4.dp)) Text( text = "你的IP: $hostIp（告诉朋友用此IP连接）", - color = GoldAccent.copy(alpha = 0.8f), + color = LocalAccentOnTable.current.copy(alpha = 0.8f), fontSize = 13.sp ) } @@ -110,7 +110,7 @@ fun LobbyScreen( if (players.isNotEmpty()) { Text( "玩家列表", - color = Color.White.copy(alpha = 0.6f), + color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp ) Spacer(modifier = Modifier.height(8.dp)) @@ -134,7 +134,7 @@ fun LobbyScreen( ) { Text( "附近房间", - color = Color.White, + color = LocalTextOnTable.current, fontSize = 16.sp, fontWeight = FontWeight.Bold ) @@ -157,7 +157,7 @@ fun LobbyScreen( if (discoveredHosts.isEmpty() && !isDiscovering) { Text( "没有发现房间，请确保在同一WiFi下，并点刷新", - color = Color.White.copy(alpha = 0.5f), + color = LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 14.sp ) } else { @@ -212,7 +212,7 @@ fun LobbyScreen( var manualIp by remember { mutableStateOf("") } Text( "手动连接（输入房主IP）", - color = Color.White.copy(alpha = 0.6f), + color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 13.sp ) Spacer(modifier = Modifier.height(8.dp)) @@ -256,14 +256,14 @@ fun LobbyScreen( // Connected to host, waiting for game start Text( "已连接到主机", - color = GoldAccent, + color = LocalAccentOnTable.current, fontSize = 16.sp, fontWeight = FontWeight.Bold ) Spacer(modifier = Modifier.height(8.dp)) Text( "等待房主开始游戏...", - color = Color.White.copy(alpha = 0.7f), + color = LocalTextOnTable.current.copy(alpha = 0.7f), fontSize = 14.sp ) @@ -271,8 +271,8 @@ fun LobbyScreen( if (players.isNotEmpty()) { Text( - "玩家列表", - color = Color.White.copy(alpha = 0.6f), + "玩家列表", + color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp ) Spacer(modifier = Modifier.height(8.dp)) @@ -298,7 +298,7 @@ fun LobbyScreen( ) { CircularProgressIndicator(color = GoldAccent) Spacer(modifier = Modifier.height(8.dp)) - Text("正在连接...", color = Color.White.copy(alpha = 0.7f), fontSize = 14.sp) + Text("正在连接...", color = LocalTextOnTable.current.copy(alpha = 0.7f), fontSize = 14.sp) } } diff --git a/app/src/main/java/com/unogame/ui/screens/LocalSetupScreen.kt b/app/src/main/java/com/unogame/ui/screens/LocalSetupScreen.kt index a6365d8..1347fff 100644 --- a/app/src/main/java/com/unogame/ui/screens/LocalSetupScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/LocalSetupScreen.kt @@ -68,20 +68,20 @@ fun LocalSetupScreen( verticalAlignment = Alignment.CenterVertically ) { IconButton(onClick = onBack) { - Icon(Icons.Default.ArrowBack, "返回", tint = Color.White) + Icon(Icons.Default.ArrowBack, "返回", tint = LocalTextOnTable.current) } Text( "本地模式 - $modeDisplayName", fontSize = 24.sp, fontWeight = FontWeight.Bold, - color = Color.White + color = LocalTextOnTable.current ) } Spacer(modifier = Modifier.height(32.dp)) // Player name - Text("你的名字", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("你的名字", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(8.dp)) OutlinedTextField( value = name, @@ -89,11 +89,11 @@ fun LocalSetupScreen( singleLine = true, modifier = Modifier.fillMaxWidth(), colors = OutlinedTextFieldDefaults.colors( - focusedTextColor = Color.White, - unfocusedTextColor = Color.White, - focusedBorderColor = GoldAccent, + focusedTextColor = LocalTextOnTable.current, + unfocusedTextColor = LocalTextOnTable.current, + focusedBorderColor = LocalAccentOnTable.current, unfocusedBorderColor = Color.Gray, - cursorColor = GoldAccent + cursorColor = LocalAccentOnTable.current ) ) Spacer(modifier = Modifier.height(8.dp)) @@ -106,7 +106,7 @@ fun LocalSetupScreen( value = "", onValueChange = {}, readOnly = true, - placeholder = { Text("或选择预设名字", color = Color.White.copy(alpha = 0.4f)) }, + placeholder = { Text("或选择预设名字", color = LocalTextOnTable.current.copy(alpha = 0.4f)) }, trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = nameDropdownExpanded) }, modifier = Modifier.fillMaxWidth().menuAnchor(), colors = OutlinedTextFieldDefaults.colors( @@ -136,7 +136,7 @@ fun LocalSetupScreen( Spacer(modifier = Modifier.height(28.dp)) // Player count selector - Text("总玩家数", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("总玩家数", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(12.dp)) Row( modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()), @@ -171,7 +171,7 @@ fun LocalSetupScreen( Spacer(modifier = Modifier.height(28.dp)) // AI difficulty - Text("AI难度", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("AI难度", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(8.dp)) Row( modifier = Modifier.fillMaxWidth(), @@ -189,7 +189,8 @@ fun LocalSetupScreen( com.unogame.game.AIDifficulty.NORMAL -> GoldAccent com.unogame.game.AIDifficulty.HARD -> UnoRed }, - selectedLabelColor = Color.Black + selectedLabelColor = Color.Black, + labelColor = LocalTextOnTable.current ) ) } @@ -198,7 +199,7 @@ fun LocalSetupScreen( Spacer(modifier = Modifier.height(28.dp)) // Hand size limit - Text("手牌上限", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("手牌上限", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(8.dp)) Row( modifier = Modifier.fillMaxWidth(), @@ -218,7 +219,7 @@ fun LocalSetupScreen( ) Text( text = if (maxHandSize == 0) "无限制" else "${maxHandSize}张", - color = GoldAccent, + color = LocalAccentOnTable.current, fontSize = 16.sp, fontWeight = FontWeight.Bold, modifier = Modifier.width(56.dp) @@ -226,14 +227,14 @@ fun LocalSetupScreen( } Text( "0 = 无限制，默认各模式不限制，无情模式默认10张上限", - color = Color.White.copy(alpha = 0.35f), + color = LocalTextOnTable.current.copy(alpha = 0.35f), fontSize = 11.sp ) Spacer(modifier = Modifier.height(28.dp)) // Player list preview - Text("参与者预览", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("参与者预览", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(12.dp)) // You @@ -336,7 +337,7 @@ fun LocalSetupScreen( ) { Text( "• 1位真人 + ${totalPlayers - 1}个机器人\n• 支持2-8人局\n• 机器人会自动出牌，无需等待", - color = Color.White.copy(alpha = 0.5f), + color = LocalTextOnTable.current.copy(alpha = 0.5f), fontSize = 12.sp, lineHeight = 20.sp, modifier = Modifier.padding(16.dp) diff --git a/app/src/main/java/com/unogame/ui/screens/MainMenuScreen.kt b/app/src/main/java/com/unogame/ui/screens/MainMenuScreen.kt index 2becf7b..0b4c8d2 100644 --- a/app/src/main/java/com/unogame/ui/screens/MainMenuScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/MainMenuScreen.kt @@ -44,13 +44,13 @@ fun MainMenuScreen( text = "UNO", fontSize = 72.sp, fontWeight = FontWeight.Black, - color = GoldAccent, + color = LocalAccentOnTable.current, textAlign = TextAlign.Center ) Text( text = "卡牌游戏", fontSize = 18.sp, - color = Color.White.copy(alpha = 0.6f), + color = LocalTextOnTable.current.copy(alpha = 0.6f), textAlign = TextAlign.Center ) diff --git a/app/src/main/java/com/unogame/ui/screens/ModeSelectScreen.kt b/app/src/main/java/com/unogame/ui/screens/ModeSelectScreen.kt index bd45254..461b2bf 100644 --- a/app/src/main/java/com/unogame/ui/screens/ModeSelectScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/ModeSelectScreen.kt @@ -36,13 +36,13 @@ fun ModeSelectScreen( verticalAlignment = Alignment.CenterVertically ) { IconButton(onClick = onBack) { - Icon(Icons.Default.ArrowBack, "返回", tint = Color.White) + Icon(Icons.Default.ArrowBack, "返回", tint = LocalTextOnTable.current) } - Text("选择模式", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.White) + Text("选择模式", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = LocalTextOnTable.current) } Spacer(modifier = Modifier.height(8.dp)) - Text("玩家: $playerName", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("玩家: $playerName", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(24.dp)) diff --git a/app/src/main/java/com/unogame/ui/screens/RulesHelpScreen.kt b/app/src/main/java/com/unogame/ui/screens/RulesHelpScreen.kt index a694d10..f40aaa5 100644 --- a/app/src/main/java/com/unogame/ui/screens/RulesHelpScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/RulesHelpScreen.kt @@ -34,9 +34,9 @@ fun RulesHelpScreen(onBack: () -> Unit) { verticalAlignment = Alignment.CenterVertically ) { IconButton(onClick = onBack) { - Icon(Icons.Default.ArrowBack, "返回", tint = Color.White) + Icon(Icons.Default.ArrowBack, "返回", tint = LocalTextOnTable.current) } - Text("详细规则", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.White) + Text("详细规则", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = LocalTextOnTable.current) } SpacerH(20) diff --git a/app/src/main/java/com/unogame/ui/screens/ScoreboardScreen.kt b/app/src/main/java/com/unogame/ui/screens/ScoreboardScreen.kt index 046df9e..475b5ec 100644 --- a/app/src/main/java/com/unogame/ui/screens/ScoreboardScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/ScoreboardScreen.kt @@ -102,12 +102,12 @@ fun ScoreboardScreen(onBack: () -> Unit) { verticalAlignment = Alignment.CenterVertically ) { IconButton(onClick = onBack) { - Icon(Icons.Default.ArrowBack, "返回", tint = Color.White) + Icon(Icons.Default.ArrowBack, "返回", tint = LocalTextOnTable.current) } - Text("积分排行榜", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.White, modifier = Modifier.weight(1f)) + Text("积分排行榜", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = LocalTextOnTable.current, modifier = Modifier.weight(1f)) Box { IconButton(onClick = { showMenu = true }) { - Icon(Icons.Default.MoreVert, "菜单", tint = Color.White) + Icon(Icons.Default.MoreVert, "菜单", tint = LocalTextOnTable.current) } DropdownMenu( expanded = showMenu, diff --git a/app/src/main/java/com/unogame/ui/screens/SettingsScreen.kt b/app/src/main/java/com/unogame/ui/screens/SettingsScreen.kt index b5c1957..9edd2ad 100644 --- a/app/src/main/java/com/unogame/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/com/unogame/ui/screens/SettingsScreen.kt @@ -66,15 +66,15 @@ fun SettingsScreen( verticalAlignment = Alignment.CenterVertically ) { IconButton(onClick = onBack) { - Icon(Icons.Default.ArrowBack, "返回", tint = Color.White) + Icon(Icons.Default.ArrowBack, "返回", tint = LocalTextOnTable.current) } - Text("游戏设置", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = Color.White) + Text("游戏设置", fontSize = 24.sp, fontWeight = FontWeight.Bold, color = LocalTextOnTable.current) } Spacer(modifier = Modifier.height(32.dp)) // Nickname - Text("你的昵称", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("你的昵称", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(8.dp)) OutlinedTextField( value = playerName, @@ -85,11 +85,11 @@ fun SettingsScreen( singleLine = true, modifier = Modifier.fillMaxWidth(), colors = OutlinedTextFieldDefaults.colors( - focusedTextColor = Color.White, - unfocusedTextColor = Color.White, - focusedBorderColor = GoldAccent, + focusedTextColor = LocalTextOnTable.current, + unfocusedTextColor = LocalTextOnTable.current, + focusedBorderColor = LocalAccentOnTable.current, unfocusedBorderColor = Color.Gray, - cursorColor = GoldAccent + cursorColor = LocalAccentOnTable.current ) ) Spacer(modifier = Modifier.height(8.dp)) @@ -102,15 +102,15 @@ fun SettingsScreen( value = "", onValueChange = {}, readOnly = true, - placeholder = { Text("或选择预设名字", color = Color.White.copy(alpha = 0.4f)) }, + placeholder = { Text("或选择预设名字", color = LocalTextOnTable.current.copy(alpha = 0.4f)) }, trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = nameDropdownExpanded) }, modifier = Modifier.fillMaxWidth().menuAnchor(), colors = OutlinedTextFieldDefaults.colors( - focusedTextColor = Color.White, - unfocusedTextColor = Color.White, - focusedBorderColor = GoldAccent, + focusedTextColor = LocalTextOnTable.current, + unfocusedTextColor = LocalTextOnTable.current, + focusedBorderColor = LocalAccentOnTable.current, unfocusedBorderColor = Color.Gray, - cursorColor = GoldAccent + cursorColor = LocalAccentOnTable.current ) ) ExposedDropdownMenu( @@ -133,7 +133,7 @@ fun SettingsScreen( Spacer(modifier = Modifier.height(28.dp)) // Appearance - Text("外观设置", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("外观设置", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(12.dp)) // Card theme dropdown @@ -149,13 +149,13 @@ fun SettingsScreen( trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = themeExpanded) }, modifier = Modifier.fillMaxWidth().menuAnchor(), colors = OutlinedTextFieldDefaults.colors( - focusedTextColor = Color.White, - unfocusedTextColor = Color.White, - focusedLabelColor = GoldAccent, - unfocusedLabelColor = Color.White.copy(alpha = 0.6f), - focusedBorderColor = GoldAccent, + focusedTextColor = LocalTextOnTable.current, + unfocusedTextColor = LocalTextOnTable.current, + focusedLabelColor = LocalAccentOnTable.current, + unfocusedLabelColor = LocalTextOnTable.current.copy(alpha = 0.6f), + focusedBorderColor = LocalAccentOnTable.current, unfocusedBorderColor = Color.Gray, - cursorColor = GoldAccent + cursorColor = LocalAccentOnTable.current ) ) ExposedDropdownMenu( @@ -195,13 +195,13 @@ fun SettingsScreen( trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = bgExpanded) }, modifier = Modifier.fillMaxWidth().menuAnchor(), colors = OutlinedTextFieldDefaults.colors( - focusedTextColor = Color.White, - unfocusedTextColor = Color.White, - focusedLabelColor = GoldAccent, - unfocusedLabelColor = Color.White.copy(alpha = 0.6f), - focusedBorderColor = GoldAccent, + focusedTextColor = LocalTextOnTable.current, + unfocusedTextColor = LocalTextOnTable.current, + focusedLabelColor = LocalAccentOnTable.current, + unfocusedLabelColor = LocalTextOnTable.current.copy(alpha = 0.6f), + focusedBorderColor = LocalAccentOnTable.current, unfocusedBorderColor = Color.Gray, - cursorColor = GoldAccent + cursorColor = LocalAccentOnTable.current ) ) ExposedDropdownMenu( @@ -273,7 +273,7 @@ fun SettingsScreen( Spacer(modifier = Modifier.height(28.dp)) // About - Text("其他", color = Color.White.copy(alpha = 0.6f), fontSize = 14.sp) + Text("其他", color = LocalTextOnTable.current.copy(alpha = 0.6f), fontSize = 14.sp) Spacer(modifier = Modifier.height(12.dp)) SettingsRow( icon = Icons.Default.Info, diff --git a/app/src/main/java/com/unogame/ui/theme/TableBg.kt b/app/src/main/java/com/unogame/ui/theme/TableBg.kt index 7507741..020b3c9 100644 --- a/app/src/main/java/com/unogame/ui/theme/TableBg.kt +++ b/app/src/main/java/com/unogame/ui/theme/TableBg.kt @@ -3,14 +3,14 @@ package com.unogame.ui.theme import android.content.Context import androidx.compose.ui.graphics.Color -enum class TableBg(val displayName: String, val color: Color) { - DARK("暗黑", Color(0xFF121212)), - GREEN("墨绿", Color(0xFF1A3C2A)), - BLUE("深蓝", Color(0xFF0D1B2A)), - PURPLE("暗紫", Color(0xFF1A1035)), - RED("酒红", Color(0xFF2D1111)), - TEAL("深青", Color(0xFF0D2B2A)), - CHARCOAL("炭灰", Color(0xFF1E1E1E)); +enum class TableBg(val displayName: String, val color: Color, val isDark: Boolean = true) { + DARK("暗黑", Color(0xFF121212), true), + GREEN("墨绿", Color(0xFF1A3C2A), true), + BLUE("深蓝", Color(0xFF0D1B2A), true), + WARM("暖米", Color(0xFFF5F0E8), false), + SKY("晴空", Color(0xFFE3F0F5), false), + MINT("薄荷", Color(0xFFE8F5EC), false), + ROSE("浅玫", Color(0xFFF5ECF0), false); companion object { private const val KEY = "table_bg" diff --git a/app/src/main/java/com/unogame/ui/theme/Theme.kt b/app/src/main/java/com/unogame/ui/theme/Theme.kt index 7c97359..d1818b7 100644 --- a/app/src/main/java/com/unogame/ui/theme/Theme.kt +++ b/app/src/main/java/com/unogame/ui/theme/Theme.kt @@ -2,10 +2,13 @@ package com.unogame.ui.theme import android.content.Context import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.graphics.Color val LocalCardTheme = compositionLocalOf { CardTheme.ELEGANT } val LocalTableBg = compositionLocalOf { TableBg.GREEN } val LocalCardScale = compositionLocalOf { 1.0f } +val LocalTextOnTable = compositionLocalOf { Color.White } +val LocalAccentOnTable = compositionLocalOf { GoldAccent } // 手牌缩放：0.5 ~ 1.3，默认 1.0（原始大小） fun loadCardScale(context: Context): Float {