rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix dialog theme

Browse Source
This commit is contained in:
J-Jamet
2020-03-18 11:45:52 +01:00
parent 68564a2b75
commit 1abba80045
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/values-v21/styles.xml
View File

@@ -22,10 +22,14 @@
<style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" > <style name="KeepassDXStyle.Light" parent="KeepassDXStyle.Light.v21" >
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item> <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Light.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Light.DateTime.Dialog</item>
</style> </style>
<style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" > <style name="KeepassDXStyle.Night" parent="KeepassDXStyle.Night.v21" >
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item> <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Night.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Night.DateTime.Dialog</item>
</style> </style>
<!-- Button Style --> <!-- Button Style -->

41
app/src/main/res/values/styles.xml
View File

@@ -68,8 +68,8 @@
<item name="iconPreferenceColor">@color/text_color_secondary_light</item> <item name="iconPreferenceColor">@color/text_color_secondary_light</item>
<!-- Dialog --> <!-- Dialog -->
<item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Dialog.NegativeButton</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
<item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Dialog.PositiveButton</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Light.Dialog</item>
<!-- Toolbar --> <!-- Toolbar -->
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item> <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
@@ -121,13 +121,10 @@
<item name="iconPreferenceColor">@color/text_color_secondary_night</item> <item name="iconPreferenceColor">@color/text_color_secondary_night</item>
<!-- Dialog -->
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Night.Dialog</item>
<!-- Dialog -->
<item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Dialog.NegativeButton</item>
<item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Dialog.PositiveButton</item>
<!-- Toolbar --> <!-- Toolbar -->
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item> <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Night.Toolbar.Popup</item> <item name="toolbarPopupAppearance">@style/KeepassDXStyle.Night.Toolbar.Popup</item>
@@ -178,13 +175,10 @@
<item name="iconPreferenceColor">@color/text_color_secondary_night</item> <item name="iconPreferenceColor">@color/text_color_secondary_night</item>
<!-- Dialog -->
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<!-- Dialog -->
<item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Dialog.NegativeButton</item>
<item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Dialog.PositiveButton</item>
<!-- Toolbar --> <!-- Toolbar -->
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item> <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Black.Toolbar.Popup</item> <item name="toolbarPopupAppearance">@style/KeepassDXStyle.Black.Toolbar.Popup</item>
@@ -266,25 +260,30 @@
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Night.Dialog" parent="Theme.AppCompat.Dialog.Alert"> <style name="KeepassDXStyle.Light.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="colorAccent">@color/orange</item>
<item name="android:textColorPrimary">@color/green</item>
<item name="android:background">@color/background_light</item>
</style>
<style name="KeepassDXStyle.Night.Dialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorAccent">@color/orange</item> <item name="colorAccent">@color/orange</item>
<item name="android:textColorPrimary">@color/green</item> <item name="android:textColorPrimary">@color/green</item>
<item name="android:background">@color/background_night</item> <item name="android:background">@color/background_night</item>
<item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Dialog.NegativeButton</item>
<item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Dialog.PositiveButton</item>
</style> </style>
<style name="KeepassDXStyle.Black.Dialog" parent="Theme.AppCompat.Dialog.Alert"> <style name="KeepassDXStyle.Black.Dialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorAccent">@color/orange_dark</item> <item name="colorAccent">@color/orange_dark</item>
<item name="android:textColorPrimary">@color/green_dark</item> <item name="android:textColorPrimary">@color/green_dark</item>
<item name="android:background">@color/dark</item> <item name="android:background">@color/black</item>
<item name="buttonBarNegativeButtonStyle">@style/KeepassDXStyle.Dialog.NegativeButton</item>
<item name="buttonBarPositiveButtonStyle">@style/KeepassDXStyle.Dialog.PositiveButton</item>
</style> </style>
<style name="KeepassDXStyle.Dialog.NegativeButton" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog"> <style name="KeepassDXStyle.Light.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="android:textColor">?attr/colorAccent</item> <item name="colorAccent">@color/orange</item>
<item name="android:textColorPrimary">@color/green_dark</item>
<item name="android:windowBackground">@color/background_light</item>
</style> </style>
<style name="KeepassDXStyle.Dialog.PositiveButton" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog"> <style name="KeepassDXStyle.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="colorAccent">@color/orange_dark</item>
<item name="android:textColorPrimary">@color/green_light</item>
<item name="android:windowBackground">@color/background_night</item>
</style> </style>
<!-- CheckBox --> <!-- CheckBox -->