Merge branch 'release/candidate' into fix/mls-migration-sync

wireapp · Jan 2, 2025 · 8e87920 · 8e87920
2 parents 53e2a3f + 2ef3a8d
commit 8e87920
Show file tree

Hide file tree

Showing 19 changed files with 393 additions and 167 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt b/app/src/main/kotlin/com/wire/android/ui/calling/ongoing/participantsview/ParticipantTile.kt
@@ -390,7 +390,7 @@ private fun UsernameTile(
     modifier: Modifier = Modifier,
 ) {
     val color =
-        if (isSpeaking) colorsScheme().primary else darkColorsScheme().surfaceContainerLowest
+        if (isSpeaking) colorsScheme().primary else darkColorsScheme().inverseOnSurface
     val nameLabelColor =
         when {
             isSpeaking -> colorsScheme().onPrimary

diff --git a/app/src/main/kotlin/com/wire/android/ui/common/topappbar/search/SearchBarState.kt b/app/src/main/kotlin/com/wire/android/ui/common/topappbar/search/SearchBarState.kt
@@ -29,11 +29,12 @@ import androidx.compose.runtime.setValue
 
 @Composable
 fun rememberSearchbarState(
+    initialIsSearchActive: Boolean = false,
     searchQueryTextState: TextFieldState = rememberTextFieldState()
 ): SearchBarState = rememberSaveable(
-    saver = SearchBarState.saver(searchQueryTextState)
+    saver = SearchBarState.saver()
 ) {
-    SearchBarState(searchQueryTextState = searchQueryTextState)
+    SearchBarState(isSearchActive = initialIsSearchActive, searchQueryTextState = searchQueryTextState)
 }
 
 class SearchBarState(
@@ -57,14 +58,23 @@ class SearchBarState(
     }
 
     companion object {
-        fun saver(searchQueryTextState: TextFieldState): Saver<SearchBarState, *> = Saver(
+        fun saver(): Saver<SearchBarState, *> = Saver(
             save = {
-                listOf(it.isSearchActive)
+                listOf(
+                    it.isSearchActive,
+                    with(TextFieldState.Saver) {
+                        save(it.searchQueryTextState)
+                    }
+                )
             },
             restore = {
                 SearchBarState(
-                    isSearchActive = it[0],
-                    searchQueryTextState = searchQueryTextState
+                    isSearchActive = (it.getOrNull(0) as? Boolean) ?: false,
+                    searchQueryTextState = it.getOrNull(1)?.let {
+                        with(TextFieldState.Saver) {
+                            restore(it)
+                        }
+                    } ?: TextFieldState()
                 )
             }
         )

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/HomeTopBar.kt b/app/src/main/kotlin/com/wire/android/ui/home/HomeTopBar.kt
@@ -70,11 +70,11 @@ fun HomeTopBar(
             }
             if (navigationItem.withUserAvatar) {
                 val openLabel = stringResource(R.string.content_description_open_label)
-            val contentDescription = if (shouldShowCreateTeamUnreadIndicator) {
-                stringResource(R.string.content_description_home_profile_btn_with_notification)
-            } else {
-                stringResource(R.string.content_description_home_profile_btn)
-            }
+                val contentDescription = if (shouldShowCreateTeamUnreadIndicator) {
+                    stringResource(R.string.content_description_home_profile_btn_with_notification)
+                } else {
+                    stringResource(R.string.content_description_home_profile_btn)
+                }
                 UserProfileAvatar(
                     avatarData = userAvatarData,
                     clickable = remember {
@@ -87,7 +87,7 @@ fun HomeTopBar(
                         legalHoldIndicatorVisible = withLegalHoldIndicator
                     ),
                     shouldShowCreateTeamUnreadIndicator = shouldShowCreateTeamUnreadIndicator,
-                contentDescription = contentDescription
+                    contentDescription = contentDescription
                 )
             }
         },
@@ -112,6 +112,27 @@ fun PreviewTopBar() {
     }
 }
 
+@PreviewMultipleThemes
+@Composable
+fun PreviewTopBarWithSelectedFilter() {
+    WireTheme {
+        HomeTopBar(
+            navigationItem = HomeDestination.Group,
+            userAvatarData = UserAvatarData(
+                asset = null,
+                availabilityStatus = UserAvailabilityStatus.AVAILABLE,
+                nameBasedAvatar = NameBasedAvatar("Jon Doe", -1)
+            ),
+            elevation = 0.dp,
+            withLegalHoldIndicator = false,
+            shouldShowCreateTeamUnreadIndicator = false,
+            onHamburgerMenuClick = {},
+            onNavigateToSelfUserProfile = {},
+            onOpenConversationFilter = {}
+        )
+    }
+}
+
 @PreviewMultipleThemes
 @Composable
 fun PreviewSettingsTopBarWithoutAvatar() {

diff --git a/app/src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt
@@ -32,7 +32,6 @@ import com.wire.android.ui.home.conversationslist.common.previewConversationFold
 import com.wire.android.ui.home.conversationslist.model.ConversationsSource
 import com.wire.android.ui.theme.WireTheme
 import com.wire.android.util.ui.PreviewMultipleThemes
-import kotlinx.coroutines.flow.flowOf
 
 @HomeNavGraph
 @WireDestination
@@ -57,7 +56,7 @@ fun PreviewArchiveEmptyScreen() = WireTheme {
         searchBarState = rememberSearchbarState(),
         conversationsSource = ConversationsSource.ARCHIVE,
         emptyListContent = { ArchiveEmptyContent() },
-        conversationListViewModel = ConversationListViewModelPreview(flowOf()),
+        conversationListViewModel = ConversationListViewModelPreview(previewConversationFoldersFlow(list = listOf())),
     )
 }
 
@@ -66,10 +65,10 @@ fun PreviewArchiveEmptyScreen() = WireTheme {
 fun PreviewArchiveEmptySearchScreen() = WireTheme {
     ConversationsScreenContent(
         navigator = rememberNavigator {},
-        searchBarState = rememberSearchbarState(searchQueryTextState = TextFieldState(initialText = "er")),
+        searchBarState = rememberSearchbarState(initialIsSearchActive = true, searchQueryTextState = TextFieldState(initialText = "er")),
         conversationsSource = ConversationsSource.ARCHIVE,
         emptyListContent = { ArchiveEmptyContent() },
-        conversationListViewModel = ConversationListViewModelPreview(flowOf()),
+        conversationListViewModel = ConversationListViewModelPreview(previewConversationFoldersFlow(searchQuery = "er", list = listOf())),
     )
 }
 
@@ -78,7 +77,7 @@ fun PreviewArchiveEmptySearchScreen() = WireTheme {
 fun PreviewArchiveScreen() = WireTheme {
     ConversationsScreenContent(
         navigator = rememberNavigator {},
-        searchBarState = rememberSearchbarState(searchQueryTextState = TextFieldState(initialText = "er")),
+        searchBarState = rememberSearchbarState(initialIsSearchActive = true, searchQueryTextState = TextFieldState(initialText = "er")),
         conversationsSource = ConversationsSource.ARCHIVE,
         emptyListContent = { ArchiveEmptyContent() },
         conversationListViewModel = ConversationListViewModelPreview(previewConversationFoldersFlow(searchQuery = "er")),

diff --git a/...kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt b/...kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt
@@ -169,12 +169,10 @@ fun GroupConversationSettings(
                 onCheckedChange = onReadReceiptSwitchClicked
             )
         }
-        if (state.mlsEnabled) {
-            item {
-                ConversationProtocolDetails(
-                    protocolInfo = state.protocolInfo
-                )
-            }
+        item {
+            ConversationProtocolDetails(
+                protocolInfo = state.protocolInfo
+            )
         }
     }
 }
@@ -186,12 +184,13 @@ fun ConversationProtocolDetails(
 ) {
     Column(modifier = modifier) {
         FolderHeader(name = stringResource(R.string.folder_label_protocol_details))
-        if (protocolInfo is Conversation.ProtocolInfo.MLS) {
-            ProtocolDetails(
-                label = UIText.StringResource(R.string.protocol),
-                text = UIText.DynamicString(protocolInfo.name())
-            )
 
+        ProtocolDetails(
+            label = UIText.StringResource(R.string.protocol),
+            text = UIText.DynamicString(protocolInfo.name())
+        )
+
+        if (protocolInfo is Conversation.ProtocolInfo.MLS) {
             ProtocolDetails(
                 label = UIText.StringResource(R.string.cipher_suite),
                 text = UIText.DynamicString(protocolInfo.cipherSuite.toString())