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 red & blue themes

Browse Source
This commit is contained in:
J-Jamet
2021-02-18 14:05:10 +01:00
parent 9900f8fecb
commit 8205454858
6 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/res/values/style_blue.xml
View File

@@ -31,6 +31,7 @@
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item> <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue</item> <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item> <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Dialog</item>
</style> </style>
@@ -45,14 +46,22 @@
<item name="android:tint">@color/colorTextInverse</item> <item name="android:tint">@color/colorTextInverse</item>
</style> </style>
<!-- Toolbar Home Blue --> <!-- Toolbar Home Blue -->
<style name="KeepassDXStyle.Toolbar.Home.Blue" parent="KeepassDXStyle.Blue"> <style name="KeepassDXStyle.Toolbar.Home.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item> <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style> </style>
<!-- Special Toolbar Blue --> <!-- Special Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Special.Blue" parent="KeepassDXStyle.Toolbar.Blue"> <style name="KeepassDXStyle.Toolbar.Special.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="actionMenuTextColor">@color/colorTextInverse</item> <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Blue</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Blue" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/blue_dark</item> <item name="android:background">@color/blue_dark</item>
<item name="background">@color/blue_dark</item> </style>
<!-- Action Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Action.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Blue</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Blue" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/blue</item>
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">

19
app/src/main/res/values/style_blue_night.xml
View File

@@ -31,9 +31,9 @@
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue.Night</item> <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue.Night</item> <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue.Night</item> <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Blue.Night</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Blue.Night.Dialog</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Blue.Night</item>
</style> </style>
<!-- Toolbar Style Blue --> <!-- Toolbar Style Blue -->
<style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night"> <style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night">
@@ -46,19 +46,22 @@
<item name="android:tint">@color/colorTextInverse</item> <item name="android:tint">@color/colorTextInverse</item>
</style> </style>
<!-- Toolbar Home Blue --> <!-- Toolbar Home Blue -->
<style name="KeepassDXStyle.Toolbar.Home.Blue.Night" parent="KeepassDXStyle.Blue.Night"> <style name="KeepassDXStyle.Toolbar.Home.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item> <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style> </style>
<!-- Special Toolbar Blue --> <!-- Special Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night"> <style name="KeepassDXStyle.Toolbar.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
<item name="actionMenuTextColor">@color/colorTextInverse</item> <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Blue.Night</item>
<item name="android:background">@color/blue_dark</item>
<item name="background">@color/blue_dark</item>
</style> </style>
<!-- Contextual Action Bar Blue --> <style name="KeepassDXStyle.Toolbar.Widget.Special.Blue.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
<style name="KeepassDXStyle.ActionMode.Blue.Night" parent="@style/Widget.AppCompat.ActionMode">
<item name="android:background">@color/blue_dark</item> <item name="android:background">@color/blue_dark</item>
<item name="background">@color/blue_dark</item> </style>
<!-- Action Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Action.Blue.Night" parent="KeepassDXStyle.Toolbar.Blue.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Blue.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Blue.Night" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/blue</item>
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">

6
app/src/main/res/values/style_clear.xml
View File

@@ -33,7 +33,6 @@
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Clear</item> <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Clear</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Clear</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Clear</item> <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Clear</item>
<item name="cardBackgroundTransparentColor">@color/white_transparent</item> <item name="cardBackgroundTransparentColor">@color/white_transparent</item>
</style> </style>
@@ -53,11 +52,6 @@
<item name="android:background">@color/white</item> <item name="android:background">@color/white</item>
<item name="background">@color/white</item> <item name="background">@color/white</item>
</style> </style>
<!-- Contextual Action Bar Clear -->
<style name="KeepassDXStyle.ActionMode.Clear" parent="@style/Widget.AppCompat.ActionMode">
<item name="android:background">@color/white</item>
<item name="background">@color/white</item>
</style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">#fefefe</item> <item name="colorAccent">#fefefe</item>

17
app/src/main/res/values/style_red.xml
View File

