Add new theme "Reply" and fix colors

This commit is contained in:
J-Jamet
2022-02-14 16:00:27 +01:00
parent 69af330ba1
commit bd2f980f8e
21 changed files with 277 additions and 28 deletions

View File

@@ -6,7 +6,7 @@ KeePassDX(3.3.0)
* Merge from file and save as copy #1221 #1204 #840
* Fix custom data #1236
* New UI and fix styles
* Add "Simple" theme
* Add "Simple" and "Reply" themes
KeePassDX(3.2.0)
* Manage data merge #840 #977

View File

@@ -75,6 +75,8 @@ android {
"\"KeepassDXStyle_Blue_Night\"," +
"\"KeepassDXStyle_Red\"," +
"\"KeepassDXStyle_Red_Night\"," +
"\"KeepassDXStyle_Reply\"," +
"\"KeepassDXStyle_Reply_Night\"," +
"\"KeepassDXStyle_Purple\"," +
"\"KeepassDXStyle_Purple_Dark\"}"
buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"

View File

@@ -72,6 +72,7 @@ object Stylish {
context.getString(R.string.list_style_name_simple_night) -> context.getString(R.string.list_style_name_simple)
context.getString(R.string.list_style_name_blue_night) -> context.getString(R.string.list_style_name_blue)
context.getString(R.string.list_style_name_red_night) -> context.getString(R.string.list_style_name_red)
context.getString(R.string.list_style_name_reply_night) -> context.getString(R.string.list_style_name_reply)
context.getString(R.string.list_style_name_purple_dark) -> context.getString(R.string.list_style_name_purple)
else -> styleString
}
@@ -85,6 +86,7 @@ object Stylish {
context.getString(R.string.list_style_name_simple) -> context.getString(R.string.list_style_name_simple_night)
context.getString(R.string.list_style_name_blue) -> context.getString(R.string.list_style_name_blue_night)
context.getString(R.string.list_style_name_red) -> context.getString(R.string.list_style_name_red_night)
context.getString(R.string.list_style_name_reply) -> context.getString(R.string.list_style_name_reply_night)
context.getString(R.string.list_style_name_purple) -> context.getString(R.string.list_style_name_purple_dark)
else -> styleString
}
@@ -121,6 +123,8 @@ object Stylish {
context.getString(R.string.list_style_name_blue_night) -> R.style.KeepassDXStyle_Blue_Night
context.getString(R.string.list_style_name_red) -> R.style.KeepassDXStyle_Red
context.getString(R.string.list_style_name_red_night) -> R.style.KeepassDXStyle_Red_Night
context.getString(R.string.list_style_name_reply) -> R.style.KeepassDXStyle_Reply
context.getString(R.string.list_style_name_reply_night) -> R.style.KeepassDXStyle_Reply_Night
context.getString(R.string.list_style_name_purple) -> R.style.KeepassDXStyle_Purple
context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark
else -> R.style.KeepassDXStyle_Light

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white_grey" android:state_enabled="false" />
<item android:color="@color/white" android:state_enabled="true" />
<item android:color="?attr/colorOnAccentColor" android:state_enabled="true" />
</selector>

View File

@@ -20,7 +20,6 @@
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:title="@string/app_name"
android:layout_width="match_parent"

View File

@@ -34,7 +34,7 @@
android:layout_marginBottom="-12dp"
android:descendantFocusability="blocksDescendants"
android:visibility="gone">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_add_entry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
android:layout_marginBottom="-12dp"
android:descendantFocusability="blocksDescendants"
android:visibility="gone">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_add_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View File

@@ -9,6 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="mini"
android:layout_gravity="center"
android:layout_margin="8dp"
android:contentDescription="@string/lock"
android:src="@drawable/ic_lock_white_padding_24dp"

View File

@@ -434,6 +434,7 @@
<item>Einfach</item>
<item>Mond</item>
<item>Sonne</item>
<item>Antwort</item>
<item>Kunzite</item>
</string-array>
<string name="warning_database_read_only">Datei Schreibrechte gewähren, um Datenbankänderungen zu speichern</string>

View File

@@ -269,6 +269,7 @@
<item>Simple</item>
<item>Lune</item>
<item>Soleil</item>
<item>Réponse</item>
<item>Kunzite</item>
</string-array>
<string name="icon_pack_choose_title">Collection dicônes</string>

View File

@@ -479,6 +479,7 @@
<item>Simple</item>
<item>Moon</item>
<item>Sun</item>
<item>Reply</item>
<item>Kunzite</item>
</string-array>
<string name="icon_pack_choose_title">アイコンパック</string>

View File

@@ -48,7 +48,11 @@
</style>
<!-- Button Style -->
<style name="KeepassDXStyle.v21.Button" parent="Base.TextAppearance.AppCompat.Button" >
<style name="KeepassDXStyle.v21.Button" parent="KeepassDXStyle.v23.Button" >
<item name="android:gravity">center</item>
<item name="android:elevation">4dp</item>
</style>
<style name="KeepassDXStyle.v21.Button.Primary" parent="KeepassDXStyle.v23.Button.Primary" >
<item name="android:gravity">center</item>
<item name="android:elevation">4dp</item>
</style>
@@ -58,7 +62,7 @@
</style>
<!-- FAB -->
<style name="KeepassDXStyle.v21.Fab" parent="Theme.AppCompat.DayNight">
<style name="KeepassDXStyle.v21.Fab" parent="Widget.Design.FloatingActionButton">
<item name="android:elevation">4dp</item>
</style>

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2021 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="KeepassDXStyle.Reply" parent="KeepassDXStyle.Reply.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Reply.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Reply.DateTime.Dialog</item>
</style>
<style name="KeepassDXStyle.Reply.Night" parent="KeepassDXStyle.Reply.Night.v21" >
<item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Reply.Night.DateTime.Dialog</item>
<item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Reply.Night.DateTime.Dialog</item>
</style>
</resources>

View File

@@ -42,9 +42,7 @@
<string translatable="false" name="clip_path_scan_top">M0 0 L160 0 L160 40 L0 40 Z</string>
<string translatable="false" name="clip_path_scan_bottom">M0 120 L160 120 L160 160 L0 160 Z</string>
<color name="fingerprint_ridge">#deffffff</color>
<color name="fingerprint_ridge_scan">#ffffffff</color>
<color name="circle_default">#ff607d8b</color>
<color name="fingerprint_ridge">?attr/colorOnAccentColor</color>
<color name="fingerprint_ridge_scan">?attr/colorOnAccentColor</color>
</resources>

View File

@@ -21,4 +21,11 @@
<style name="KeepassDXStyle.Light.WhiteBar.v23" parent="KeepassDXStyle.Light" >
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="KeepassDXStyle.v23.Button" parent="Base.TextAppearance.MaterialComponents.Button">
<item name="android:drawableTint">?attr/colorOnAccentColor</item>
</style>
<style name="KeepassDXStyle.v23.Button.Primary" parent="Base.TextAppearance.MaterialComponents.Button">
<item name="android:drawableTint">?attr/textColorInverse</item>
</style>
</resources>

View File

@@ -41,16 +41,6 @@
<color name="black">#000001</color> <!-- #000001 To fix refresh theme -->
<color name="black_transparent">#E0000000</color>
<color name="white_slight">#FCFCFF</color>
<color name="white_slight_transparent">#E0FCFCFF</color>
<color name="grey_slight">#202124</color>
<color name="grey_slight_transparent">#E0202124</color>
<color name="grey_black_slight">#3E4247</color>
<color name="grey_blue_slight">#3c474c</color>
<color name="grey_blue_deep">#263238</color>
<color name="blue_slight">#5E97F6</color>
<color name="blue_deep">#1860D2</color>
<color name="blue_white">#E6F3FF</color>
<color name="blue_white_dark">#90CAF9</color>
<color name="blue_lighter">#5DB2F6</color>
@@ -97,4 +87,26 @@
<color name="black_purple">#451D5D</color>
<color name="black_purple_transparent">#E0451D5D</color>
<color name="black_purple_dark">#361748</color>
<color name="white_slight">#FCFCFF</color>
<color name="white_slight_transparent">#E0FCFCFF</color>
<color name="grey_slight">#202124</color>
<color name="grey_slight_transparent">#E0202124</color>
<color name="grey_black_slight">#3E4247</color>
<color name="grey_blue_slight">#3c474c</color>
<color name="grey_blue_deep">#263238</color>
<color name="blue_slight">#5E97F6</color>
<color name="blue_deep">#1A73E8</color>
<color name="reply_orange_light">#FFBA52</color>
<color name="reply_orange">#F9AA33</color>
<color name="reply_blue_lighter">#EDF0F2</color>
<color name="reply_blue_light">#D1DBE0</color>
<color name="reply_blue">#4A6572</color>
<color name="reply_blue_dark">#344955</color>
<color name="reply_black_transparent">#E0232F34</color>
<color name="reply_black">#232F34</color>
<color name="reply_black_dark">#27343A</color>
<color name="reply_grey">#414445</color>
</resources>

View File

@@ -330,6 +330,8 @@
<string name="list_style_name_blue_night" translatable="false">KeepassDXStyle_Blue_Night</string>
<string name="list_style_name_red" translatable="false">KeepassDXStyle_Red</string>
<string name="list_style_name_red_night" translatable="false">KeepassDXStyle_Red_Night</string>
<string name="list_style_name_reply" translatable="false">KeepassDXStyle_Reply</string>
<string name="list_style_name_reply_night" translatable="false">KeepassDXStyle_Reply_Night</string>
<string name="list_style_name_purple" translatable="false">KeepassDXStyle_Purple</string>
<string name="list_style_name_purple_dark" translatable="false">KeepassDXStyle_Purple_Dark</string>
<string-array name="list_style_values_light">
@@ -339,6 +341,7 @@
<item translatable="false">@string/list_style_name_simple</item>
<item translatable="false">@string/list_style_name_blue</item>
<item translatable="false">@string/list_style_name_red</item>
<item translatable="false">@string/list_style_name_reply</item>
<item translatable="false">@string/list_style_name_purple</item>
</string-array>
<string-array name="list_style_values_night">
@@ -348,6 +351,7 @@
<item translatable="false">@string/list_style_name_simple_night</item>
<item translatable="false">@string/list_style_name_blue_night</item>
<item translatable="false">@string/list_style_name_red_night</item>
<item translatable="false">@string/list_style_name_reply_night</item>
<item translatable="false">@string/list_style_name_purple_dark</item>
</string-array>
<string name="list_style_brightness_light" translatable="false">KeepassDXStyle_Brightness_Light</string>

View File

@@ -639,6 +639,7 @@
<item>Simple</item>
<item>Moon</item>
<item>Sun</item>
<item>Reply</item>
<item>Kunzite</item>
</string-array>
<string name="style_brightness_title">Theme brightness</string>

View File

@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<!-- Light Blue Style -->
<style name="KeepassDXStyle.Reply" parent="KeepassDXStyle.Reply.v21" />
<style name="KeepassDXStyle.Reply.v21" parent="KeepassDXStyle.Light" >
<item name="colorPrimary">@color/reply_blue_dark</item>
<item name="colorPrimaryDark">@color/reply_blue</item>
<item name="colorAccent">@color/reply_orange</item>
<item name="colorAccentLight">@color/reply_orange_light</item>
<item name="colorControlActivated">@color/reply_blue_light</item>
<item name="android:textColorPrimary">@color/reply_blue</item>
<item name="android:textColorHintInverse">@color/reply_orange</item>
<item name="android:textColorSecondaryInverse">@color/reply_orange</item>
<item name="android:windowBackground">@color/reply_blue_lighter</item>
<item name="toolbarColorControl">@color/reply_blue_light</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Reply</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Reply</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Reply</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Reply</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Dialog</item>
<item name="educationCircleColor">@color/reply_orange</item>
<item name="educationTextColor">@color/reply_black</item>
<item name="colorOnAccentColor">@color/reply_black</item>
<item name="chipFilterTextColor">@color/reply_black</item>
<item name="chipFilterBackgroundColor">@color/reply_orange</item>
<item name="chipFilterBackgroundColorDisabled">@color/reply_blue_light</item>
</style>
<!-- Toolbar Style Reply -->
<style name="KeepassDXStyle.Toolbar.Reply" parent="KeepassDXStyle.Reply">
<item name="colorControlActivated">@color/reply_blue_light</item>
<item name="colorControlNormal">@color/reply_blue_lighter</item>
<item name="android:textColorPrimary">@color/reply_blue_light</item>
<item name="android:textColorSecondary">@color/reply_orange_light</item>
<item name="android:editTextColor">@color/reply_blue_light</item>
<item name="android:textColorHint">@color/reply_orange_light</item>
<item name="android:tint">@color/reply_blue_light</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Reply" parent="KeepassDXStyle.Toolbar.Reply">
<item name="android:colorBackground">@color/reply_blue_lighter</item>
</style>
<!-- Toolbar Home Reply -->
<style name="KeepassDXStyle.Toolbar.Home.Reply" parent="KeepassDXStyle.Toolbar.Reply">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Reply -->
<style name="KeepassDXStyle.Toolbar.Special.Reply" parent="KeepassDXStyle.Toolbar.Reply">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Reply</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Reply" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/reply_blue_dark</item>
</style>
<!-- Action Toolbar Reply -->
<style name="KeepassDXStyle.Toolbar.Action.Reply" parent="KeepassDXStyle.Toolbar.Reply">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Reply</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Reply" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/reply_blue_dark</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Reply.Dialog" parent="KeepassDXStyle.Light.Dialog">
<item name="colorAccent">@color/reply_orange</item>
<item name="android:textColorPrimary">@color/reply_blue_dark</item>
<item name="android:background">@color/reply_blue_lighter</item>
<item name="background">@color/reply_blue_lighter</item>
</style>
<style name="KeepassDXStyle.Reply.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/reply_blue_dark</item>
<item name="android:textColorPrimary">@color/reply_blue_dark</item>
<item name="android:windowBackground">@color/reply_blue_lighter</item>
</style>
<!-- Dark Reply Style -->
<style name="KeepassDXStyle.Reply.Night" parent="KeepassDXStyle.Reply.Night.v21" />
<style name="KeepassDXStyle.Reply.Night.v21" parent="KeepassDXStyle.Night" >
<item name="colorPrimary">@color/reply_blue_dark</item>
<item name="colorPrimaryDark">@color/reply_black</item>
<item name="colorAccent">@color/reply_orange</item>
<item name="colorAccentLight">@color/reply_orange_light</item>
<item name="colorControlActivated">@color/reply_blue_light</item>
<item name="android:textColorPrimary">@color/reply_blue_lighter</item>
<item name="android:textColorHintInverse">@color/reply_blue_light</item>
<item name="android:textColorSecondaryInverse">@color/reply_blue_light</item>
<item name="android:windowBackground">@color/reply_black</item>
<item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Reply.Night</item>
<item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Reply.Night</item>
<item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Reply.Night</item>
<item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Reply.Night</item>
<item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Reply.Night</item>
<item name="android:alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
<item name="alertDialogTheme">@style/KeepassDXStyle.Reply.Night.Dialog</item>
<item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Reply.Night</item>
<item name="cardBackgroundTransparentColor">@color/reply_black_transparent</item>
<item name="educationCircleColor">@color/reply_orange</item>
<item name="educationTextColor">@color/reply_black</item>
<item name="colorOnAccentColor">@color/reply_black</item>
<item name="chipFilterTextColor">@color/reply_black</item>
<item name="chipFilterBackgroundColor">@color/reply_orange</item>
<item name="chipFilterBackgroundColorDisabled">@color/reply_blue_light</item>
</style>
<!-- Toolbar Style Reply -->
<style name="KeepassDXStyle.Toolbar.Reply.Night" parent="KeepassDXStyle.Reply.Night">
<item name="colorControlActivated">@color/reply_blue_light</item>
<item name="colorControlNormal">@color/reply_blue_lighter</item>
<item name="android:textColorPrimary">@color/reply_blue_light</item>
<item name="android:textColorSecondary">@color/reply_orange_light</item>
<item name="android:editTextColor">@color/reply_blue_light</item>
<item name="android:textColorHint">@color/reply_orange_light</item>
<item name="android:tint">@color/reply_blue_light</item>
</style>
<!-- Toolbar Popup menu -->
<style name="KeepassDXStyle.Toolbar.Popup.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
<item name="android:colorBackground">@color/reply_black</item>
</style>
<!-- Toolbar Home Reply -->
<style name="KeepassDXStyle.Toolbar.Home.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
<item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
</style>
<!-- Special Toolbar Reply -->
<style name="KeepassDXStyle.Toolbar.Special.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Reply.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Special.Reply.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
<item name="android:background">@color/reply_black</item>
</style>
<!-- Action Toolbar Reply -->
<style name="KeepassDXStyle.Toolbar.Action.Reply.Night" parent="KeepassDXStyle.Toolbar.Reply.Night">
<item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Reply.Night</item>
</style>
<style name="KeepassDXStyle.Toolbar.Widget.Action.Reply.Night" parent="Widget.AppCompat.Toolbar">
<item name="android:background">@color/reply_blue_dark</item>
</style>
<!-- Dialog -->
<style name="KeepassDXStyle.Reply.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
<item name="colorAccent">@color/reply_blue_lighter</item>
<item name="android:textColorPrimary">@color/reply_orange</item>
<item name="android:background">@color/reply_black</item>
<item name="background">@color/reply_black</item>
</style>
<style name="KeepassDXStyle.Reply.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
<item name="colorAccent">@color/reply_blue_dark</item>
<item name="android:textColorPrimary">@color/reply_orange</item>
<item name="android:windowBackground">@color/reply_black</item>
</style>
<!-- CardView -->
<style name="KeepassDXStyle.Cardview.Reply.Night" parent="KeepassDXStyle.Cardview">
<item name="cardBackgroundColor">@color/reply_black_dark</item>
</style>
</resources>

View File

@@ -396,7 +396,7 @@
<style name="KeepassDXStyle.TextAppearance.Info" parent="KeepassDXStyle.TextAppearance">
<item name="android:textSize">12sp</item>
<item name="android:textColor">@color/white</item>
<item name="android:textColor">?attr/colorOnAccentColor</item>
<item name="android:background">@drawable/background_rounded_square</item>
<item name="backgroundTint">?attr/colorAccent</item>
</style>
@@ -442,7 +442,12 @@
</style>
<!-- Button Style -->
<style name="KeepassDXStyle.v21.Button" parent="Base.TextAppearance.MaterialComponents.Button">
<style name="KeepassDXStyle.v23.Button" parent="Base.TextAppearance.MaterialComponents.Button" />
<style name="KeepassDXStyle.v23.Button.Primary" parent="Base.TextAppearance.MaterialComponents.Button" />
<style name="KeepassDXStyle.v21.Button" parent="KeepassDXStyle.v23.Button">
<item name="android:gravity">center</item>
</style>
<style name="KeepassDXStyle.v21.Button.Primary" parent="KeepassDXStyle.v23.Button.Primary">
<item name="android:gravity">center</item>
</style>
<style name="KeepassDXStyle.v21.ImageButton" parent="Widget.AppCompat.ImageButton">
@@ -452,11 +457,13 @@
<item name="android:textColor">@color/text_color_button</item>
<item name="android:background">@drawable/background_button</item>
<item name="backgroundTint">@color/background_button_color_accent</item>
<item name="drawableTint">?attr/colorOnAccentColor</item>
</style>
<style name="KeepassDXStyle.Button.Primary" parent="KeepassDXStyle.v21.Button">
<style name="KeepassDXStyle.Button.Primary" parent="KeepassDXStyle.v21.Button.Primary">
<item name="android:textColor">?attr/textColorInverse</item>
<item name="android:background">@drawable/background_button</item>
<item name="backgroundTint">@color/background_button_color_primary</item>
<item name="drawableTint">?attr/textColorInverse</item>
</style>
<style name="KeepassDXStyle.ImageButton" parent="KeepassDXStyle.v21.ImageButton">
<item name="android:colorForeground">?attr/textColorInverse</item>
@@ -497,7 +504,7 @@
</style>
<!-- FAB -->
<style name="KeepassDXStyle.v21.Fab" parent="KeepassDXStyle.Light.v21" />
<style name="KeepassDXStyle.v21.Fab" parent="Widget.Design.FloatingActionButton" />
<style name="KeepassDXStyle.Fab" parent="KeepassDXStyle.v21.Fab">
</style>
<style name="KeepassDXStyle.Fab.Special" parent="KeepassDXStyle.v21.Fab">
@@ -510,7 +517,7 @@
</style>
<style name="KeepassDXStyle.FabMenu" parent="KeepassDXStyle.v21.FabMenu">
<item name="android:textSize">15sp</item>
<item name="android:textColor">@color/white</item>
<item name="android:textColor">?attr/colorOnAccentColor</item>
<item name="android:background">@drawable/background_button_small</item>
<item name="backgroundTint">@color/background_button_color_accent</item>
</style>

View File

@@ -5,4 +5,4 @@
* Merge from file and save as copy #1221 #1204 #840
* Fix custom data #1236
* New UI and fix styles
* Add "Simple" theme
* Add "Simple" and "Reply" themes

View File

@@ -5,4 +5,4 @@
* Fusion depuis un fichier et sauvegarde de copie #1221 #1204 #840
* Correction des données customisées #1236
* Nouvelle interface utilisateur et correction des styles
* Ajout du thème "Simple"
* Ajout des thèmes "Simple" et "Réponse"