From db472764caf21685d6da9c5ddcc802be42807434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BBerko?= Date: Thu, 18 Apr 2024 11:45:00 +0200 Subject: [PATCH] fix: bottom-sheet-dividers --- .../wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt | 2 +- .../android/ui/common/bottomsheet/ModalSheetHeaderItem.kt | 2 ++ .../conversations/details/options/GroupConversationOptions.kt | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt b/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt index fe63d11a9d9..3ec23ab13fe 100644 --- a/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt +++ b/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt @@ -97,8 +97,8 @@ fun buildMenuSheetItems(items: List<@Composable () -> Unit>) { items.forEach { itemBuilder -> // Make sure that every item added to this list is actually not empty. Otherwise, the divider will be still drawn and give the // impression that it has extra thickness - WireDivider() itemBuilder() + WireDivider() } } diff --git a/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/ModalSheetHeaderItem.kt b/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/ModalSheetHeaderItem.kt index c91ddc4f4ad..c2c9882ce5b 100644 --- a/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/ModalSheetHeaderItem.kt +++ b/app/src/main/kotlin/com/wire/android/ui/common/bottomsheet/ModalSheetHeaderItem.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import com.wire.android.ui.common.dimensions +import com.wire.android.ui.common.divider.WireDivider import com.wire.android.ui.theme.wireTypography @Composable @@ -59,6 +60,7 @@ fun ModalSheetHeaderItem(header: MenuModalSheetHeader = MenuModalSheetHeader.Gon style = MaterialTheme.wireTypography.title02 ) } + WireDivider() } } } diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt index 795c5fa8c39..12c6b6eba22 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt @@ -116,7 +116,7 @@ fun GroupConversationSettings( ) } - item { WireDivider(color = colorsScheme().outline) } + item { WireDivider(color = colorsScheme().outlineVariant) } item { ServicesOption( @@ -152,7 +152,7 @@ fun GroupConversationSettings( ) } } - item { WireDivider(color = colorsScheme().outline) } + item { WireDivider(color = colorsScheme().outlineVariant) } item { ReadReceiptOption( isSwitchEnabled = state.isUpdatingReadReceiptAllowed,