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 white & clear themes

Browse Source
This commit is contained in:
J-Jamet
2021-02-18 14:30:28 +01:00
parent 8205454858
commit ebb0e7e118
3 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/values/colors.xml
View File

@@ -26,6 +26,8 @@
<color name="grey_black">#101010</color>
<color name="dark">#0e0e0e</color>
<color name="dark_transparent">#E00E0E0E</color>
<color name="grey_lighter">#ececec</color>
<color name="grey_light">#dddddd</color>
<color name="grey">#bdbdbd</color>
<color name="grey_dark">#9e9e9e</color>
<color name="grey_dark_transparent">#E0424242</color>

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

@@ -20,21 +20,31 @@
<resources>
<!-- Clear Style -->
<style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@color/white</item>
<item name="colorPrimary">@color/grey_light</item>
<item name="colorPrimaryDark">@color/grey</item>
<item name="colorAccent">@color/cyan</item>
<item name="colorAccentLight">@color/cyan_lighter</item>
<item name="colorControlActivated">@color/cyan_lighter</item>
<item name="android:textColorPrimary">@color/cyan_lighter</item>
<item name="android:textColorHintInverse">@color/cyan_lighter</item>
<item name="android:windowBackground">@color/background_light</item>
<item name="android:windowBackground">@color/grey_lighter</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Clear</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Clear</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Clear</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Clear</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Clear</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Clear.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Clear</item>
<item name="cardBackgroundTransparentColor">@color/white_transparent</item>
<item name="android:textColor">@color/text_color_light</item>
<item name="android:editTextColor">@color/colorText</item>
<item name="textColorInverse">@color/colorText</item>
<item name="android:textColorPrimaryInverse">@color/colorText</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/colorTextSecondary</item>
<item name="android:textColorHint">@color/colorTextSecondary</item>
</style>
<!-- Toolbar Style Clear -->
<style name="KeepassDXStyle.Toolbar.Clear" parent="KeepassDXStyle.Clear">
@@ -43,24 +53,37 @@
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
<item name="android:tint">@color/colorText</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="android:colorBackground">@color/grey_light</item>
</style>
<!-- Toolbar Home Clear -->
<style name="KeepassDXStyle.Toolbar.Home.Clear" parent="KeepassDXStyle.Clear">
<style name="KeepassDXStyle.Toolbar.Home.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Clear -->
<style name="KeepassDXStyle.Toolbar.Special.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="android:background">@color/white</item>
<item name="background">@color/white</item>
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Clear</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Clear" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/grey_light</item>
</style>
<!-- Action Toolbar Clear -->
<style name="KeepassDXStyle.Toolbar.Action.Clear" parent="KeepassDXStyle.Toolbar.Clear">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Clear</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Clear" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/grey_light</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Clear.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">#fefefe</item>
<item name="colorAccent">@color/grey</item>
<item name="android:textColorPrimary">@color/cyan</item>
<item name="android:background">@color/white</item>
<item name="background">@color/white</item>
<item name="android:background">@color/grey_light</item>
<item name="background">@color/grey_light</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.Clear" parent="CardView">
<item name="cardBackgroundColor">@color/white</item>
<item name="cardBackgroundColor">@color/grey_lighter</item>
</style>
</resources>

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

@@ -29,10 +29,12 @@
<item name="colorControlActivated">@color/green_darker</item>
<item name="android:textColorPrimary">@color/green</item>
<item name="android:textColorHintInverse">@color/green_light</item>
<item name="android:windowBackground">@color/background_light</item>
<item name="android:windowBackground">@color/white</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.White</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.White</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.White</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.White</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.White</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.White.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.White</item>
@@ -40,7 +42,7 @@
<item name="android:textColor">@color/text_color_light</item>
<item name="android:editTextColor">@color/colorText</item>
<item name="textColorInverse">@color/colorText</item>d
<item name="textColorInverse">@color/colorText</item>
<item name="android:textColorPrimaryInverse">@color/colorText</item>
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
<item name="android:textColorSecondaryInverse">@color/colorTextSecondary</item>
@@ -56,19 +58,27 @@
<item name="android:tint">@color/colorText</item>
<item name="tint">@color/colorText</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.White" parent="KeepassDXStyle.Toolbar.White">
<item name="android:colorBackground">@color/white</item>
</style>
<!-- Toolbar Home White -->
<style name="KeepassDXStyle.Toolbar.Home.White" parent="KeepassDXStyle.Toolbar.White">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.White" parent="KeepassDXStyle.Toolbar.White">
<item name="android:textColor">@color/colorText</item>
<item name="android:colorBackground">@color/white</item>
</style>
<!-- Special Toolbar Black -->
<!-- Special Toolbar White -->
<style name="KeepassDXStyle.Toolbar.Special.White" parent="KeepassDXStyle.Toolbar.White">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.White</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.White" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/white</item>
</style>
<!-- Action Toolbar White -->
<style name="KeepassDXStyle.Toolbar.Action.White" parent="KeepassDXStyle.Toolbar.White">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.White</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.White" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/white</item>
<item name="background">@color/white</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.White.Dialog" parent="KeepassDXStyle.Light.Dialog">