diff --git a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt index b1a200d..3bc3172 100644 --- a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt +++ b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_Messaging.kt @@ -228,7 +228,7 @@ fun MessageMessaging( verticalAlignment = Alignment.CenterVertically, modifier = Modifier .fillMaxWidth() - .height(56.dp) // 👈 固定標準的 TopAppBar 高度，不會再扁扁一條了！ + .height(58.dp) // 👈 固定標準的 TopAppBar 高度，不會再扁扁一條了！ .padding(horizontal = 12.dp) // 側邊留點呼吸空間 ) { // 如果你想加返回按鈕，可以加在這裡 @@ -237,7 +237,7 @@ fun MessageMessaging( if (currentState is MessagesUiState.Success) { UserAvatar( avatarUrl = currentState.partnerAvatarUrl, - modifier = Modifier.size(36.dp) + modifier = Modifier.size(42.dp) ) } @@ -246,10 +246,14 @@ fun MessageMessaging( Text( text = topBarTitle, style = MaterialTheme.typography.titleMedium, - color = Color.Black + fontSize = 24.sp, // 👈 直接在這裡設定你想要的 sp 大小 + fontWeight = FontWeight.Bold, + color = Color(0xFF333333), + maxLines = 1, + overflow = TextOverflow.Ellipsis ) - Spacer(modifier = Modifier.width(8.dp)) + Spacer(modifier = Modifier.width(12.dp)) if (currentState is MessagesUiState.Success) { if (currentState.partnerStatus == UserStatus.ONLINE) { diff --git a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_list.kt b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_list.kt index cfc5a59..ad256da 100644 --- a/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_list.kt +++ b/app/src/main/java/com/example/login_v3/home/Message/UI/Detail/Message_list.kt @@ -229,140 +229,128 @@ fun RoomItem( val title = room.displayTitle with(sharedTransitionScope){ - Card( + Box( modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 6.dp) - .clickable { onClick(room.roomId, room.displayTitle) } - // 🌟 關鍵：把共享元素鎖定在整個外層 Container 上！ + // 1. 先處理轉場動畫（確保容器變形基底乾淨） .sharedElement( rememberSharedContentState(key = "container_${room.roomId}"), animatedVisibilityScope = animatedVisibilityScope ) - , - shape = RoundedCornerShape(16.dp), // 較大的圓角看起來更現代 - colors = CardDefaults.cardColors( - containerColor = Color.Transparent // ✅ 透明背景 - ), - elevation = CardDefaults.cardElevation( - defaultElevation = 0.dp // 增加輕微陰影 - ) - ) { + // 2. 再綁定點擊事件 + .clickable { onClick(room.roomId, room.displayTitle) } + ){ + //glass effect Box( modifier = Modifier - .fillMaxSize() - ){ - //glass effect - Box( - modifier = Modifier - .matchParentSize() - .blur(10.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) - ) - ) + .matchParentSize() + .blur(10.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( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(12.dp), + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(12.dp), + ) { + // 1. 頭像 + val imageUrl = room.roomIconUrl ?: room.partner?.fullContactAvatarUrl + AsyncImage( + model = imageUrl, + contentDescription = "Avatar", + contentScale = ContentScale.Crop, + modifier = Modifier + .size(56.dp) // 稍微加大一點 + .clip(CircleShape) + .border(1.dp, Color.White, CircleShape) // 頭像加個細白邊 + .background(Color.LightGray) + ) + + Spacer(modifier = Modifier.width(16.dp)) + + // 2. 中間內容 + Column( + modifier = Modifier.weight(1f) ) { - // 1. 頭像 - val imageUrl = room.roomIconUrl ?: room.partner?.fullContactAvatarUrl - AsyncImage( - model = imageUrl, - contentDescription = "Avatar", - contentScale = ContentScale.Crop, - modifier = Modifier - .size(56.dp) // 稍微加大一點 - .clip(CircleShape) - .border(1.dp, Color.White, CircleShape) // 頭像加個細白邊 - .background(Color.LightGray) + Text( + text = room.roomName.orEmpty().ifEmpty { + room.partner?.displayName ?: "Unknown" + }, + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + color = Color(0xFF333333), + maxLines = 1, + overflow = TextOverflow.Ellipsis ) - Spacer(modifier = Modifier.width(16.dp)) + Spacer(modifier = Modifier.height(4.dp)) - // 2. 中間內容 - Column( - modifier = Modifier.weight(1f) - ) { + val lastMsgText = when { + room.lastMessage?.isDeleted == true -> "訊息已刪除" + room.lastMessage?.content != null -> room.lastMessage.content + room.lastMessage?.attachment != null -> "[檔案] ${room.lastMessage.attachment.filename}" + else -> "尚未有訊息" + } + + Row() { Text( - text = room.roomName.orEmpty().ifEmpty { - room.partner?.displayName ?: "Unknown" - }, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Bold, - color = Color(0xFF333333), + text = lastMsgText, + style = MaterialTheme.typography.bodyMedium, + color = Color.Gray, maxLines = 1, overflow = TextOverflow.Ellipsis ) - Spacer(modifier = Modifier.height(4.dp)) + Spacer(modifier = Modifier.width(6.dp)) - val lastMsgText = when { - room.lastMessage?.isDeleted == true -> "訊息已刪除" - room.lastMessage?.content != null -> room.lastMessage.content - room.lastMessage?.attachment != null -> "[檔案] ${room.lastMessage.attachment.filename}" - else -> "尚未有訊息" - } - - Row() { - Text( - text = lastMsgText, - style = MaterialTheme.typography.bodyMedium, - color = Color.Gray, - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - - Spacer(modifier = Modifier.width(6.dp)) - - if (room.unreadCount > 0) { - Badge( - containerColor = Color(0xFFDA7029), // 使用你的主橘色 - contentColor = Color.White - ) { - Text( - text = if (room.unreadCount > 99) "99+" else room.unreadCount.toString(), - modifier = Modifier.padding(horizontal = 4.dp) - ) - } + if (room.unreadCount > 0) { + Badge( + containerColor = Color(0xFFDA7029), // 使用你的主橘色 + contentColor = Color.White + ) { + Text( + text = if (room.unreadCount > 99) "99+" else room.unreadCount.toString(), + modifier = Modifier.padding(horizontal = 4.dp) + ) } } - - Spacer(modifier = Modifier.width(2.dp)) } - - //online status - val partner = room.partner // 先從 room 取得 partner - if (partner != null) { - val status = UserStatus.fromString(partner.status) - if (status != UserStatus.UNKNOWN) { - Box( - modifier = Modifier - .size(14.dp) - .background(status.color, CircleShape) // 直接設定圓形背景 - .border(2.dp, Color.White, CircleShape) // 白色外圈邊線 - ) - } - } - - Spacer(modifier = Modifier.width(10.dp)) + Spacer(modifier = Modifier.width(2.dp)) } + //online status + val partner = room.partner // 先從 room 取得 partner + if (partner != null) { + val status = UserStatus.fromString(partner.status) + if (status != UserStatus.UNKNOWN) { + Box( + modifier = Modifier + .size(14.dp) + .background(status.color, CircleShape) // 直接設定圓形背景 + .border(2.dp, Color.White, CircleShape) // 白色外圈邊線 + ) + } + } + + Spacer(modifier = Modifier.width(10.dp)) } + + } }