From e629932262036b08b876807688e072aca1e2a28d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 1 Aug 2022 22:40:46 +0200 Subject: [PATCH] theme text buttons's ripple color for Material 3 Signed-off-by: Andy Scherzinger --- .../talk/ui/dialog/ChooseAccountDialogFragment.java | 4 ++++ .../com/nextcloud/talk/ui/theme/ViewThemeUtils.kt | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java index f68057b63..fff6d61b6 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java @@ -117,6 +117,10 @@ public class ChooseAccountDialogFragment extends DialogFragment { viewThemeUtils.themeDialog(binding.getRoot()); viewThemeUtils.themeDialogDivider(binding.divider); + viewThemeUtils.colorMaterialTextButton(binding.setStatus); + viewThemeUtils.colorMaterialTextButton(binding.addAccount); + viewThemeUtils.colorMaterialTextButton(binding.manageSettings); + // Defining user picture binding.currentAccount.userIcon.setTag(""); diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt index eec2bfea1..3b3d4d8c2 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/ViewThemeUtils.kt @@ -247,6 +247,19 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private imageView.imageTintList = ColorStateList.valueOf(theme.colorText) } + fun colorMaterialTextButton(button: MaterialButton) { + withScheme(button) { scheme -> + button.rippleColor = ColorStateList( + arrayOf( + intArrayOf(android.R.attr.state_pressed) + ), + intArrayOf( + calculateDisabledColor(scheme.primary, SURFACE_OPACITY_BUTTON_DISABLED) + ) + ) + } + } + fun colorMaterialButtonText(button: MaterialButton) { withScheme(button) { scheme -> val disabledColor = ContextCompat.getColor(button.context, R.color.disabled_text)