chore: hide conversation favorite filter [WPB-14923] (#3724)

wireapp · Dec 10, 2024 · 7602733 · 7602733
1 parent 062f329
commit 7602733
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 34 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/conversation/HomeSheetContent.kt b/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/conversation/HomeSheetContent.kt
@@ -54,7 +54,7 @@ import com.wire.kalium.logic.data.conversation.MutedConversationStatus
 import com.wire.kalium.logic.data.user.ConnectionState
 
 // items cannot be simplified
-@Suppress("CyclomaticComplexMethod")
+@Suppress("CyclomaticComplexMethod", "UnusedParameter")
 @Composable
 internal fun ConversationMainSheetContent(
     conversationSheetContent: ConversationSheetContent,
@@ -110,37 +110,37 @@ internal fun ConversationMainSheetContent(
                     )
                 }
             }
-
-            if (conversationSheetContent.canAddToFavourite() && !conversationSheetContent.isArchived) {
-                conversationSheetContent.isFavorite?.let { isFavorite ->
-                    add {
-                        MenuBottomSheetItem(
-                            title = stringResource(
-                                if (isFavorite) {
-                                    R.string.label_remove_from_favourites
-                                } else {
-                                    R.string.label_add_to_favourites
-                                }
-                            ),
-                            leading = {
-                                MenuItemIcon(
-                                    id = R.drawable.ic_favourite,
-                                    contentDescription = null
-                                )
-                            },
-                            onItemClick = {
-                                changeFavoriteState(
-                                    GroupDialogState(
-                                        conversationSheetContent.conversationId,
-                                        conversationSheetContent.title
-                                    ),
-                                    !isFavorite
-                                )
-                            }
-                        )
-                    }
-                }
-            }
+// TODO restore on 4.11
+//            if (conversationSheetContent.canAddToFavourite() && !conversationSheetContent.isArchived) {
+//                conversationSheetContent.isFavorite?.let { isFavorite ->
+//                    add {
+//                        MenuBottomSheetItem(
+//                            title = stringResource(
+//                                if (isFavorite) {
+//                                    R.string.label_remove_from_favourites
+//                                } else {
+//                                    R.string.label_add_to_favourites
+//                                }
+//                            ),
+//                            leading = {
+//                                MenuItemIcon(
+//                                    id = R.drawable.ic_favourite,
+//                                    contentDescription = null
+//                                )
+//                            },
+//                            onItemClick = {
+//                                changeFavoriteState(
+//                                    GroupDialogState(
+//                                        conversationSheetContent.conversationId,
+//                                        conversationSheetContent.title
+//                                    ),
+//                                    !isFavorite
+//                                )
+//                            }
+//                        )
+//                    }
+//                }
+//            }
 // TODO(profile): enable when implemented
 //            add {
 //                MenuBottomSheetItem(

diff --git a/...otlin/com/wire/android/ui/home/conversationslist/filter/ConversationFilterSheetContent.kt b/...otlin/com/wire/android/ui/home/conversationslist/filter/ConversationFilterSheetContent.kt
@@ -40,7 +40,7 @@ fun ConversationFilterSheetContent(
             customVerticalPadding = dimensions().spacing8x
         ),
         menuItems = buildList<@Composable () -> Unit> {
-            ConversationFilter.entries.forEach { filter ->
+            ConversationFilter.entries.filter { it != ConversationFilter.FAVORITES }.forEach { filter ->
                 add {
                     MenuBottomSheetItem(
                         title = stringResource(filter.getResource()),

diff --git a/kalium b/kalium
+3 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiver.kt
+18 −20		logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiverTest.kt
+2 −2		network/src/commonMain/kotlin/com/wire/kalium/network/BackendMetaDataUtil.kt