From 089da0a9ff291c337f4f60421c9c39e69ad11814 Mon Sep 17 00:00:00 2001 From: Alex Paulescu <alex.paulescu@gmail.com> Date: Thu, 17 Dec 2020 17:30:31 +0200 Subject: [PATCH] Remove material styling from dialog buttons in contact diary activity (EXPOSUREAPP-4327) (#1917) * Added custom styling for dialog buttons in diary activities. * Updated dialog button color --- Corona-Warn-App/src/main/res/values/styles.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml index eed4ac804..e5a009fbf 100644 --- a/Corona-Warn-App/src/main/res/values/styles.xml +++ b/Corona-Warn-App/src/main/res/values/styles.xml @@ -16,12 +16,13 @@ <item name="colorPrimary">@color/colorBrandSecondary</item> <item name="colorPrimaryDark">@color/colorStableDark</item> <item name="android:windowBackground">@color/colorBackground</item> - <item name="alertDialogTheme">@style/dialog</item> + <item name="alertDialogTheme">@style/diaryDialog</item> </style> <style name="MaterialAppTheme.NoActionBar" parent="MaterialAppTheme"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> + <item name="dialogTheme">@style/diaryDialog</item> </style> <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> @@ -60,6 +61,17 @@ <item name="buttonBarNegativeButtonStyle">@style/dialogNegativeButtonStyle</item> </style> + <style name="diaryDialogButton" parent="Widget.MaterialComponents.Button.TextButton"> + <item name="android:textColor">@color/colorAccentTintButton</item> + </style> + <style name="diaryButtonNegative" parent="Widget.MaterialComponents.Button.TextButton" /> + + <!-- Contact Diary Dialog--> + <style name="diaryDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert"> + <item name="buttonBarPositiveButtonStyle">@style/diaryDialogButton</item> + <item name="buttonBarNegativeButtonStyle">@style/diaryDialogButton</item> + </style> + <style name="dialogPositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog"> <item name="android:textColor">@color/colorTextTint</item> </style> -- GitLab