diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallOverlay.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallOverlay.kt index 9abc292..027cb30 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallOverlay.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallOverlay.kt @@ -46,6 +46,8 @@ import com.rosetta.messenger.network.CallPhase import com.rosetta.messenger.network.CallUiState import com.rosetta.messenger.repository.AvatarRepository import com.rosetta.messenger.ui.components.AvatarImage +import com.rosetta.messenger.ui.components.VerifiedBadge +import com.rosetta.messenger.data.MessageRepository import compose.icons.TablerIcons import compose.icons.tablericons.ChevronDown @@ -162,15 +164,34 @@ fun CallOverlay( Spacer(modifier = Modifier.height(24.dp)) // Name - Text( - text = state.displayName, - color = Color.White, - fontSize = 26.sp, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = Modifier.padding(horizontal = 48.dp) - ) + Row( + modifier = Modifier.padding(horizontal = 48.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Center + ) { + Text( + text = state.displayName, + color = Color.White, + fontSize = 26.sp, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = false) + ) + val isRosettaOfficial = state.peerTitle.equals("Rosetta", ignoreCase = true) || + state.peerUsername.equals("rosetta", ignoreCase = true) || + MessageRepository.isSystemAccount(state.peerPublicKey) + val isFreddyVerified = state.peerUsername.equals("freddy", ignoreCase = true) || + state.peerTitle.equals("freddy", ignoreCase = true) + if (isRosettaOfficial || isFreddyVerified) { + Spacer(modifier = Modifier.width(6.dp)) + VerifiedBadge( + verified = 1, + size = 20, + isDarkTheme = true + ) + } + } Spacer(modifier = Modifier.height(6.dp)) diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallsHistoryScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallsHistoryScreen.kt index dd3f6a0..8ab92a0 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallsHistoryScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/chats/calls/CallsHistoryScreen.kt @@ -43,6 +43,8 @@ import com.rosetta.messenger.database.RosettaDatabase import com.rosetta.messenger.network.SearchUser import com.rosetta.messenger.repository.AvatarRepository import com.rosetta.messenger.ui.components.AvatarImage +import com.rosetta.messenger.ui.components.VerifiedBadge +import com.rosetta.messenger.data.MessageRepository import com.rosetta.messenger.ui.onboarding.PrimaryBlue import compose.icons.TablerIcons import compose.icons.tablericons.Phone @@ -226,14 +228,30 @@ private fun CallHistoryRowItem( Column( modifier = Modifier.weight(1f) ) { - Text( - text = item.peerTitle, - color = textColor, - fontSize = 16.sp, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + text = item.peerTitle, + color = textColor, + fontSize = 16.sp, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f, fill = false) + ) + val isRosettaOfficial = item.peerTitle.equals("Rosetta", ignoreCase = true) || + item.peerUsername.equals("rosetta", ignoreCase = true) || + MessageRepository.isSystemAccount(item.peerKey) + val isFreddyVerified = item.peerUsername.equals("freddy", ignoreCase = true) || + item.peerTitle.equals("freddy", ignoreCase = true) + if (item.peerVerified > 0 || isRosettaOfficial || isFreddyVerified) { + Spacer(modifier = Modifier.width(4.dp)) + VerifiedBadge( + verified = if (item.peerVerified > 0) item.peerVerified else 1, + size = 16, + isDarkTheme = isDarkTheme + ) + } + } Spacer(modifier = Modifier.height(3.dp)) Row( verticalAlignment = Alignment.CenterVertically diff --git a/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeScreen.kt index 7305279..eaecbff 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeScreen.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeScreen.kt @@ -510,11 +510,11 @@ private fun WallpaperSelectorItem( Column( modifier = - Modifier.width(118.dp).clickable(onClick = onClick), + Modifier.width(100.dp).clickable(onClick = onClick), horizontalAlignment = Alignment.CenterHorizontally ) { Surface( - modifier = Modifier.fillMaxWidth().height(76.dp), + modifier = Modifier.size(width = 100.dp, height = 76.dp), shape = RoundedCornerShape(10.dp), color = if (isDarkTheme) Color(0xFF2C2C2E) else Color.White, border = androidx.compose.foundation.BorderStroke(if (isSelected) 2.dp else 1.dp, borderColor) diff --git a/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeWallpapers.kt b/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeWallpapers.kt index 2aeca12..471905e 100644 --- a/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeWallpapers.kt +++ b/app/src/main/java/com/rosetta/messenger/ui/settings/ThemeWallpapers.kt @@ -96,6 +96,27 @@ object ThemeWallpapers { preferredTheme = WallpaperTheme.DARK, pairGroup = "pair_4", drawableRes = R.drawable.wallpaper_back_2 + ), + ThemeWallpaper( + id = "dark_01", + name = "Dark 1", + preferredTheme = WallpaperTheme.DARK, + pairGroup = "pair_5", + drawableRes = R.drawable.wallpaper_dark_01 + ), + ThemeWallpaper( + id = "dark_02", + name = "Dark 2", + preferredTheme = WallpaperTheme.DARK, + pairGroup = "pair_5", + drawableRes = R.drawable.wallpaper_dark_02 + ), + ThemeWallpaper( + id = "dark_03", + name = "Dark 3", + preferredTheme = WallpaperTheme.DARK, + pairGroup = "pair_6", + drawableRes = R.drawable.wallpaper_dark_03 ) ) diff --git a/app/src/main/res/drawable-nodpi/wallpaper_dark_01.png b/app/src/main/res/drawable-nodpi/wallpaper_dark_01.png new file mode 100644 index 0000000..43efe1f Binary files /dev/null and b/app/src/main/res/drawable-nodpi/wallpaper_dark_01.png differ diff --git a/app/src/main/res/drawable-nodpi/wallpaper_dark_02.png b/app/src/main/res/drawable-nodpi/wallpaper_dark_02.png new file mode 100644 index 0000000..69e2a96 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/wallpaper_dark_02.png differ diff --git a/app/src/main/res/drawable-nodpi/wallpaper_dark_03.png b/app/src/main/res/drawable-nodpi/wallpaper_dark_03.png new file mode 100644 index 0000000..d6144df Binary files /dev/null and b/app/src/main/res/drawable-nodpi/wallpaper_dark_03.png differ diff --git a/app/src/main/res/drawable-nodpi/wallpaper_dark_04.png b/app/src/main/res/drawable-nodpi/wallpaper_dark_04.png new file mode 100644 index 0000000..fda5821 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/wallpaper_dark_04.png differ