fix: bottom-sheet-dividers [WPB-3985] (#2909)

wireapp · Apr 18, 2024 · 3d3814e · 3d3814e
1 parent 9975e60
commit 3d3814e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
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
@@ -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,

diff --git a/core/ui-common/src/main/kotlin/com/wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt b/core/ui-common/src/main/kotlin/com/wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt
@@ -92,8 +92,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/.../ui-common/src/main/kotlin/com/wire/android/ui/common/bottomsheet/ModalSheetHeaderItem.kt b/.../ui-common/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()
             }
         }
     }