From 937695a1e5d0a448441fed5b28b88b1e216955c0 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 18 Feb 2021 10:50:29 +0100 Subject: [PATCH 01/26] First commit to implement Dark mode --- app/build.gradle | 14 ++- .../keepass/activities/stylish/Stylish.kt | 47 ++++++++-- .../settings/NestedAppSettingsFragment.kt | 2 +- app/src/main/res/values-de/strings.xml | 8 +- app/src/main/res/values-fr/strings.xml | 8 +- app/src/main/res/values-ja/strings.xml | 8 +- app/src/main/res/values-v21/styles.xml | 2 +- app/src/main/res/values/donottranslate.xml | 8 ++ app/src/main/res/values/strings.xml | 8 +- app/src/main/res/values/style_black.xml | 2 +- app/src/main/res/values/style_blue_night.xml | 68 ++++++++++++++ app/src/main/res/values/style_clear.xml | 72 +++++++++++++++ app/src/main/res/values/style_red.xml | 5 +- app/src/main/res/values/style_red_night.xml | 67 ++++++++++++++ app/src/main/res/values/style_white.xml | 90 +++++++++++++++++++ app/src/main/res/values/styles.xml | 4 +- 16 files changed, 391 insertions(+), 22 deletions(-) create mode 100644 app/src/main/res/values/style_blue_night.xml create mode 100644 app/src/main/res/values/style_clear.xml create mode 100644 app/src/main/res/values/style_red_night.xml create mode 100644 app/src/main/res/values/style_white.xml diff --git a/app/build.gradle b/app/build.gradle index d03513295..ad38178f0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,11 @@ android { buildConfigField "String", "BUILD_VERSION", "\"libre\"" buildConfigField "boolean", "FULL_VERSION", "true" buildConfigField "boolean", "CLOSED_STORE", "false" - buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}" + buildConfigField "String[]", "STYLES_DISABLED", + "{\"KeepassDXStyle_Red\"," + + "\"KeepassDXStyle_Red_Night\"," + + "\"KeepassDXStyle_Purple\"," + + "\"KeepassDXStyle_Purple_Dark\"}" buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}" } pro { @@ -70,7 +74,13 @@ android { buildConfigField "String", "BUILD_VERSION", "\"free\"" buildConfigField "boolean", "FULL_VERSION", "false" buildConfigField "boolean", "CLOSED_STORE", "true" - buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\",\"KeepassDXStyle_Purple_Dark\"}" + buildConfigField "String[]", "STYLES_DISABLED", + "{\"KeepassDXStyle_Blue\"," + + "\"KeepassDXStyle_Blue_Night\"," + + "\"KeepassDXStyle_Red\"," + + "\"KeepassDXStyle_Red_Night\"," + + "\"KeepassDXStyle_Purple\"," + + "\"KeepassDXStyle_Purple_Dark\"}" buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}" manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIbRfbV8fHLItXo8OcHwrO0sSNblqhPwkc0DPTqg" ] } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt index 174904509..b1b2dca09 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt @@ -20,10 +20,10 @@ package com.kunzisoft.keepass.activities.stylish import android.content.Context +import android.content.res.Configuration +import android.util.Log import androidx.annotation.StyleRes import androidx.preference.PreferenceManager -import android.util.Log - import com.kunzisoft.keepass.R /** @@ -43,12 +43,45 @@ object Stylish { themeString = PreferenceManager.getDefaultSharedPreferences(context).getString(stylishPrefKey, context.getString(R.string.list_style_name_light)) } + private fun retrieveEquivalentSystemStyle(styleString: String, context: Context): String { + var newStyleString: String = styleString + when (context.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) { + Configuration.UI_MODE_NIGHT_NO -> false + Configuration.UI_MODE_NIGHT_YES -> true + else -> null + }?.let { systemNightMode -> + newStyleString = if (systemNightMode) { + when (styleString) { + context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night) + context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black) + context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark) + 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_purple) -> context.getString(R.string.list_style_name_purple_dark) + else -> styleString + } + } else { + when (styleString) { + context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light) + context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white) + context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear) + 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_purple_dark) -> context.getString(R.string.list_style_name_purple) + else -> styleString + } + } + } + return newStyleString + } + /** * Assign the style to the class attribute * @param styleString Style id String */ - fun assignStyle(styleString: String) { - themeString = styleString + fun assignStyle(styleString: String, context: Context) { + + themeString = retrieveEquivalentSystemStyle(styleString, context) } /** @@ -59,12 +92,16 @@ object Stylish { @StyleRes fun getThemeId(context: Context): Int { - return when (themeString) { + return when (retrieveEquivalentSystemStyle(themeString ?: context.getString(R.string.list_style_name_light), context)) { context.getString(R.string.list_style_name_night) -> R.style.KeepassDXStyle_Night + context.getString(R.string.list_style_name_white) -> R.style.KeepassDXStyle_White context.getString(R.string.list_style_name_black) -> R.style.KeepassDXStyle_Black + context.getString(R.string.list_style_name_clear) -> R.style.KeepassDXStyle_Clear context.getString(R.string.list_style_name_dark) -> R.style.KeepassDXStyle_Dark context.getString(R.string.list_style_name_blue) -> R.style.KeepassDXStyle_Blue + 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_purple) -> R.style.KeepassDXStyle_Purple context.getString(R.string.list_style_name_purple_dark) -> R.style.KeepassDXStyle_Purple_Dark else -> R.style.KeepassDXStyle_Light diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt index b9ebbab67..99a4ae624 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt @@ -385,7 +385,7 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { } } if (styleEnabled) { - Stylish.assignStyle(styleIdString) + Stylish.assignStyle(styleIdString, activity) // Relaunch the current activity to redraw theme (activity as? SettingsActivity?)?.apply { keepCurrentScreen() diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3c010d470..b67d342ed 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -446,10 +446,14 @@ Hell Dunkel + Weiß Schwarz + Klassisch Bright Klassisch Dunkel - Himmel und Meer - Roter Vulkan + Himmel + Mond + Sonne + Vulkan Purple Light Purple Dark diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 788f82b7b..044bd9731 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -283,10 +283,14 @@ Jour Nuit + Blanc Noir + Clair Classique Foncé Classique - Ciel et Océan - Rouge Volcan + Ciel + Lune + Soleil + Volcan Pourpre Lumineux Pourpre Obscur diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 61bb0db6b..0e23df1d9 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -495,10 +495,14 @@ Light Night + White Black + Classic Clear Classic Dark - Sky and Ocean - Red Volcano + Sky + Moon + Sun + Volcano Purple Light Purple Dark diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 9aa0121dd..52be6cf4f 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -56,7 +56,7 @@ - diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 7ec0683c2..274551133 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -327,19 +327,27 @@ KeepassDXStyle_Light KeepassDXStyle_Night + KeepassDXStyle_White KeepassDXStyle_Black + KeepassDXStyle_Clear KeepassDXStyle_Dark KeepassDXStyle_Blue + KeepassDXStyle_Blue_Night KeepassDXStyle_Red + KeepassDXStyle_Red_Night KeepassDXStyle_Purple KeepassDXStyle_Purple_Dark @string/list_style_name_light @string/list_style_name_night + @string/list_style_name_white @string/list_style_name_black + @string/list_style_name_clear @string/list_style_name_dark @string/list_style_name_blue + @string/list_style_name_blue_night @string/list_style_name_red + @string/list_style_name_red_night @string/list_style_name_purple @string/list_style_name_purple_dark diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1d3f2944..a1d7df60d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -560,10 +560,14 @@ Light Night + White Black + Classic Clear Classic Dark - Sky and Ocean - Red Volcano + Sky + Moon + Sun + Volcano Purple Light Purple Dark diff --git a/app/src/main/res/values/style_black.xml b/app/src/main/res/values/style_black.xml index 7a9b5d474..f4422e9e7 100644 --- a/app/src/main/res/values/style_black.xml +++ b/app/src/main/res/values/style_black.xml @@ -18,7 +18,7 @@ along with KeePassDX. If not, see . --> - + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style_clear.xml b/app/src/main/res/values/style_clear.xml new file mode 100644 index 000000000..057629242 --- /dev/null +++ b/app/src/main/res/values/style_clear.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style_red.xml b/app/src/main/res/values/style_red.xml index 9deeebbe9..177a54947 100644 --- a/app/src/main/res/values/style_red.xml +++ b/app/src/main/res/values/style_red.xml @@ -19,7 +19,7 @@ --> - - diff --git a/app/src/main/res/values/style_red_night.xml b/app/src/main/res/values/style_red_night.xml new file mode 100644 index 000000000..14af3c0fb --- /dev/null +++ b/app/src/main/res/values/style_red_night.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml new file mode 100644 index 000000000..dd9d3e0fc --- /dev/null +++ b/app/src/main/res/values/style_white.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index dd3446545..40b852b8c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -85,7 +85,7 @@ @style/KeepassDXStyle.Expanded.Title @style/KeepassDXStyle.Collapsed.Title - + diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml index dd9d3e0fc..267705f64 100644 --- a/app/src/main/res/values/style_white.xml +++ b/app/src/main/res/values/style_white.xml @@ -19,7 +19,8 @@ --> - diff --git a/app/src/main/res/values/style_blue_night.xml b/app/src/main/res/values/style_blue_night.xml index 2617d8a9d..a80475ea8 100644 --- a/app/src/main/res/values/style_blue_night.xml +++ b/app/src/main/res/values/style_blue_night.xml @@ -30,7 +30,7 @@ @color/background_night @style/KeepassDXStyle.Toolbar.Blue.Night @style/KeepassDXStyle.Toolbar.Home.Blue.Night - @style/KeepassDXStyle.Toolbar.Special.Blue.Night + @style/KeepassDXStyle.Toolbar.Special.Blue.Night @style/KeepassDXStyle.Blue.Night.Dialog @style/KeepassDXStyle.Blue.Night.Dialog @style/KeepassDXStyle.ActionMode.Blue.Night diff --git a/app/src/main/res/values/style_clear.xml b/app/src/main/res/values/style_clear.xml index 057629242..707ce6dea 100644 --- a/app/src/main/res/values/style_clear.xml +++ b/app/src/main/res/values/style_clear.xml @@ -30,7 +30,7 @@ @color/background_light @style/KeepassDXStyle.Toolbar.Clear @style/KeepassDXStyle.Toolbar.Home.Clear - @style/KeepassDXStyle.Toolbar.Special.Clear + @style/KeepassDXStyle.Toolbar.Special.Clear @style/KeepassDXStyle.Clear.Dialog @style/KeepassDXStyle.Clear.Dialog @style/KeepassDXStyle.ActionMode.Clear diff --git a/app/src/main/res/values/style_dark.xml b/app/src/main/res/values/style_dark.xml index b4746ec83..ad4d20e7b 100644 --- a/app/src/main/res/values/style_dark.xml +++ b/app/src/main/res/values/style_dark.xml @@ -30,7 +30,7 @@ @color/background_dark @style/KeepassDXStyle.Toolbar.Dark @style/KeepassDXStyle.Toolbar.Home.Dark - @style/KeepassDXStyle.Toolbar.Special.Dark + @style/KeepassDXStyle.Toolbar.Special.Dark @style/KeepassDXStyle.Dark.Dialog @style/KeepassDXStyle.Dark.Dialog @style/KeepassDXStyle.Cardview.Dark diff --git a/app/src/main/res/values/style_purple.xml b/app/src/main/res/values/style_purple.xml index 5138a8755..ea59b328b 100644 --- a/app/src/main/res/values/style_purple.xml +++ b/app/src/main/res/values/style_purple.xml @@ -32,7 +32,7 @@ @style/KeepassDXStyle.Toolbar.Purple @style/KeepassDXStyle.Toolbar.Popup.Purple @style/KeepassDXStyle.Toolbar.Home.Purple - @style/KeepassDXStyle.Toolbar.Special.Purple + @style/KeepassDXStyle.Toolbar.Special.Purple @style/KeepassDXStyle.Purple.Dialog @style/KeepassDXStyle.Purple.Dialog @style/KeepassDXStyle.Cardview.Purple diff --git a/app/src/main/res/values/style_purple_dark.xml b/app/src/main/res/values/style_purple_dark.xml index 753e2d309..6c01b4941 100644 --- a/app/src/main/res/values/style_purple_dark.xml +++ b/app/src/main/res/values/style_purple_dark.xml @@ -32,7 +32,7 @@ @style/KeepassDXStyle.Toolbar.Purple.Dark @style/KeepassDXStyle.Toolbar.Popup.Purple.Dark @style/KeepassDXStyle.Toolbar.Home.Purple.Dark - @style/KeepassDXStyle.Toolbar.Special.Purple.Dark + @style/KeepassDXStyle.Toolbar.Special.Purple.Dark @style/KeepassDXStyle.Purple.Dark.Dialog @style/KeepassDXStyle.Purple.Dark.Dialog @style/KeepassDXStyle.Cardview.Purple.Dark diff --git a/app/src/main/res/values/style_red.xml b/app/src/main/res/values/style_red.xml index 177a54947..ec7904342 100644 --- a/app/src/main/res/values/style_red.xml +++ b/app/src/main/res/values/style_red.xml @@ -30,7 +30,7 @@ @color/background_night @style/KeepassDXStyle.Toolbar.Red @style/KeepassDXStyle.Toolbar.Home.Red - @style/KeepassDXStyle.Toolbar.Special.Red + @style/KeepassDXStyle.Toolbar.Special.Red @style/KeepassDXStyle.Red.Dialog @style/KeepassDXStyle.Red.Dialog diff --git a/app/src/main/res/values/style_red_night.xml b/app/src/main/res/values/style_red_night.xml index 14af3c0fb..ace500866 100644 --- a/app/src/main/res/values/style_red_night.xml +++ b/app/src/main/res/values/style_red_night.xml @@ -30,7 +30,7 @@ @color/background_night @style/KeepassDXStyle.Toolbar.Red.Night @style/KeepassDXStyle.Toolbar.Home.Red.Night - @style/KeepassDXStyle.Toolbar.Special.Red.Night + @style/KeepassDXStyle.Toolbar.Special.Red.Night @style/KeepassDXStyle.Red.Night.Dialog @style/KeepassDXStyle.Red.Night.Dialog @style/KeepassDXStyle.ActionMode.Red.Night diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml index 267705f64..ec884f3af 100644 --- a/app/src/main/res/values/style_white.xml +++ b/app/src/main/res/values/style_white.xml @@ -33,7 +33,7 @@ @style/KeepassDXStyle.Toolbar.White @style/KeepassDXStyle.Toolbar.Popup.White @style/KeepassDXStyle.Toolbar.Home.White - @style/KeepassDXStyle.Toolbar.Special.White + @style/KeepassDXStyle.Toolbar.Special.White @style/KeepassDXStyle.White.Dialog @style/KeepassDXStyle.White.Dialog @style/KeepassDXStyle.ActionMode.White diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 40b852b8c..b5f0d7448 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -74,11 +74,12 @@ @style/KeepassDXStyle.Light.Dialog + @style/Widget.AppCompat.Toolbar @style/KeepassDXStyle.Toolbar.Light @style/KeepassDXStyle.Toolbar.Popup.Light @style/KeepassDXStyle.Toolbar.Home.Light - @style/KeepassDXStyle.Toolbar.Special.Light - @style/KeepassDXStyle.Toolbar.Action + @style/KeepassDXStyle.Toolbar.Special.Light + @style/KeepassDXStyle.Toolbar.Action.Light @style/KeepassDXStyle.Toolbar.Overflow @style/KeepassDXStyle.Toolbar.Overflow @@ -130,11 +131,12 @@ @style/KeepassDXStyle.Night.Dialog + @style/Widget.AppCompat.Toolbar @style/KeepassDXStyle.Toolbar.Night @style/KeepassDXStyle.Toolbar.Popup.Night @style/KeepassDXStyle.Toolbar.Home.Night - @style/KeepassDXStyle.Toolbar.Special.Night - @style/KeepassDXStyle.Toolbar.Action + @style/KeepassDXStyle.Toolbar.Special.Night + @style/KeepassDXStyle.Toolbar.Action.Night @style/KeepassDXStyle.Toolbar.Overflow @style/KeepassDXStyle.Toolbar.Overflow @@ -144,11 +146,9 @@ - + - - + + + + + + + + + + - - - @@ -201,35 +224,6 @@ @color/colorTextInverse - - - - - - - - - - - - + + @@ -213,12 +221,6 @@ @style/KeepassDXStyle.Toolbar.Navigation.Tinted - - - @@ -338,14 +339,6 @@ @color/group_subtitle_color - - - - - diff --git a/app/src/main/res/values/style_purple.xml b/app/src/main/res/values/style_purple.xml index ea59b328b..89bbaebc9 100644 --- a/app/src/main/res/values/style_purple.xml +++ b/app/src/main/res/values/style_purple.xml @@ -30,9 +30,10 @@ @color/purple_lighter @color/background_purple @style/KeepassDXStyle.Toolbar.Purple - @style/KeepassDXStyle.Toolbar.Popup.Purple @style/KeepassDXStyle.Toolbar.Home.Purple @style/KeepassDXStyle.Toolbar.Special.Purple + @style/KeepassDXStyle.Toolbar.Action.Purple + @style/KeepassDXStyle.Toolbar.Popup.Purple @style/KeepassDXStyle.Purple.Dialog @style/KeepassDXStyle.Purple.Dialog @style/KeepassDXStyle.Cardview.Purple @@ -48,20 +49,29 @@ @color/purple_lighter @color/colorTextInverse - - - + + + + + + + - - - + + + + + + - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f564c54a0..f1c23207c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -76,7 +76,6 @@ @style/Widget.AppCompat.Toolbar @style/KeepassDXStyle.Toolbar.Light - @style/KeepassDXStyle.Toolbar.Popup.Light @style/KeepassDXStyle.Toolbar.Home.Light @style/KeepassDXStyle.Toolbar.Special.Light @style/KeepassDXStyle.Toolbar.Action.Light @@ -133,7 +132,6 @@ @style/Widget.AppCompat.Toolbar @style/KeepassDXStyle.Toolbar.Night - @style/KeepassDXStyle.Toolbar.Popup.Night @style/KeepassDXStyle.Toolbar.Home.Night @style/KeepassDXStyle.Toolbar.Special.Night @style/KeepassDXStyle.Toolbar.Action.Night @@ -176,22 +174,31 @@ @color/colorTextInverse - - + + + @@ -201,26 +208,15 @@ - - - - - - - - + + + + + + @@ -45,14 +46,22 @@ @color/colorTextInverse - + + + + - - - + + + @@ -53,11 +52,6 @@ @color/white @color/white - - @@ -45,14 +46,22 @@ @color/colorTextInverse - + + + + - - - + + + - - + + - + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml index 1f29c4aa4..0f2514520 100644 --- a/app/src/main/res/values/style_white.xml +++ b/app/src/main/res/values/style_white.xml @@ -29,10 +29,12 @@ @color/green_darker @color/green @color/green_light - @color/background_light + @color/white @style/KeepassDXStyle.Toolbar.White @style/KeepassDXStyle.Toolbar.Home.White @style/KeepassDXStyle.Toolbar.Special.White + @style/KeepassDXStyle.Toolbar.Action.White + @style/KeepassDXStyle.Toolbar.Popup.White @style/KeepassDXStyle.White.Dialog @style/KeepassDXStyle.White.Dialog @style/KeepassDXStyle.Cardview.White @@ -40,7 +42,7 @@ @color/text_color_light @color/colorText - @color/colorTextd + @color/colorText @color/colorText @color/text_color_secondary_light @color/colorTextSecondary @@ -56,19 +58,27 @@ @color/colorText @color/colorText + + - - - + + + + + From a9044c3dc479a6a4425893d8dda76769c53eec2f Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 18 Feb 2021 18:01:15 +0100 Subject: [PATCH 11/26] Fix white and black themes --- app/src/main/res/layout/item_file_info.xml | 2 +- app/src/main/res/values/colors.xml | 5 +++- app/src/main/res/values/style_clear.xml | 19 ++++++++------- app/src/main/res/values/style_dark.xml | 28 +++++++++++++++------- app/src/main/res/values/style_white.xml | 1 - 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/app/src/main/res/layout/item_file_info.xml b/app/src/main/res/layout/item_file_info.xml index 2e918dd7d..9530eb817 100644 --- a/app/src/main/res/layout/item_file_info.xml +++ b/app/src/main/res/layout/item_file_info.xml @@ -31,7 +31,7 @@ + android:background="?android:attr/listDivider"/> #0A0A0A #101010 #0e0e0e + #212121 #E00E0E0E #ececec #dddddd @@ -49,7 +50,9 @@ #1976D2 #1565C0 - #33b5e5 + #33b5e5 + #2B9AC3 + #2486AB #2c7a96 #ef9a9a diff --git a/app/src/main/res/values/style_clear.xml b/app/src/main/res/values/style_clear.xml index 3da524e9e..339c8c210 100644 --- a/app/src/main/res/values/style_clear.xml +++ b/app/src/main/res/values/style_clear.xml @@ -19,14 +19,15 @@ --> - \ No newline at end of file diff --git a/app/src/main/res/values/style_dark.xml b/app/src/main/res/values/style_dark.xml index ad4d20e7b..ab65a3bf7 100644 --- a/app/src/main/res/values/style_dark.xml +++ b/app/src/main/res/values/style_dark.xml @@ -20,17 +20,18 @@ - + + + + diff --git a/app/src/main/res/values/style_white.xml b/app/src/main/res/values/style_white.xml index 0f2514520..8bcf3f732 100644 --- a/app/src/main/res/values/style_white.xml +++ b/app/src/main/res/values/style_white.xml @@ -19,7 +19,6 @@ --> - - - From 2a36626731258941622f9cea2a177111aad75b0b Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 18 Feb 2021 18:22:43 +0100 Subject: [PATCH 14/26] Change blue --- app/src/main/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d7da6b6a3..cd7d8be68 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -44,7 +44,7 @@ #2e7d32 #90CAF9 - #42a5f5 + #5DB2F6 #2196F3 #1E88E5 #1976D2 From aa166a01047fdce53ba054a90d66789f7a88ef48 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 18 Feb 2021 18:34:38 +0100 Subject: [PATCH 15/26] Fix windowLightStatusBar in v21 --- app/src/main/res/values-v21/styles.xml | 3 +++ app/src/main/res/values/style_clear.xml | 1 - app/src/main/res/values/styles.xml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 52be6cf4f..b04ba8024 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -29,6 +29,9 @@ @style/KeepassDXStyle.Light.DateTime.Dialog @style/KeepassDXStyle.Light.DateTime.Dialog + + \ No newline at end of file From 5c4b4864d2a2d72274294e6197e31f6c25f70174 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Thu, 18 Feb 2021 20:07:03 +0100 Subject: [PATCH 18/26] Setting to select theme brightness --- .../keepass/activities/stylish/Stylish.kt | 61 +++++++++++-------- .../settings/NestedAppSettingsFragment.kt | 10 +++ .../keepass/settings/PreferencesUtil.kt | 6 ++ app/src/main/res/values-de/strings.xml | 14 ++--- app/src/main/res/values-fr/strings.xml | 14 ++--- app/src/main/res/values-ja/strings.xml | 14 ++--- app/src/main/res/values/donottranslate.xml | 23 +++++-- app/src/main/res/values/strings.xml | 21 ++++--- .../main/res/xml/preferences_appearance.xml | 9 ++- 9 files changed, 98 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt index b1b2dca09..aeb971842 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/stylish/Stylish.kt @@ -25,6 +25,7 @@ import android.util.Log import androidx.annotation.StyleRes import androidx.preference.PreferenceManager import com.kunzisoft.keepass.R +import com.kunzisoft.keepass.settings.PreferencesUtil /** * Class that provides functions to retrieve and assign a theme to a module @@ -44,35 +45,42 @@ object Stylish { } private fun retrieveEquivalentSystemStyle(styleString: String, context: Context): String { - var newStyleString: String = styleString - when (context.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) { - Configuration.UI_MODE_NIGHT_NO -> false - Configuration.UI_MODE_NIGHT_YES -> true - else -> null - }?.let { systemNightMode -> - newStyleString = if (systemNightMode) { - when (styleString) { - context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night) - context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black) - context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark) - 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_purple) -> context.getString(R.string.list_style_name_purple_dark) - else -> styleString - } - } else { - when (styleString) { - context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light) - context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white) - context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear) - 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_purple_dark) -> context.getString(R.string.list_style_name_purple) - else -> styleString + val systemNightMode = when (PreferencesUtil.getStyleBrightness(context)) { + context.getString(R.string.list_style_brightness_light) -> { + false + } + context.getString(R.string.list_style_brightness_night) -> { + true + } + else -> { + when (context.resources.configuration.uiMode.and(Configuration.UI_MODE_NIGHT_MASK)) { + Configuration.UI_MODE_NIGHT_YES -> true + else -> false } } } - return newStyleString + + return if (systemNightMode) { + when (styleString) { + context.getString(R.string.list_style_name_light) -> context.getString(R.string.list_style_name_night) + context.getString(R.string.list_style_name_white) -> context.getString(R.string.list_style_name_black) + context.getString(R.string.list_style_name_clear) -> context.getString(R.string.list_style_name_dark) + 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_purple) -> context.getString(R.string.list_style_name_purple_dark) + else -> styleString + } + } else { + when (styleString) { + context.getString(R.string.list_style_name_night) -> context.getString(R.string.list_style_name_light) + context.getString(R.string.list_style_name_black) -> context.getString(R.string.list_style_name_white) + context.getString(R.string.list_style_name_dark) -> context.getString(R.string.list_style_name_clear) + 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_purple_dark) -> context.getString(R.string.list_style_name_purple) + else -> styleString + } + } } /** @@ -80,7 +88,6 @@ object Stylish { * @param styleString Style id String */ fun assignStyle(styleString: String, context: Context) { - themeString = retrieveEquivalentSystemStyle(styleString, context) } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt index 99a4ae624..1d656aa33 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt @@ -397,6 +397,16 @@ class NestedAppSettingsFragment : NestedSettingsFragment() { styleEnabled } + findPreference(getString(R.string.setting_style_brightness_key))?.setOnPreferenceChangeListener { _, _ -> + (activity as? SettingsActivity?)?.apply { + keepCurrentScreen() + startActivity(intent) + finish() + activity.overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out) + } + true + } + findPreference(getString(R.string.setting_icon_pack_choose_key))?.setOnPreferenceChangeListener { _, newValue -> var iconPackEnabled = true val iconPackId = newValue as String diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt index f2c166d9e..013b085d0 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/PreferencesUtil.kt @@ -132,6 +132,12 @@ object PreferencesUtil { context.resources.getBoolean(R.bool.show_uuid_default)) } + fun getStyleBrightness(context: Context): String? { + val prefs = PreferenceManager.getDefaultSharedPreferences(context) + return prefs.getString(context.getString(R.string.setting_style_brightness_key), + context.resources.getString(R.string.list_style_brightness_follow_system)) + } + /** * Retrieve the text size in % (1 for 100%) */ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b67d342ed..31c459ba2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -444,18 +444,12 @@ App-Design Design, das in der App genutzt wird - Hell - Dunkel - Weiß - Schwarz - Klassisch Bright - Klassisch Dunkel - Himmel + Wald + Slice + Klassisch Mond Sonne - Vulkan - Purple Light - Purple Dark + Lila Datei Schreibrechte gewähren, um Datenbankänderungen zu speichern Einrichten einer Einmal-Passwortverwaltung (HOTP / TOTP), um ein Token zu generieren, das für die Zwei-Faktor-Authentifizierung (2FA) angefordert wird. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 044bd9731..4a4a316c9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -281,18 +281,12 @@ Thème de l’application Thème utilisé dans l’application - Jour - Nuit - Blanc - Noir - Clair Classique - Foncé Classique - Ciel + Forêt + Tranche + Classique Lune Soleil - Volcan - Pourpre Lumineux - Pourpre Obscur + Pourpre Collection d’icônes Collection d’icônes utilisées dans l’application diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0e23df1d9..5b0089acc 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -493,18 +493,12 @@ アプリのテーマ アプリで使用するテーマ - Light - Night - White - Black - Classic Clear - Classic Dark - Sky + Forest + Slice + Classic Moon Sun - Volcano - Purple Light - Purple Dark + Purple アイコンパック アプリで使用するアイコンパック diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 274551133..c67398dcd 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -171,6 +171,7 @@ settings_appearance_key setting_style_key + setting_style_brightness_key setting_icon_pack_choose_key list_entries_show_username_key true @@ -337,20 +338,30 @@ KeepassDXStyle_Red_Night KeepassDXStyle_Purple KeepassDXStyle_Purple_Dark - + @string/list_style_name_light - @string/list_style_name_night @string/list_style_name_white - @string/list_style_name_black @string/list_style_name_clear - @string/list_style_name_dark @string/list_style_name_blue - @string/list_style_name_blue_night @string/list_style_name_red - @string/list_style_name_red_night @string/list_style_name_purple + + + @string/list_style_name_night + @string/list_style_name_black + @string/list_style_name_dark + @string/list_style_name_blue_night + @string/list_style_name_red_night @string/list_style_name_purple_dark + KeepassDXStyle_Brightness_Light + KeepassDXStyle_Brightness_Night + KeepassDXStyle_Brightness_Follow_System + + @string/list_style_brightness_light + @string/list_style_brightness_night + @string/list_style_brightness_follow_system + @string/material_resource_id diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a1d7df60d..b587f4a72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -558,18 +558,19 @@ App theme Theme used in the app - Light - Night - White - Black - Classic Clear - Classic Dark - Sky + Forest + Slice + Classic Moon Sun - Volcano - Purple Light - Purple Dark + Purple + + Theme brightness + Select light or dark themes + + Light + Night + Follow the system Icon pack Icon pack used in the app diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml index bee5612c7..f7d15e4a7 100644 --- a/app/src/main/res/xml/preferences_appearance.xml +++ b/app/src/main/res/xml/preferences_appearance.xml @@ -28,7 +28,14 @@ android:summary="@string/style_choose_summary" android:defaultValue="@string/list_style_name_light" android:entries="@array/list_style_names" - android:entryValues="@array/list_style_values" /> + android:entryValues="@array/list_style_values_light" /> + Date: Fri, 19 Feb 2021 11:46:42 +0100 Subject: [PATCH 19/26] Fix toolbar popup background --- app/src/main/res/values/styles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8e0a4ec04..fc9436e53 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -83,7 +83,7 @@ @style/KeepassDXStyle.Expanded.Title @style/KeepassDXStyle.Collapsed.Title - @@ -81,8 +81,8 @@ From 26e961d356249850b67af054803197d16eca3335 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 19 Feb 2021 12:20:41 +0100 Subject: [PATCH 21/26] Fix color selection --- .../main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt | 5 ++--- app/src/main/res/layout/view_button_lock.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt index f68ba9ea7..d38f8e421 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt @@ -28,6 +28,7 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.annotation.ColorInt +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SortedList import androidx.recyclerview.widget.SortedListAdapterCallback @@ -100,9 +101,7 @@ class NodeAdapter (private val context: Context) this.mDatabase = Database.getInstance() // Color of content selection - val taContentSelectionColor = context.theme.obtainStyledAttributes(intArrayOf(R.attr.textColorInverse)) - this.mContentSelectionColor = taContentSelectionColor.getColor(0, Color.WHITE) - taContentSelectionColor.recycle() + this.mContentSelectionColor = ContextCompat.getColor(context, R.color.colorTextInverse) // Retrieve the color to tint the icon val taTextColorPrimary = context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.textColorPrimary)) this.mIconGroupColor = taTextColorPrimary.getColor(0, Color.BLACK) diff --git a/app/src/main/res/layout/view_button_lock.xml b/app/src/main/res/layout/view_button_lock.xml index 2f0a7c662..963c483b3 100644 --- a/app/src/main/res/layout/view_button_lock.xml +++ b/app/src/main/res/layout/view_button_lock.xml @@ -42,7 +42,7 @@ tools:targetApi="lollipop" android:elevation="4dp" android:src="@drawable/ic_lock_white_24dp" - android:tint="@color/white" + android:tint="@color/colorTextInverse" android:layout_gravity="bottom|start" android:contentDescription="@string/menu_lock" /> \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fc9436e53..efa39cf4b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -379,7 +379,7 @@ From 06793ae13e741aa10aa46294122f1f56d9b94f88 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 19 Feb 2021 12:24:07 +0100 Subject: [PATCH 22/26] Fix database list elevation --- app/src/main/res/layout/item_file_info.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/item_file_info.xml b/app/src/main/res/layout/item_file_info.xml index 9530eb817..1acc01ddf 100644 --- a/app/src/main/res/layout/item_file_info.xml +++ b/app/src/main/res/layout/item_file_info.xml @@ -26,6 +26,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:background="?attr/colorPrimary" + android:elevation="4dp" tools:targetApi="lollipop"> Date: Fri, 19 Feb 2021 12:34:32 +0100 Subject: [PATCH 23/26] Change Night word by Dark --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b587f4a72..5d68165a6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -569,7 +569,7 @@ Select light or dark themes Light - Night + Dark Follow the system Icon pack From 1972a551e9260d0ba0efc76ed65358db910da1c9 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 19 Feb 2021 12:48:20 +0100 Subject: [PATCH 24/26] Rename styles --- app/src/main/res/values-de/strings.xml | 4 ++-- app/src/main/res/values-fr/strings.xml | 4 ++-- app/src/main/res/values-ja/strings.xml | 4 ++-- app/src/main/res/values/strings.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 31c459ba2..dc80384c1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -445,11 +445,11 @@ Design, das in der App genutzt wird Wald - Slice + Göttlich Klassisch Mond Sonne - Lila + Kunzite Datei Schreibrechte gewähren, um Datenbankänderungen zu speichern Einrichten einer Einmal-Passwortverwaltung (HOTP / TOTP), um ein Token zu generieren, das für die Zwei-Faktor-Authentifizierung (2FA) angefordert wird. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4a4a316c9..6c2fd3137 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -282,11 +282,11 @@ Thème utilisé dans l’application Forêt - Tranche + Divin Classique Lune Soleil - Pourpre + Kunzite Collection d’icônes Collection d’icônes utilisées dans l’application diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5b0089acc..9fb2faf6e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -494,11 +494,11 @@ アプリで使用するテーマ Forest - Slice + Divine Classic Moon Sun - Purple + Kunzite アイコンパック アプリで使用するアイコンパック diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5d68165a6..08d9c179a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -559,11 +559,11 @@ Theme used in the app Forest - Slice + Divine Classic Moon Sun - Purple + Kunzite Theme brightness Select light or dark themes From b29fe2340312e88a08bcbcc6f484b5006d79531f Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Fri, 19 Feb 2021 12:57:17 +0100 Subject: [PATCH 25/26] Fix clear style binaries color --- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/style_clear.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0ede9209a..e975599ad 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -29,6 +29,7 @@ #E00E0E0E #ececec #dddddd + #E0DDDDDD #D4D4D4 #bdbdbd #9e9e9e diff --git a/app/src/main/res/values/style_clear.xml b/app/src/main/res/values/style_clear.xml index cbd8a61ca..2afed7510 100644 --- a/app/src/main/res/values/style_clear.xml +++ b/app/src/main/res/values/style_clear.xml @@ -36,7 +36,7 @@ @style/KeepassDXStyle.Clear.Dialog @style/KeepassDXStyle.Clear.Dialog @style/KeepassDXStyle.Cardview.Clear - @color/white_transparent + @color/grey_lighter_transparent @color/text_color_light @color/colorText From 279f4a347ae44f2fe7f23b77bd2ed63b977d7b06 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 20 Feb 2021 11:16:46 +0100 Subject: [PATCH 26/26] Update CHANGELOG --- CHANGELOG | 1 + fastlane/metadata/android/en-US/changelogs/58.txt | 1 + fastlane/metadata/android/fr-FR/changelogs/58.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 3b3099a2e..f0a490630 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ KeePassDX(2.9.14) + * Dark Themes (WARNING: You must reselect your theme if upgrading from an old installation) KeePassDX(2.9.13) * Binary image viewer #473 #749 diff --git a/fastlane/metadata/android/en-US/changelogs/58.txt b/fastlane/metadata/android/en-US/changelogs/58.txt index e69de29bb..638ef58aa 100644 --- a/fastlane/metadata/android/en-US/changelogs/58.txt +++ b/fastlane/metadata/android/en-US/changelogs/58.txt @@ -0,0 +1 @@ + * Dark Themes (WARNING: You must reselect your theme if upgrading from an old installation) \ No newline at end of file diff --git a/fastlane/metadata/android/fr-FR/changelogs/58.txt b/fastlane/metadata/android/fr-FR/changelogs/58.txt index e69de29bb..3b9935f67 100644 --- a/fastlane/metadata/android/fr-FR/changelogs/58.txt +++ b/fastlane/metadata/android/fr-FR/changelogs/58.txt @@ -0,0 +1 @@ + * Thèmes sombres (ATTENTION: Vous devez reselectionner votre theme si mise à niveau d'une ancienne installation) \ No newline at end of file