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 styles color in Kitkat

Browse Source
This commit is contained in:
J-Jamet
2020-09-01 13:22:41 +02:00
parent c2f7897f10
commit 357ee3daf0
9 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/layout/activity_file_selection.xml
View File

@@ -125,10 +125,11 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_info_hint_color_24dp"
app:navigationIcon="@drawable/ic_info_white_24dp"
app:navigationContentDescription="@string/about"
android:elevation="4dp"
app:layout_collapseMode="pin"
android:theme="?attr/toolbarHomeAppearance"
android:popupTheme="?attr/toolbarPopupAppearance" />
</com.google.android.material.appbar.CollapsingToolbarLayout>

2
app/src/main/res/layout/item_list_nodes_entry.xml
View File

@@ -93,7 +93,7 @@
android:layout_marginRight="@dimen/image_list_margin"
android:layout_marginEnd="@dimen/image_list_margin"
android:src="@drawable/ic_attach_file_white_24dp"
style="@style/KeepassDXStyle.TextAppearance.Entry.SubTitle"
style="@style/KeepassDXStyle.TextAppearance.Entry.Icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

1
app/src/main/res/values/attrs.xml
View File

@@ -19,6 +19,7 @@
-->
<resources>
<attr name="toolbarAppearance" format="reference" />
<attr name="toolbarHomeAppearance" format="reference" />
<attr name="specialToolbarAppearance" format="reference" />
<attr name="actionToolbarAppearance" format="reference" />
<attr name="toolbarPopupAppearance" format="reference" />

5
app/src/main/res/values/style_black.xml
View File

@@ -30,6 +30,7 @@
<item name="android:textColorHintInverse">@color/green_light</item>
<item name="android:windowBackground">@color/background_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Black</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Black</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Black</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Black.Dialog</item>
@@ -45,6 +46,10 @@
<item name="android:textColorHint">@color/green_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Black -->
<style name="KeepassDXStyle.Toolbar.Home.Black" parent="KeepassDXStyle.Black">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Black -->
<style name="KeepassDXStyle.Toolbar.Special.Black" parent="KeepassDXStyle.Toolbar.Black">
<item name="android:background">@color/black</item>

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

@@ -29,6 +29,7 @@
<item name="android:textColorHintInverse">@color/blue_lighter</item>
<item name="android:windowBackground">@color/background_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Blue</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Blue</item>
</style>
@@ -42,6 +43,10 @@
<item name="android:textColorHint">@color/blue_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Blue -->
<style name="KeepassDXStyle.Toolbar.Home.Blue" parent="KeepassDXStyle.Blue">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Blue -->
<style name="KeepassDXStyle.Toolbar.Special.Blue" parent="KeepassDXStyle.Toolbar.Blue">
<item name="actionMenuTextColor">@color/colorTextInverse</item>

5
app/src/main/res/values/style_dark.xml
View File

@@ -29,6 +29,7 @@
<item name="android:textColorHintInverse">@color/cyan_lighter</item>
<item name="android:windowBackground">@color/background_dark</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Dark</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Dark</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Dark</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Dark.Dialog</item>
@@ -42,6 +43,10 @@
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Dark -->
<style name="KeepassDXStyle.Toolbar.Home.Dark" parent="KeepassDXStyle.Dark">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Dark -->
<style name="KeepassDXStyle.Toolbar.Special.Dark" parent="KeepassDXStyle.Toolbar.Dark">
<item name="android:background">@color/dark</item>

5
app/src/main/res/values/style_purple.xml
View File

@@ -30,6 +30,7 @@
<item name="android:textColorHintInverse">@color/purple_lighter</item>
<item name="android:windowBackground">@color/background_purple</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Purple</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Purple</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Purple</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Purple.Dialog</item>
@@ -46,6 +47,10 @@
<item name="android:textColorHint">@color/purple_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Purple -->
<style name="KeepassDXStyle.Toolbar.Home.Purple" parent="KeepassDXStyle.Purple">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Purple -->
<style name="KeepassDXStyle.Toolbar.Special.Purple" parent="KeepassDXStyle.Toolbar.Purple">
<item name="android:background">@color/purple_dark</item>

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

@@ -29,6 +29,7 @@
<item name="android:textColorHintInverse">@color/red_lighter</item>
<item name="android:windowBackground">@color/background_night</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Red</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Red</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Red</item>
<item name="actionModeStyle">@style/KeepassDXStyle.ActionMode.Red</item>
</style>
@@ -42,6 +43,10 @@
<item name="android:textColorHint">@color/red_lighter</item>
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home Red -->
<style name="KeepassDXStyle.Toolbar.Home.Red" parent="KeepassDXStyle.Red">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Red -->
<style name="KeepassDXStyle.Toolbar.Special.Red" parent="KeepassDXStyle.Toolbar.Red">
<item name="android:background">@color/red_dark</item>

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

@@ -75,6 +75,7 @@
<!-- Toolbar -->
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Light</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Light.Toolbar.Popup</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Light</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Light</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
<item name="bottomAppBarStyle">@style/KeepassDXStyle.Toolbar.Bottom</item>
@@ -131,6 +132,7 @@
<!-- Toolbar -->
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Night</item>
<item name="toolbarPopupAppearance">@style/KeepassDXStyle.Night.Toolbar.Popup</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Night</item>
<item name="specialToolbarAppearance">@style/KeepassDXStyle.Toolbar.Special.Night</item>
<item name="actionToolbarAppearance">@style/KeepassDXStyle.Toolbar.Action</item>
<item name="bottomAppBarStyle">@style/KeepassDXStyle.Toolbar.Bottom</item>
@@ -184,6 +186,18 @@
<item name="android:tint">@color/colorTextInverse</item>
</style>
<!-- Toolbar Home -->
<style name="KeepassDXStyle.Toolbar.Navigation.Tinted" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="tint">?android:attr/textColorHintInverse</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Light" parent="KeepassDXStyle.Light.v21">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<style name="KeepassDXStyle.Toolbar.Home.Night" parent="KeepassDXStyle.Night.v21">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<style name="KeepassDXStyle.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textColor">@color/colorTextInverse</item>
</style>
@@ -333,6 +347,9 @@
<item name="android:textColor">@color/entry_subtitle_color</item>
<item name="android:tint">@color/entry_subtitle_color</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Entry.Icon" parent="KeepassDXStyle.TextAppearance.Small">
<item name="tint">@color/entry_subtitle_color</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Group.Title" parent="KeepassDXStyle.TextAppearance">
<item name="android:textColor">@color/group_title_color</item>
<item name="android:tint">@color/group_title_color</item>