Skip to content

Add search bar and button content coloring #703

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
Jul 9, 2025
Merged

Add search bar and button content coloring #703

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
34 changes: 29 additions & 5 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 @@ -141,6 +141,21 @@ class MaterialViewThemeUtils
}
}

fun themeSearchCardView(cardView: MaterialCardView) {
withScheme(cardView) { scheme ->
cardView.backgroundTintList =
ColorStateList.valueOf(
dynamicColor.surfaceContainerHigh().getArgb(scheme)
)
cardView.setStrokeColor(
buildColorStateList(
android.R.attr.state_checked to dynamicColor.surfaceContainerHigh().getArgb(scheme),
-android.R.attr.state_checked to dynamicColor.surfaceContainerHigh().getArgb(scheme)
)
)
}
}

fun themeDragHandleView(dragHandleView: BottomSheetDragHandleView) {
withScheme(dragHandleView) { scheme ->
dragHandleView.imageTintList = ColorStateList.valueOf(dynamicColor.onSurfaceVariant().getArgb(scheme))
Expand Down Expand Up @@ -293,17 +308,26 @@ class MaterialViewThemeUtils
-android.R.attr.state_pressed to dynamicColor.onPrimary().getArgb(scheme)
)

colorMaterialButtonContent(button)
}
}

fun colorMaterialButtonContent(
button: MaterialButton,
colorRole: ColorRole = ColorRole.PRIMARY
) {
withScheme(button) { scheme ->
val contentColorList =
buildColorStateList(
android.R.attr.state_enabled to dynamicColor.primary().getArgb(scheme),
android.R.attr.state_enabled to colorRole.select(scheme),
-android.R.attr.state_enabled to
colorUtil.adjustOpacity(
dynamicColor.primary().getArgb(scheme),
colorRole.select(scheme),
ON_SURFACE_OPACITY_BUTTON_DISABLED
),
-android.R.attr.state_hovered to dynamicColor.primary().getArgb(scheme),
-android.R.attr.state_focused to dynamicColor.primary().getArgb(scheme),
-android.R.attr.state_pressed to dynamicColor.primary().getArgb(scheme)
-android.R.attr.state_hovered to colorRole.select(scheme),
-android.R.attr.state_focused to colorRole.select(scheme),
-android.R.attr.state_pressed to colorRole.select(scheme)
)

button.setTextColor(
Expand Down
Loading