Skip to content

fix colors for chips to reflect m3 spec #547

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

Merged
AndyScherzinger merged 1 commit into from
Nov 8, 2024
Merged

fix colors for chips to reflect m3 spec #547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions ui/src/main/java/com/nextcloud/android/common/ui/theme/utils/MaterialViewThemeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ class MaterialViewThemeUtils
val iconColors =
buildColorStateList(
android.R.attr.state_checked to dynamicColor.onSecondaryContainer().getArgb(scheme),
-android.R.attr.state_checked to dynamicColor.surfaceVariant().getArgb(scheme),
-android.R.attr.state_checked to dynamicColor.onSurfaceVariant().getArgb(scheme),
android.R.attr.state_focused to dynamicColor.onSecondaryContainer().getArgb(scheme),
android.R.attr.state_hovered to dynamicColor.onSecondaryContainer().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.onSecondaryContainer().getArgb(scheme)
Expand All @@ -589,7 +589,7 @@ class MaterialViewThemeUtils
val textColors =
buildColorStateList(
android.R.attr.state_checked to dynamicColor.onSecondaryContainer().getArgb(scheme),
-android.R.attr.state_checked to dynamicColor.surfaceVariant().getArgb(scheme),
-android.R.attr.state_checked to dynamicColor.onSurfaceVariant().getArgb(scheme),
android.R.attr.state_hovered to dynamicColor.onSecondaryContainer().getArgb(scheme),
android.R.attr.state_focused to dynamicColor.onSecondaryContainer().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.onSecondaryContainer().getArgb(scheme)
Expand Down Expand Up @@ -640,15 +640,15 @@ class MaterialViewThemeUtils
withScheme(chip.context) { scheme ->
val iconColors =
buildColorStateList(
android.R.attr.state_enabled to dynamicColor.surfaceVariant().getArgb(scheme),
android.R.attr.state_enabled to dynamicColor.onSurfaceVariant().getArgb(scheme),
-android.R.attr.state_enabled to
colorUtil.adjustOpacity(
dynamicColor.onSurface().getArgb(scheme),
ON_SURFACE_OPACITY_BUTTON_DISABLED
),
android.R.attr.state_focused to dynamicColor.surfaceVariant().getArgb(scheme),
android.R.attr.state_hovered to dynamicColor.surfaceVariant().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.surfaceVariant().getArgb(scheme)
android.R.attr.state_focused to dynamicColor.onSurfaceVariant().getArgb(scheme),
android.R.attr.state_hovered to dynamicColor.onSurfaceVariant().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.onSurfaceVariant().getArgb(scheme)
)

chip.chipStrokeColor = chipOutlineFilterColorList(scheme)
Expand All @@ -659,34 +659,34 @@ class MaterialViewThemeUtils

private fun chipOutlineColorList(scheme: DynamicScheme) =
buildColorStateList(
android.R.attr.state_enabled to dynamicColor.outline().getArgb(scheme),
android.R.attr.state_enabled to dynamicColor.outlineVariant().getArgb(scheme),
-android.R.attr.state_enabled to
colorUtil.adjustOpacity(
dynamicColor.onSurface().getArgb(scheme),
ON_SURFACE_OPACITY_BUTTON_OUTLINE_DISABLED
),
android.R.attr.state_hovered to dynamicColor.outline().getArgb(scheme),
android.R.attr.state_focused to dynamicColor.surfaceVariant().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.outline().getArgb(scheme)
android.R.attr.state_hovered to dynamicColor.outlineVariant().getArgb(scheme),
android.R.attr.state_focused to dynamicColor.onSurfaceVariant().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.outlineVariant().getArgb(scheme)
)

private fun chipOutlineFilterColorList(scheme: DynamicScheme) =
buildColorStateList(
android.R.attr.state_checked to dynamicColor.secondaryContainer().getArgb(scheme),
-android.R.attr.state_checked to dynamicColor.outline().getArgb(scheme)
-android.R.attr.state_checked to dynamicColor.outlineVariant().getArgb(scheme)
)

private fun chipSuggestionInputTextColorList(scheme: DynamicScheme) =
buildColorStateList(
android.R.attr.state_enabled to dynamicColor.surfaceVariant().getArgb(scheme),
android.R.attr.state_enabled to dynamicColor.onSurfaceVariant().getArgb(scheme),
-android.R.attr.state_enabled to
colorUtil.adjustOpacity(
dynamicColor.onSurface().getArgb(scheme),
ON_SURFACE_OPACITY_BUTTON_DISABLED
),
android.R.attr.state_hovered to dynamicColor.surfaceVariant().getArgb(scheme),
android.R.attr.state_focused to dynamicColor.surfaceVariant().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.surfaceVariant().getArgb(scheme)
android.R.attr.state_hovered to dynamicColor.onSurfaceVariant().getArgb(scheme),
android.R.attr.state_focused to dynamicColor.onSurfaceVariant().getArgb(scheme),
android.R.attr.state_pressed to dynamicColor.onSurfaceVariant().getArgb(scheme)
)

private fun rippleColor(scheme: DynamicScheme) =
Expand Down