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

Jump to bottom

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

Merged
merged 3 commits into from
Apr 18, 2024
Merged

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

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
db47276
fix: bottom-sheet-dividers
Garzas Apr 18, 2024
aa9922f
Merge branch 'develop' into fix/bottom-sheet-dividers
Garzas Apr 18, 2024
7141291
Merge branch 'develop' into fix/bottom-sheet-dividers
Garzas Apr 18, 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
4 changes: 2 additions & 2 deletions ...kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ fun GroupConversationSettings(
)
}

item { WireDivider(color = colorsScheme().outline) }
item { WireDivider(color = colorsScheme().outlineVariant) }

item {
ServicesOption(
Expand Down Expand Up @@ -152,7 +152,7 @@ fun GroupConversationSettings(
)
}
}
item { WireDivider(color = colorsScheme().outline) }
item { WireDivider(color = colorsScheme().outlineVariant) }
item {
ReadReceiptOption(
isSwitchEnabled = state.isUpdatingReadReceiptAllowed,
Expand Down
2 changes: 1 addition & 1 deletion core/ui-common/src/main/kotlin/com/wire/android/ui/common/bottomsheet/MenuBottomSheetItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}

Expand Down
2 changes: 2 additions & 0 deletions .../ui-common/src/main/kotlin/com/wire/android/ui/common/bottomsheet/ModalSheetHeaderItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -59,6 +60,7 @@ fun ModalSheetHeaderItem(header: MenuModalSheetHeader = MenuModalSheetHeader.Gon
style = MaterialTheme.wireTypography.title02
)
}
WireDivider()
}
}
}
Expand Down
Loading