Эх сурвалжийг харах

theme text buttons's ripple color for Material 3

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 жил өмнө
parent
commit
e629932262

+ 4 - 0
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.themeDialog(binding.getRoot());
         viewThemeUtils.themeDialogDivider(binding.divider);
         viewThemeUtils.themeDialogDivider(binding.divider);
 
 
+        viewThemeUtils.colorMaterialTextButton(binding.setStatus);
+        viewThemeUtils.colorMaterialTextButton(binding.addAccount);
+        viewThemeUtils.colorMaterialTextButton(binding.manageSettings);
+
         // Defining user picture
         // Defining user picture
         binding.currentAccount.userIcon.setTag("");
         binding.currentAccount.userIcon.setTag("");
 
 

+ 13 - 0
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)
         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) {
     fun colorMaterialButtonText(button: MaterialButton) {
         withScheme(button) { scheme ->
         withScheme(button) { scheme ->
             val disabledColor = ContextCompat.getColor(button.context, R.color.disabled_text)
             val disabledColor = ContextCompat.getColor(button.context, R.color.disabled_text)