Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Dec 10, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4d044c
chore: hide conversation favorite filter
Garzas Dec 10, 2024
7dda4fe
hide add/remove from favorites
Garzas Dec 10, 2024
ffa7e4f
kalium update
Garzas Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/conversation/HomeSheetContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...otlin/com/wire/android/ui/home/conversationslist/filter/ConversationFilterSheetContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 3 files
+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
Loading