dark mode-v14
This commit is contained in:
parent
29ee1d1e3f
commit
863b098db3
5 changed files with 39 additions and 11 deletions
|
|
@ -68,7 +68,7 @@ fun Tg_Message() {
|
||||||
),
|
),
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.background(
|
.background(
|
||||||
color = Color.White.copy(alpha = 0.2f), // ⭐ 調低透明度
|
color = MaterialTheme.colorScheme.primary, // ⭐ 調低透明度
|
||||||
shape = RoundedCornerShape(0.dp)
|
shape = RoundedCornerShape(0.dp)
|
||||||
)
|
)
|
||||||
.border(
|
.border(
|
||||||
|
|
|
||||||
|
|
@ -102,12 +102,24 @@ fun SharedTransitionScope.setting_list_Screen(
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(6.dp)
|
.padding(6.dp)
|
||||||
) {
|
) {
|
||||||
Box(modifier = Modifier.matchParentSize().blur(10.dp))
|
//glass effect
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.matchParentSize()
|
.matchParentSize()
|
||||||
.background(Color.White.copy(alpha = 0.08f), RoundedCornerShape(16.dp))
|
.blur(10.dp)
|
||||||
.border(1.dp, Color.White.copy(alpha = 0.3f), RoundedCornerShape(16.dp))
|
)
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.matchParentSize()
|
||||||
|
.background(
|
||||||
|
color = MaterialTheme.colorScheme.primary,
|
||||||
|
RoundedCornerShape(16.dp)
|
||||||
|
)
|
||||||
|
.border(
|
||||||
|
1.dp,
|
||||||
|
Color.White.copy(alpha = 0.3f),
|
||||||
|
RoundedCornerShape(16.dp)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
Row(modifier = Modifier
|
Row(modifier = Modifier
|
||||||
|
|
|
||||||
|
|
@ -37,12 +37,23 @@ fun setting_theme_page(
|
||||||
.padding(10.dp)
|
.padding(10.dp)
|
||||||
) {
|
) {
|
||||||
//glass effect
|
//glass effect
|
||||||
Box(modifier = Modifier.matchParentSize().blur(10.dp))
|
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.matchParentSize()
|
.matchParentSize()
|
||||||
.background(Color.White.copy(alpha = 0.08f), RoundedCornerShape(16.dp))
|
.blur(10.dp)
|
||||||
.border(1.dp, Color.White.copy(alpha = 0.3f), RoundedCornerShape(16.dp))
|
)
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.matchParentSize()
|
||||||
|
.background(
|
||||||
|
color = MaterialTheme.colorScheme.primary,
|
||||||
|
RoundedCornerShape(16.dp)
|
||||||
|
)
|
||||||
|
.border(
|
||||||
|
1.dp,
|
||||||
|
Color.White.copy(alpha = 0.3f),
|
||||||
|
RoundedCornerShape(16.dp)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -51,7 +62,7 @@ fun setting_theme_page(
|
||||||
Text(
|
Text(
|
||||||
text = "主題設定",
|
text = "主題設定",
|
||||||
style = MaterialTheme.typography.headlineMedium,
|
style = MaterialTheme.typography.headlineMedium,
|
||||||
color = MaterialTheme.colorScheme.primary
|
color = MaterialTheme.colorScheme.onBackground
|
||||||
)
|
)
|
||||||
|
|
||||||
Spacer(modifier = Modifier.height(8.dp))
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,7 @@ val main_orange = Color(0xFFFF6700)
|
||||||
val light_orange = Color(0xFFFFAD00)
|
val light_orange = Color(0xFFFFAD00)
|
||||||
|
|
||||||
val WhiteGlass = Color(0x14FFFFFF)
|
val WhiteGlass = Color(0x14FFFFFF)
|
||||||
val DarkGlass = Color(0x14FFFFFF)
|
val DarkGlass = Color(0x14000000)
|
||||||
|
|
||||||
|
val WhiteText = Color(0xFFFFFFFF)
|
||||||
|
val DarkText = Color(0xFF000000)
|
||||||
|
|
@ -14,13 +14,15 @@ import androidx.compose.ui.platform.LocalContext
|
||||||
private val DarkColorScheme = darkColorScheme(
|
private val DarkColorScheme = darkColorScheme(
|
||||||
primary = DarkGlass,
|
primary = DarkGlass,
|
||||||
secondary = light_orange,
|
secondary = light_orange,
|
||||||
tertiary = Pink80
|
tertiary = Pink80,
|
||||||
|
onBackground = DarkText
|
||||||
)
|
)
|
||||||
|
|
||||||
private val LightColorScheme = lightColorScheme(
|
private val LightColorScheme = lightColorScheme(
|
||||||
primary = WhiteGlass,
|
primary = WhiteGlass,
|
||||||
secondary = light_orange,
|
secondary = light_orange,
|
||||||
tertiary = Pink40
|
tertiary = Pink40,
|
||||||
|
onBackground = WhiteText
|
||||||
|
|
||||||
/* Other default colors to override
|
/* Other default colors to override
|
||||||
background = Color(0xFFFFFBFE),
|
background = Color(0xFFFFFBFE),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue