From 3d960339ada4af75bd89aa293d4e52423b5fbb33 Mon Sep 17 00:00:00 2001 From: Julie Wang Date: Thu, 26 Oct 2023 13:05:24 +0800 Subject: [PATCH 1/5] 1. Use default color of BottomSheet 2. Update color of SegmentedButtons --- .../designsystem/segmentedbuttons/SegmentedButtons.kt | 8 ++++---- .../merxury/blocker/feature/sort/AppSortBottomSheet.kt | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/designsystem/src/main/kotlin/com/merxury/blocker/core/designsystem/segmentedbuttons/SegmentedButtons.kt b/core/designsystem/src/main/kotlin/com/merxury/blocker/core/designsystem/segmentedbuttons/SegmentedButtons.kt index 388b7b0297..7f629b90a5 100644 --- a/core/designsystem/src/main/kotlin/com/merxury/blocker/core/designsystem/segmentedbuttons/SegmentedButtons.kt +++ b/core/designsystem/src/main/kotlin/com/merxury/blocker/core/designsystem/segmentedbuttons/SegmentedButtons.kt @@ -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, @@ -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 } diff --git a/feature/sort/src/main/kotlin/com/merxury/blocker/feature/sort/AppSortBottomSheet.kt b/feature/sort/src/main/kotlin/com/merxury/blocker/feature/sort/AppSortBottomSheet.kt index d5d25b4b17..1649a9d461 100644 --- a/feature/sort/src/main/kotlin/com/merxury/blocker/feature/sort/AppSortBottomSheet.kt +++ b/feature/sort/src/main/kotlin/com/merxury/blocker/feature/sort/AppSortBottomSheet.kt @@ -70,7 +70,6 @@ fun AppSortBottomSheetRoute( ModalBottomSheet( onDismissRequest = { dismissHandler() }, sheetState = bottomSheetState, - containerColor = MaterialTheme.colorScheme.surfaceVariant, scrimColor = Color.Transparent, ) { ComponentSortBottomSheet( From dc24ee7fc882567a8a65670889208503b3ab7b43 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Wed, 25 Oct 2023 22:55:43 -0700 Subject: [PATCH 2/5] Update file patterns in Push new screenshots if available step --- .github/workflows/Build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 854584fdce..6ff09713e9 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -166,7 +166,7 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v5 if: steps.screenshotsrecord.outcome == 'success' with: - file_pattern: '*/*.png' + file_pattern: '*.png' disable_globbing: true commit_message: "🤖 Updates screenshots" From 32b49f2188ad75b773d5328513f5a7dd87541bed Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Wed, 25 Oct 2023 22:59:37 -0700 Subject: [PATCH 3/5] Revert "Update file patterns in Push new screenshots if available step" This reverts commit dc24ee7fc882567a8a65670889208503b3ab7b43. --- .github/workflows/Build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 6ff09713e9..854584fdce 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -166,7 +166,7 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v5 if: steps.screenshotsrecord.outcome == 'success' with: - file_pattern: '*.png' + file_pattern: '*/*.png' disable_globbing: true commit_message: "🤖 Updates screenshots" From af18d786a5f65775af92c461e879561240587870 Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Wed, 25 Oct 2023 23:02:21 -0700 Subject: [PATCH 4/5] Skip checkout to avoid file conflicts --- .github/workflows/Build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 854584fdce..5c128b70d9 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -168,6 +168,7 @@ jobs: with: file_pattern: '*/*.png' disable_globbing: true + skip_checkout: true commit_message: "🤖 Updates screenshots" # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots. From 57e87b12882afed418911089ccbf12ddd404a17a Mon Sep 17 00:00:00 2001 From: lihenggui <350699171@qq.com> Date: Wed, 25 Oct 2023 23:08:45 -0700 Subject: [PATCH 5/5] Revert "Skip checkout to avoid file conflicts" This reverts commit af18d786a5f65775af92c461e879561240587870. --- .github/workflows/Build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 5c128b70d9..854584fdce 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -168,7 +168,6 @@ jobs: with: file_pattern: '*/*.png' disable_globbing: true - skip_checkout: true commit_message: "🤖 Updates screenshots" # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots.