From 1d776ed6bd384e039a8ea2ff212a11ec5f73af44 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 3 Aug 2022 22:11:28 +0200 Subject: [PATCH] tint dialog menu items based onSurface Signed-off-by: Andy Scherzinger --- .../talk/ui/dialog/ChooseAccountDialogFragment.java | 4 +++- .../com/nextcloud/talk/ui/theme/ViewThemeUtils.kt | 7 +++++++ app/src/main/res/layout/dialog_choose_account.xml | 12 ++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) 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 1317b0bfb..24bea279c 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 @@ -39,7 +39,6 @@ import android.view.ViewGroup; import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.interfaces.DraweeController; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.nextcloud.talk.R; import com.nextcloud.talk.activities.MainActivity; import com.nextcloud.talk.adapters.items.AdvancedUserItem; import com.nextcloud.talk.api.NcApi; @@ -118,8 +117,11 @@ public class ChooseAccountDialogFragment extends DialogFragment { viewThemeUtils.themeDialogDivider(binding.divider); viewThemeUtils.colorMaterialTextButton(binding.setStatus); + viewThemeUtils.colorDialogMenuText(binding.setStatus); viewThemeUtils.colorMaterialTextButton(binding.addAccount); + viewThemeUtils.colorDialogMenuText(binding.addAccount); viewThemeUtils.colorMaterialTextButton(binding.manageSettings); + viewThemeUtils.colorDialogMenuText(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 383ce9ae4..ddab140be 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 @@ -703,6 +703,13 @@ class ViewThemeUtils @Inject constructor(private val theme: ServerTheme, private } } + fun colorDialogMenuText(button: MaterialButton) { + withScheme(button) { scheme -> + button.setTextColor(scheme.onSurface) + button.iconTint = ColorStateList.valueOf(scheme.onSurface) + } + } + companion object { private val THEMEABLE_PLACEHOLDER_IDS = listOf( R.drawable.ic_mimetype_package_x_generic, diff --git a/app/src/main/res/layout/dialog_choose_account.xml b/app/src/main/res/layout/dialog_choose_account.xml index 02b4adb4e..6869e533d 100644 --- a/app/src/main/res/layout/dialog_choose_account.xml +++ b/app/src/main/res/layout/dialog_choose_account.xml @@ -56,12 +56,12 @@ android:text="@string/set_status" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/fontAppbar" + android:textColor="@color/high_emphasis_text" android:enabled="false" app:icon="@drawable/ic_edit" app:iconGravity="start" app:iconPadding="22dp" - app:iconTint="@color/fontAppbar" /> + app:iconTint="@color/high_emphasis_text" /> @@ -121,11 +121,11 @@ android:text="@string/nc_settings" android:textAlignment="textStart" android:textAllCaps="false" - android:textColor="@color/fontAppbar" + android:textColor="@color/high_emphasis_text" app:icon="@drawable/ic_settings" app:iconGravity="start" app:iconPadding="22dp" - app:iconTint="@color/fontAppbar" + app:iconTint="@color/high_emphasis_text" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" />