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

Update SegmentedButtons color #460

Closed
wants to merge 6 commits into from
Closed

Update SegmentedButtons color #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d96033
1. Use default color of BottomSheet
Oct 26, 2023
2bbb98c
Merge branch 'segmented-buttons' of https://github.com/lihenggui/bloc…
lihenggui Oct 26, 2023
dc24ee7
Update file patterns in Push new screenshots if available step
lihenggui Oct 26, 2023
32b49f2
Revert "Update file patterns in Push new screenshots if available step"
lihenggui Oct 26, 2023
af18d78
Skip checkout to avoid file conflicts
lihenggui Oct 26, 2023
57e87b1
Revert "Skip checkout to avoid file conflicts"
lihenggui Oct 26, 2023
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
8 changes: 4 additions & 4 deletions ...rc/main/kotlin/com/merxury/blocker/core/designsystem/segmentedbuttons/SegmentedButtons.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ object SegmentedButtonsDefaults {

@Composable
fun colors(
selectedTextColor: Color = MaterialTheme.colorScheme.primary,
selectedIconColor: Color = MaterialTheme.colorScheme.primary,
selectedTextColor: Color = MaterialTheme.colorScheme.onSecondaryContainer,
selectedIconColor: Color = MaterialTheme.colorScheme.onSecondaryContainer,
unselectedTextColor: Color = MaterialTheme.colorScheme.onSurface,
unselectedIconColor: Color = MaterialTheme.colorScheme.onSurface,
indicatorColor: Color = MaterialTheme.colorScheme.secondaryContainer,
outlineColor: Color = MaterialTheme.colorScheme.outlineVariant,
outlineColor: Color = MaterialTheme.colorScheme.outline,
): SegmentedButtonColors = SegmentedButtonColors(
selectedTextColor = selectedTextColor,
selectedIconColor = selectedIconColor,
Expand All @@ -278,7 +278,7 @@ object SegmentedButtonsDefaults {
)

internal val outlineThickness: Dp = 1.dp
internal val minimumHeight: Dp = 48.dp
internal val minimumHeight: Dp = 40.dp
internal const val ITEM_ANIMATION_MILLIS: Int = 100
}

Expand Down
1 change: 0 additions & 1 deletion feature/sort/src/main/kotlin/com/merxury/blocker/feature/sort/AppSortBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ fun AppSortBottomSheetRoute(
ModalBottomSheet(
onDismissRequest = { dismissHandler() },
sheetState = bottomSheetState,
containerColor = MaterialTheme.colorScheme.surfaceVariant,
scrimColor = Color.Transparent,
) {
ComponentSortBottomSheet(
Expand Down