add delta sync for dm-v14
This commit is contained in:
parent
32da5f3fb2
commit
dc6186233c
5 changed files with 21 additions and 53 deletions
|
|
@ -255,12 +255,7 @@ fun MessageMessaging(
|
|||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(
|
||||
brush = Brush.verticalGradient(
|
||||
colors = listOf
|
||||
(Color(0xFFDA7029),
|
||||
Color(0xFF777777),
|
||||
Color(0xFFB34800))
|
||||
)
|
||||
color = MaterialTheme.colorScheme.background
|
||||
),
|
||||
containerColor = Color.Transparent,
|
||||
topBar = {
|
||||
|
|
@ -292,11 +287,6 @@ fun MessageMessaging(
|
|||
color = MaterialTheme.colorScheme.primary,
|
||||
shape = topBarShape
|
||||
)
|
||||
.border(
|
||||
width = 0.5.dp,
|
||||
color = Color.White.copy(alpha = 0.4f),
|
||||
shape = topBarShape
|
||||
)
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
|
|
@ -351,11 +341,6 @@ fun MessageMessaging(
|
|||
color = MaterialTheme.colorScheme.primary,
|
||||
shape = topBarShape
|
||||
)
|
||||
.border(
|
||||
width = 0.5.dp,
|
||||
color = Color.White.copy(alpha = 0.4f),
|
||||
shape = topBarShape
|
||||
)
|
||||
) {
|
||||
IconButton(
|
||||
onClick = {
|
||||
|
|
@ -385,11 +370,6 @@ fun MessageMessaging(
|
|||
color = MaterialTheme.colorScheme.primary,
|
||||
shape = topBarShape
|
||||
)
|
||||
.border(
|
||||
width = 0.5.dp,
|
||||
color = Color.White.copy(alpha = 0.4f),
|
||||
shape = topBarShape
|
||||
)
|
||||
) {
|
||||
IconButton(
|
||||
onClick = {
|
||||
|
|
|
|||
|
|
@ -228,28 +228,14 @@ fun RoomItem(
|
|||
rememberSharedContentState(key = "container_${room.roomId}"),
|
||||
animatedVisibilityScope = animatedVisibilityScope
|
||||
)
|
||||
// 2. 再綁定點擊事件
|
||||
.clickable { onClick(room.roomId, room.displayTitle) }
|
||||
){
|
||||
//glass effect
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.matchParentSize()
|
||||
.blur(10.dp)
|
||||
)
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.matchParentSize()
|
||||
//card color
|
||||
.background(
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
RoundedCornerShape(16.dp)
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
Color.White.copy(alpha = 0.3f),
|
||||
RoundedCornerShape(16.dp)
|
||||
)
|
||||
)
|
||||
// 2. 再綁定點擊事件
|
||||
.clickable { onClick(room.roomId, room.displayTitle) }
|
||||
){
|
||||
|
||||
|
||||
Row(
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.example.login_v3.navigation.components
|
|||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
|
|
@ -41,15 +42,7 @@ fun AppWallpaperBackground(
|
|||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(
|
||||
brush = Brush.verticalGradient(
|
||||
colors = listOf(
|
||||
Color(0xFFDA7029),
|
||||
Color(0xFF777777),
|
||||
Color(0xFFB34800)
|
||||
)
|
||||
)
|
||||
)
|
||||
.background(color = MaterialTheme.colorScheme.background)
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,3 +18,9 @@ val DarkGlass = Color(0x14000000)
|
|||
|
||||
val WhiteText = Color(0xFFFFFFFF)
|
||||
val DarkText = Color(0xFF000000)
|
||||
|
||||
//default background
|
||||
|
||||
val White_default = Color(0xFF2C2C2C)
|
||||
val Dark_default = Color(0xFF2C2C2C)
|
||||
|
||||
|
|
|
|||
|
|
@ -9,23 +9,26 @@ import androidx.compose.material3.dynamicDarkColorScheme
|
|||
import androidx.compose.material3.dynamicLightColorScheme
|
||||
import androidx.compose.material3.lightColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
|
||||
private val DarkColorScheme = darkColorScheme(
|
||||
primary = DarkGlass,
|
||||
primary = Dark_default,
|
||||
secondary = light_orange,
|
||||
tertiary = Pink80,
|
||||
background = Color(0xFF121212),
|
||||
onBackground = DarkText
|
||||
)
|
||||
|
||||
private val LightColorScheme = lightColorScheme(
|
||||
primary = WhiteGlass,
|
||||
primary = Dark_default,
|
||||
secondary = light_orange,
|
||||
tertiary = Pink40,
|
||||
background = Color(0xFF121212),
|
||||
onBackground = WhiteText
|
||||
|
||||
/* Other default colors to override
|
||||
background = Color(0xFFFFFBFE),
|
||||
|
||||
surface = Color(0xFFFFFBFE),
|
||||
onPrimary = Color.White,
|
||||
onSecondary = Color.White,
|
||||
|
|
|
|||
Loading…
Reference in a new issue