@@ -27,10 +27,11 @@
<item name="colorControlActivated">@color/orange</item> <item name="colorControlActivated">@color/orange</item>
<item name="android:textColorPrimary">@color/red</item> <item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorHintInverse">@color/red_lighter</item> <item name="android:textColorHintInverse">@color/red_lighter</item>
<item name="android:windowBackground">@color/background_night</item> <item name="android:windowBackground">@color/background_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item> <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red</item> <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item> <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Red</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Dialog</item>
</style> </style>
@@ -45,14 +46,22 @@
<item name="android:tint">@color/colorTextInverse</item> <item name="android:tint">@color/colorTextInverse</item>
</style> </style>
<!-- Toolbar Home Red --> <!-- Toolbar Home Red -->
<style name="KeepassDXStyle.Toolbar.Home.Red" parent="KeepassDXStyle.Red"> <style name="KeepassDXStyle.Toolbar.Home.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item> <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style> </style>
<!-- Special Toolbar Red --> <!-- Special Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Special.Red" parent="KeepassDXStyle.Toolbar.Red"> <style name="KeepassDXStyle.Toolbar.Special.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="actionMenuTextColor">@color/colorTextInverse</item> <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Red</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Red" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/red_dark</item> <item name="android:background">@color/red_dark</item>
<item name="background">@color/red_dark</item> </style>
<!-- Action Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Action.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Red</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Red" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/red</item>
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.Red.Dialog" parent="KeepassDXStyle.Light.Dialog">

20
app/src/main/res/values/style_red_night.xml
View File

@@ -31,9 +31,9 @@
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red.Night</item> <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red.Night</item> <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red.Night</item> <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Red.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Red.Night</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.Red.Night.Dialog</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Red.Night</item>
</style> </style>
<!-- Toolbar Style Red --> <!-- Toolbar Style Red -->
<style name="KeepassDXStyle.Toolbar.Red.Night" parent="KeepassDXStyle.Red.Night"> <style name="KeepassDXStyle.Toolbar.Red.Night" parent="KeepassDXStyle.Red.Night">
@@ -46,18 +46,22 @@
<item name="android:tint">@color/colorTextInverse</item> <item name="android:tint">@color/colorTextInverse</item>
</style> </style>
<!-- Toolbar Home Red --> <!-- Toolbar Home Red -->
<style name="KeepassDXStyle.Toolbar.Home.Red.Night" parent="KeepassDXStyle.Red.Night"> <style name="KeepassDXStyle.Toolbar.Home.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item> <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style> </style>
<!-- Special Toolbar Red --> <!-- Special Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Special.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night"> <style name="KeepassDXStyle.Toolbar.Special.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
<item name="android:background">@color/red_dark</item> <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Red.Night</item>
<item name="background">@color/red_dark</item>
</style> </style>
<!-- Contextual Action Bar Red --> <style name="KeepassDXStyle.Toolbar.Widget.Special.Red.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
<style name="KeepassDXStyle.ActionMode.Red.Night" parent="@style/Widget.AppCompat.ActionMode"> <item name="android:background">@color/red_dark</item>
<item name="android:background">@color/orange</item> </style>
<item name="background">@color/orange</item> <!-- Action Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Action.Red.Night" parent="KeepassDXStyle.Toolbar.Red.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Red.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Red.Night" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/red</item>
</style> </style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog"> <style name="KeepassDXStyle.Red.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">

6
app/src/main/res/values/style_white.xml
View File

@@ -35,7 +35,6 @@
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.White</item> <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.White</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item> <item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item> <item name="alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.White</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.White</item> <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.White</item>
<item name="cardBackgroundTransparentColor">@color/white_transparent</item> <item name="cardBackgroundTransparentColor">@color/white_transparent</item>
@@ -71,11 +70,6 @@
<item name="android:background">@color/white</item> <item name="android:background">@color/white</item>
<item name="background">@color/white</item> <item name="background">@color/white</item>
</style> </style>
<!-- Contextual Action Bar Dark -->
<style name="KeepassDXStyle.ActionMode.White" parent="@style/Widget.AppCompat.ActionMode">
<item name="android:background">@color/white</item>
<item name="background">@color/white</item>
</style>
<!-- Dialog --> <!-- Dialog -->
<style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog"> <style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/orange_dark</item> <item name="colorAccent">@color/orange_dark</item>