feat: filter conversation list [WPB-11638]

app/src/main/kotlin/com/wire/android/navigation/HomeDestination.kt

@@ -24,28 +24,54 @@ import com.ramcosta.composedestinations.spec.Direction
 import com.wire.android.R
 import com.wire.android.ui.destinations.AllConversationsScreenDestination
 import com.wire.android.ui.destinations.ArchiveScreenDestination
+import com.wire.android.ui.destinations.FavoritesConversationsScreenDestination
+import com.wire.android.ui.destinations.GroupConversationsScreenDestination
+import com.wire.android.ui.destinations.OneOnOneConversationsScreenDestination
 import com.wire.android.ui.destinations.SettingsScreenDestination
 import com.wire.android.ui.destinations.VaultScreenDestination
 import com.wire.android.ui.destinations.WhatsNewScreenDestination
+import com.wire.kalium.logic.data.conversation.ConversationFilter
 
 @Suppress("LongParameterList")
 sealed class HomeDestination(
     @StringRes val title: Int,
-    @StringRes val tabName: Int = title,
     @DrawableRes val icon: Int,
     val isSearchable: Boolean = false,
     val withNewConversationFab: Boolean = false,
     val direction: Direction
 ) {
     data object Conversations : HomeDestination(
         title = R.string.conversations_screen_title,
-        tabName = R.string.conversations_all_tab_title,
         icon = R.drawable.ic_conversation,
         isSearchable = true,
         withNewConversationFab = true,
         direction = AllConversationsScreenDestination
     )
 
+    data object Favorites : HomeDestination(
+        title = R.string.label_filter_favorites,
+        icon = R.drawable.ic_conversation,
+        isSearchable = true,
+        withNewConversationFab = true,
+        direction = FavoritesConversationsScreenDestination
+    )
+
+    data object Group : HomeDestination(
+        title = R.string.label_filter_group,
+        icon = R.drawable.ic_conversation,
+        isSearchable = true,
+        withNewConversationFab = true,
+        direction = GroupConversationsScreenDestination
+    )
+
+    data object OneOnOne : HomeDestination(
+        title = R.string.label_filter_one_on_one,
+        icon = R.drawable.ic_conversation,
+        isSearchable = true,
+        withNewConversationFab = true,
+        direction = OneOnOneConversationsScreenDestination
+    )
+
     data object Settings : HomeDestination(
         title = R.string.settings_screen_title,
         icon = R.drawable.ic_settings,
@@ -83,7 +109,31 @@ sealed class HomeDestination(
         private const val ITEM_NAME_PREFIX = "HomeNavigationItem."
         fun fromRoute(fullRoute: String): HomeDestination? =
             values().find { it.direction.route.getBaseRoute() == fullRoute.getBaseRoute() }
+
         fun values(): Array<HomeDestination> =
-            arrayOf(Conversations, Settings, Vault, Archive, Support, WhatsNew)
+            arrayOf(Conversations, Favorites, Group, OneOnOne, Settings, Vault, Archive, Support, WhatsNew)
+    }
+}
+
+fun HomeDestination.currentFilter(): ConversationFilter {
+    return when (this) {
+        HomeDestination.Conversations -> ConversationFilter.NONE
+        HomeDestination.Favorites -> ConversationFilter.FAVORITES
+        HomeDestination.Group -> ConversationFilter.GROUPS
+        HomeDestination.OneOnOne -> ConversationFilter.ONE_ON_ONE
+        HomeDestination.Archive,
+        HomeDestination.Settings,
+        HomeDestination.Support,
+        HomeDestination.Vault,
+        HomeDestination.WhatsNew -> ConversationFilter.NONE
+    }
+}
+
+fun ConversationFilter.toDestination(): HomeDestination {
+    return when (this) {
+        ConversationFilter.NONE -> HomeDestination.Conversations
+        ConversationFilter.FAVORITES -> HomeDestination.Favorites
+        ConversationFilter.GROUPS -> HomeDestination.Group
+        ConversationFilter.ONE_ON_ONE -> HomeDestination.OneOnOne
     }
 }

app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/PreviewMenuBottomSheetItem.kt

@@ -37,13 +37,13 @@ import com.wire.android.ui.theme.wireTypography
 fun PreviewMenuBottomSheetItem() {
     MenuBottomSheetItem(
         title = "very long looooooong title",
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_erase,
                 contentDescription = "",
             )
         },
-        action = {
+        trailing = {
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(
                     text = "very long looooooong action",

app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/conversation/HomeSheetContent.kt

@@ -96,13 +96,13 @@ internal fun ConversationMainSheetContent(
                 add {
                     MenuBottomSheetItem(
                         title = stringResource(R.string.label_notifications),
-                        icon = {
+                        leading = {
                             MenuItemIcon(
                                 id = R.drawable.ic_mute,
                                 contentDescription = null,
                             )
                         },
-                        action = { NotificationsOptionsItemAction(conversationSheetContent.mutingConversationState) },
+                        trailing = { NotificationsOptionsItemAction(conversationSheetContent.mutingConversationState) },
                         onItemClick = navigateToNotification,
                         onItemClickDescription = stringResource(id = R.string.content_description_open_notification_settings_label)
                     )
@@ -137,7 +137,7 @@ internal fun ConversationMainSheetContent(
 //            }
             add {
                 MenuBottomSheetItem(
-                    icon = {
+                    leading = {
                         MenuItemIcon(
                             id = R.drawable.ic_archive,
                             contentDescription = null,
@@ -164,7 +164,7 @@ internal fun ConversationMainSheetContent(
             }
             add {
                 MenuBottomSheetItem(
-                    icon = {
+                    leading = {
                         MenuItemIcon(
                             id = R.drawable.ic_erase,
                             contentDescription = null,
@@ -187,7 +187,7 @@ internal fun ConversationMainSheetContent(
             if (conversationSheetContent.canBlockUser()) {
                 add {
                     MenuBottomSheetItem(
-                        icon = {
+                        leading = {
                             MenuItemIcon(
                                 id = R.drawable.ic_block,
                                 contentDescription = null,
@@ -210,7 +210,7 @@ internal fun ConversationMainSheetContent(
             if (conversationSheetContent.canUnblockUser()) {
                 add {
                     MenuBottomSheetItem(
-                        icon = {
+                        leading = {
                             MenuItemIcon(
                                 id = R.drawable.ic_block,
                                 contentDescription = null
@@ -232,7 +232,7 @@ internal fun ConversationMainSheetContent(
             if (conversationSheetContent.canLeaveTheGroup()) {
                 add {
                     MenuBottomSheetItem(
-                        icon = {
+                        leading = {
                             MenuItemIcon(
                                 id = R.drawable.ic_leave,
                                 contentDescription = null,
@@ -254,7 +254,7 @@ internal fun ConversationMainSheetContent(
             if (conversationSheetContent.canDeleteGroup()) {
                 add {
                     MenuBottomSheetItem(
-                        icon = {
+                        leading = {
                             MenuItemIcon(
                                 id = R.drawable.ic_remove,
                                 contentDescription = null,

app/src/main/kotlin/com/wire/android/ui/edit/CopyItemMenuOption.kt

@@ -26,7 +26,7 @@ import com.wire.android.ui.common.bottomsheet.MenuItemIcon
 @Composable
 fun CopyItemMenuOption(onCopyItemClick: () -> Unit) {
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_copy,
                 contentDescription = stringResource(R.string.content_description_copy_the_message),

app/src/main/kotlin/com/wire/android/ui/edit/DeleteItemMenuOption.kt

@@ -27,7 +27,7 @@ import com.wire.android.ui.common.bottomsheet.MenuItemIcon
 @Composable
 fun DeleteItemMenuOption(onDeleteItemClick: () -> Unit) {
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_delete,
                 contentDescription = stringResource(R.string.content_description_delete_the_message),

app/src/main/kotlin/com/wire/android/ui/edit/DownloadAssetExternallyOption.kt

@@ -27,7 +27,7 @@ import com.wire.android.ui.common.bottomsheet.MenuItemIcon
 @Composable
 fun DownloadAssetExternallyOption(onDownloadClick: () -> Unit) =
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_download,
                 contentDescription = stringResource(R.string.content_description_download_icon),

app/src/main/kotlin/com/wire/android/ui/edit/EditMessageMenuOption.kt

@@ -26,7 +26,7 @@ import com.wire.android.ui.common.bottomsheet.MenuItemIcon
 @Composable
 fun EditMessageMenuOption(onEditItemClick: () -> Unit) {
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_edit,
                 contentDescription = stringResource(R.string.content_description_edit_the_message)

app/src/main/kotlin/com/wire/android/ui/edit/MessageDetailsMenuOption.kt

@@ -28,7 +28,7 @@ fun MessageDetailsMenuOption(
     onMessageDetailsClick: () -> Unit
 ) {
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_info,
                 contentDescription = stringResource(R.string.content_description_open_message_details),

app/src/main/kotlin/com/wire/android/ui/edit/OpenAssetExternallyOption.kt

@@ -27,7 +27,7 @@ import com.wire.android.ui.common.bottomsheet.MenuItemIcon
 @Composable
 fun OpenAssetExternallyOption(onOpenClick: () -> Unit) =
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_view,
                 contentDescription = stringResource(R.string.content_description_open_asset_icon),

app/src/main/kotlin/com/wire/android/ui/edit/ReplyMessageOption.kt

@@ -26,7 +26,7 @@ import com.wire.android.ui.common.bottomsheet.MenuItemIcon
 @Composable
 fun ReplyMessageOption(onReplyItemClick: () -> Unit) {
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_reply,
                 contentDescription = stringResource(R.string.content_description_reply_to_messge),

app/src/main/kotlin/com/wire/android/ui/edit/ShareAssetMenuOption.kt

@@ -26,7 +26,7 @@ import com.wire.android.ui.common.bottomsheet.MenuItemIcon
 @Composable
 fun ShareAssetMenuOption(onShareAsset: () -> Unit) {
     MenuBottomSheetItem(
-        icon = {
+        leading = {
             MenuItemIcon(
                 id = R.drawable.ic_share_file,
                 contentDescription = stringResource(R.string.content_description_share_the_file),

app/src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt

@@ -67,11 +67,15 @@ import com.wire.android.navigation.HomeDestination
 import com.wire.android.navigation.NavigationCommand
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.WireDestination
+import com.wire.android.navigation.currentFilter
 import com.wire.android.navigation.handleNavigation
+import com.wire.android.navigation.toDestination
 import com.wire.android.ui.NavGraphs
 import com.wire.android.ui.analytics.AnalyticsUsageViewModel
 import com.wire.android.ui.common.CollapsingTopBarScaffold
 import com.wire.android.ui.common.FloatingActionButton
+import com.wire.android.ui.common.bottomsheet.WireModalSheetLayout
+import com.wire.android.ui.common.bottomsheet.rememberWireModalSheetState
 import com.wire.android.ui.common.dialogs.PermissionPermanentlyDeniedDialog
 import com.wire.android.ui.common.dimensions
 import com.wire.android.ui.common.snackbar.LocalSnackbarHostState
@@ -84,10 +88,12 @@ import com.wire.android.ui.destinations.SelfUserProfileScreenDestination
 import com.wire.android.ui.home.conversations.PermissionPermanentlyDeniedDialogState
 import com.wire.android.ui.home.conversations.details.GroupConversationActionType
 import com.wire.android.ui.home.conversations.details.GroupConversationDetailsNavBackArgs
+import com.wire.android.ui.home.conversationslist.filter.ConversationFilterSheetContent
 import com.wire.android.ui.home.drawer.HomeDrawer
 import com.wire.android.ui.home.drawer.HomeDrawerState
 import com.wire.android.ui.home.drawer.HomeDrawerViewModel
 import com.wire.android.util.permission.rememberShowNotificationsPermissionFlow
+import com.wire.kalium.logic.data.conversation.ConversationFilter
 import kotlinx.coroutines.launch
 
 @RootNavGraph
@@ -234,6 +240,8 @@ fun HomeContent(
     modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
+    val filterSheetState = rememberWireModalSheetState<ConversationFilter>()
+
     with(homeStateHolder) {
         fun openHomeDestination(item: HomeDestination) {
             item.direction.handleNavigation(
@@ -285,13 +293,14 @@ fun HomeContent(
                             exit = shrinkVertically() + fadeOut(),
                         ) {
                             HomeTopBar(
+                                navigationItem = currentNavigationItem,
                                 userAvatarData = homeState.userAvatarData,
-                                title = stringResource(currentNavigationItem.title),
                                 elevation = dimensions().spacing0x, // CollapsingTopBarScaffold manages applied elevation
                                 withLegalHoldIndicator = homeState.shouldDisplayLegalHoldIndicator,
                                 shouldShowCreateTeamUnreadIndicator = homeState.shouldShowCreateTeamUnreadIndicator,
                                 onHamburgerMenuClick = ::openDrawer,
                                 onNavigateToSelfUserProfile = onSelfUserClick,
+                                onOpenConversationFilter = { filterSheetState.show(it) }
                             )
                         }
                     },
@@ -359,5 +368,17 @@ fun HomeContent(
                 )
             }
         )
+        WireModalSheetLayout(
+            sheetState = filterSheetState,
+            sheetContent = {
+                ConversationFilterSheetContent(
+                    currentFilter = currentNavigationItem.currentFilter(),
+                    onChangeFilter = { filter ->
+                        filterSheetState.hide()
+                        openHomeDestination(filter.toDestination())
+                    }
+                )
+            }
+        )
     }
 }