From 678663ad66b3312daa67360d223d4bbeaa97d4f3 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Mon, 14 Feb 2022 12:51:27 +0100
Subject: [PATCH] Add "Simple" theme

---
 CHANGELOG                                     |   1 +
 app/build.gradle                              |   2 +
 .../keepass/activities/stylish/Stylish.kt     |   4 +
 .../res/drawable/key_background_normal.xml    |   4 +-
 .../res/drawable/key_background_pressed.xml   |   4 +-
 .../main/res/layout/keyboard_container.xml    |   4 +-
 .../main/res/layout/keyboard_popup_fields.xml |   2 +-
 app/src/main/res/values-de/strings.xml        |   1 +
 app/src/main/res/values-fr/strings.xml        |   1 +
 app/src/main/res/values-ja/strings.xml        |   1 +
 app/src/main/res/values-v21/styles_simple.xml |  35 ++++
 app/src/main/res/values-v23/styles_simple.xml |  25 +++
 app/src/main/res/values-v27/styles_simple.xml |  25 +++
 app/src/main/res/values/colors.xml            |  16 +-
 app/src/main/res/values/donottranslate.xml    |   4 +
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/style_moon.xml        |  32 ++--
 app/src/main/res/values/style_simple.xml      | 174 ++++++++++++++++++
 app/src/main/res/values/styles.xml            |   2 +-
 .../metadata/android/en-US/changelogs/98.txt  |   3 +-
 .../metadata/android/fr-FR/changelogs/98.txt  |   3 +-
 21 files changed, 314 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/res/values-v21/styles_simple.xml
 create mode 100644 app/src/main/res/values-v23/styles_simple.xml
 create mode 100644 app/src/main/res/values-v27/styles_simple.xml
 create mode 100644 app/src/main/res/values/style_simple.xml

diff --git a/CHANGELOG b/CHANGELOG
index 0f211f4ae..238fc76b1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +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
 
 KeePassDX(3.2.0)
  * Manage data merge #840 #977
diff --git a/app/build.gradle b/app/build.gradle
index a54ff7cd3..9d79ea0f6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,6 +69,8 @@ android {
             buildConfigField "boolean", "FULL_VERSION", "false"
             buildConfigField "boolean", "CLOSED_STORE", "true"
             buildConfigField "String[]", "STYLES_DISABLED",
+                            "{\"KeepassDXStyle_Simple\"," +
+                            "\"KeepassDXStyle_Simple_Night\"," +
                             "{\"KeepassDXStyle_Blue\"," +
                             "\"KeepassDXStyle_Blue_Night\"," +
                             "\"KeepassDXStyle_Red\"," +
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 9972dc227..0220c7c58 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
@@ -69,6 +69,7 @@ object Stylish {
             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_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_purple_dark) -> context.getString(R.string.list_style_name_purple)
@@ -81,6 +82,7 @@ object Stylish {
             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_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_purple) -> context.getString(R.string.list_style_name_purple_dark)
@@ -113,6 +115,8 @@ object Stylish {
             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_simple) -> R.style.KeepassDXStyle_Simple
+            context.getString(R.string.list_style_name_simple_night) -> R.style.KeepassDXStyle_Simple_Night
             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
diff --git a/app/src/main/res/drawable/key_background_normal.xml b/app/src/main/res/drawable/key_background_normal.xml
index c6cdf17b6..b93917116 100644
--- a/app/src/main/res/drawable/key_background_normal.xml
+++ b/app/src/main/res/drawable/key_background_normal.xml
@@ -25,6 +25,6 @@
         android:right="0dp"
         android:top="12dp"
         android:bottom="12dp"/>
-    <stroke android:width="1dp" android:color="@color/grey_blue" />
-    <solid android:color="@color/grey_blue"/>
+    <stroke android:width="1dp" android:color="@color/grey_blue_slight" />
+    <solid android:color="@color/grey_blue_slight"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/key_background_pressed.xml b/app/src/main/res/drawable/key_background_pressed.xml
index 18d70899e..39bb882f6 100644
--- a/app/src/main/res/drawable/key_background_pressed.xml
+++ b/app/src/main/res/drawable/key_background_pressed.xml
@@ -25,6 +25,6 @@
         android:right="0dp"
         android:top="12dp"
         android:bottom="12dp"/>
-    <stroke android:width="1dp" android:color="@color/grey_blue" />
-    <solid android:color="@color/grey_blue_dark"/>
+    <stroke android:width="1dp" android:color="@color/grey_blue_slight" />
+    <solid android:color="@color/grey_blue_deep"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/keyboard_container.xml b/app/src/main/res/layout/keyboard_container.xml
index 573fbd89a..7d7330c03 100644
--- a/app/src/main/res/layout/keyboard_container.xml
+++ b/app/src/main/res/layout/keyboard_container.xml
@@ -23,13 +23,13 @@
     android:layout_alignParentBottom="true"
     android:paddingTop="4dp"
     android:paddingBottom="8dp"
-    android:background="@color/grey_blue_dark"
+    android:background="@color/grey_blue_deep"
     android:orientation="vertical">
     <TextView
         android:id="@+id/magikeyboard_entry_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/grey_blue_dark"
+        android:background="@color/grey_blue_deep"
         android:gravity="center"
         android:textColor="@color/white"/>
     <com.kunzisoft.keepass.magikeyboard.KeyboardView
diff --git a/app/src/main/res/layout/keyboard_popup_fields.xml b/app/src/main/res/layout/keyboard_popup_fields.xml
index a8b3eddf7..50b489c22 100644
--- a/app/src/main/res/layout/keyboard_popup_fields.xml
+++ b/app/src/main/res/layout/keyboard_popup_fields.xml
@@ -18,7 +18,7 @@
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/grey_blue_dark"
+    android:background="@color/grey_blue_deep"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6856e4fef..75772b8b9 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -431,6 +431,7 @@
         <item>Wald</item>
         <item>Göttlich</item>
         <item>Klassisch</item>
+        <item>Einfach</item>
         <item>Mond</item>
         <item>Sonne</item>
         <item>Kunzite</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f7cdab4c7..71548c827 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -266,6 +266,7 @@
         <item>Forêt</item>
         <item>Divin</item>
         <item>Classique</item>
+        <item>Simple</item>
         <item>Lune</item>
         <item>Soleil</item>
         <item>Kunzite</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 16a8347b7..62f261a73 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -476,6 +476,7 @@
         <item>Forest</item>
         <item>Divine</item>
         <item>Classic</item>
+        <item>Simple</item>
         <item>Moon</item>
         <item>Sun</item>
         <item>Kunzite</item>
diff --git a/app/src/main/res/values-v21/styles_simple.xml b/app/src/main/res/values-v21/styles_simple.xml
new file mode 100644
index 000000000..d5a0f4ea5
--- /dev/null
+++ b/app/src/main/res/values-v21/styles_simple.xml
@@ -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.Simple.v21" parent="KeepassDXStyle.Simple.Base" >
+        <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
+        <item name="android:statusBarColor">@color/grey_dark</item>
+        <item name="android:navigationBarColor">@color/grey_dark</item>
+        <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Simple.DateTime.Dialog</item>
+        <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Simple.DateTime.Dialog</item>
+    </style>
+    <style name="KeepassDXStyle.Simple.Night" parent="KeepassDXStyle.Simple.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.Simple.Night.DateTime.Dialog</item>
+        <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Simple.Night.DateTime.Dialog</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v23/styles_simple.xml b/app/src/main/res/values-v23/styles_simple.xml
new file mode 100644
index 000000000..8bd4e1137
--- /dev/null
+++ b/app/src/main/res/values-v23/styles_simple.xml
@@ -0,0 +1,25 @@
+<?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.Simple.v23" parent="KeepassDXStyle.Simple.v21" >
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-v27/styles_simple.xml b/app/src/main/res/values-v27/styles_simple.xml
new file mode 100644
index 000000000..bf756fc2b
--- /dev/null
+++ b/app/src/main/res/values-v27/styles_simple.xml
@@ -0,0 +1,25 @@
+<?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.Simple.v27" parent="KeepassDXStyle.Simple.v23" >
+        <item name="android:navigationBarColor">?attr/colorPrimary</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4459d9bab..cf837bd5d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -41,11 +41,19 @@
 	<color name="black">#000001</color> <!-- #000001 To fix refresh theme -->
 	<color name="black_transparent">#E0000000</color>
 
-    <color name="grey_blue">#3c474c</color>
-    <color name="grey_blue_dark">#263238</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_lighter">#90CAF9</color>
-    <color name="blue_white">#5DB2F6</color>
+    <color name="blue_white">#E6F3FF</color>
+    <color name="blue_white_dark">#90CAF9</color>
+    <color name="blue_lighter">#5DB2F6</color>
     <color name="blue_light">#2196F3</color>
     <color name="blue">#1E88E5</color>
     <color name="blue_dark">#1976D2</color>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 799d84cee..65b69a4d3 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -324,6 +324,8 @@
     <string name="list_style_name_black" translatable="false">KeepassDXStyle_Black</string>
     <string name="list_style_name_clear" translatable="false">KeepassDXStyle_Clear</string>
     <string name="list_style_name_dark" translatable="false">KeepassDXStyle_Dark</string>
+    <string name="list_style_name_simple" translatable="false">KeepassDXStyle_Simple</string>
+    <string name="list_style_name_simple_night" translatable="false">KeepassDXStyle_Simple_Night</string>
     <string name="list_style_name_blue" translatable="false">KeepassDXStyle_Blue</string>
     <string name="list_style_name_blue_night" translatable="false">KeepassDXStyle_Blue_Night</string>
     <string name="list_style_name_red" translatable="false">KeepassDXStyle_Red</string>
@@ -334,6 +336,7 @@
         <item translatable="false">@string/list_style_name_light</item>
         <item translatable="false">@string/list_style_name_white</item>
         <item translatable="false">@string/list_style_name_clear</item>
+        <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_purple</item>
@@ -342,6 +345,7 @@
         <item translatable="false">@string/list_style_name_night</item>
         <item translatable="false">@string/list_style_name_black</item>
         <item translatable="false">@string/list_style_name_dark</item>
+        <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_purple_dark</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55d533758..915c5e4c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -636,6 +636,7 @@
         <item>Forest</item>
         <item>Divine</item>
         <item>Classic</item>
+        <item>Simple</item>
         <item>Moon</item>
         <item>Sun</item>
         <item>Kunzite</item>
diff --git a/app/src/main/res/values/style_moon.xml b/app/src/main/res/values/style_moon.xml
index e043301dc..c4db44720 100644
--- a/app/src/main/res/values/style_moon.xml
+++ b/app/src/main/res/values/style_moon.xml
@@ -23,12 +23,12 @@
     <style name="KeepassDXStyle.Blue.v21" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/blue</item>
         <item name="colorPrimaryDark">@color/blue_dark</item>
-        <item name="colorAccent">@color/blue_white</item>
-        <item name="colorAccentLight">@color/blue_lighter</item>
-        <item name="colorControlActivated">@color/blue_white</item>
+        <item name="colorAccent">@color/blue_lighter</item>
+        <item name="colorAccentLight">@color/blue_white_dark</item>
+        <item name="colorControlActivated">@color/blue_lighter</item>
         <item name="android:textColorPrimary">@color/blue_light</item>
-        <item name="android:textColorHintInverse">@color/blue_lighter</item>
-        <item name="android:textColorSecondaryInverse">@color/blue_lighter</item>
+        <item name="android:textColorHintInverse">@color/blue_white_dark</item>
+        <item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
         <item name="android:windowBackground">@color/white_dark</item>
         <item name="toolbarColorControl">@color/white</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue</item>
@@ -46,12 +46,12 @@
     </style>
     <!-- Toolbar Style Blue -->
     <style name="KeepassDXStyle.Toolbar.Blue" parent="KeepassDXStyle.Blue">
-        <item name="colorControlActivated">@color/blue_lighter</item>
+        <item name="colorControlActivated">@color/blue_white_dark</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:textColorSecondary">@color/white</item>
         <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/blue_lighter</item>
+        <item name="android:textColorHint">@color/blue_white_dark</item>
         <item name="android:tint">@color/white</item>
     </style>
     <!-- Toolbar Home Blue -->
@@ -74,7 +74,7 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Dialog" parent="KeepassDXStyle.Light.Dialog">
-        <item name="colorAccent">@color/blue_lighter</item>
+        <item name="colorAccent">@color/blue_white_dark</item>
         <item name="android:textColorPrimary">@color/blue</item>
     </style>
     <style name="KeepassDXStyle.Blue.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
@@ -89,12 +89,12 @@
     <style name="KeepassDXStyle.Blue.Night.v21" parent="KeepassDXStyle.Night" >
         <item name="colorPrimary">@color/blue</item>
         <item name="colorPrimaryDark">@color/blue_dark</item>
-        <item name="colorAccent">@color/blue_white</item>
-        <item name="colorAccentLight">@color/blue_lighter</item>
-        <item name="colorControlActivated">@color/blue_white</item>
+        <item name="colorAccent">@color/blue_lighter</item>
+        <item name="colorAccentLight">@color/blue_white_dark</item>
+        <item name="colorControlActivated">@color/blue_lighter</item>
         <item name="android:textColorPrimary">@color/blue_light</item>
-        <item name="android:textColorHintInverse">@color/blue_lighter</item>
-        <item name="android:textColorSecondaryInverse">@color/blue_lighter</item>
+        <item name="android:textColorHintInverse">@color/blue_white_dark</item>
+        <item name="android:textColorSecondaryInverse">@color/blue_white_dark</item>
         <item name="android:windowBackground">@color/grey_dark</item>
         <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Blue.Night</item>
         <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Blue.Night</item>
@@ -111,12 +111,12 @@
     </style>
     <!-- Toolbar Style Blue -->
     <style name="KeepassDXStyle.Toolbar.Blue.Night" parent="KeepassDXStyle.Blue.Night">
-        <item name="colorControlActivated">@color/blue_lighter</item>
+        <item name="colorControlActivated">@color/blue_white_dark</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:textColorSecondary">@color/white</item>
         <item name="android:editTextColor">@color/white</item>
-        <item name="android:textColorHint">@color/blue_lighter</item>
+        <item name="android:textColorHint">@color/blue_white_dark</item>
         <item name="android:tint">@color/white</item>
     </style>
     <!-- Toolbar Home Blue -->
@@ -139,7 +139,7 @@
     </style>
     <!-- Dialog -->
     <style name="KeepassDXStyle.Blue.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
-        <item name="colorAccent">@color/blue_lighter</item>
+        <item name="colorAccent">@color/blue_white_dark</item>
         <item name="android:textColorPrimary">@color/blue</item>
     </style>
     <style name="KeepassDXStyle.Blue.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
diff --git a/app/src/main/res/values/style_simple.xml b/app/src/main/res/values/style_simple.xml
new file mode 100644
index 000000000..5db9eaf2b
--- /dev/null
+++ b/app/src/main/res/values/style_simple.xml
@@ -0,0 +1,174 @@
+<?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>
+    <!-- Classic Simple Style -->
+    <style name="KeepassDXStyle.Simple" parent="KeepassDXStyle.Simple.v27" />
+    <style name="KeepassDXStyle.Simple.v27" parent="KeepassDXStyle.Simple.v23" />
+    <style name="KeepassDXStyle.Simple.v23" parent="KeepassDXStyle.Simple.v21" />
+    <style name="KeepassDXStyle.Simple.v21" parent="KeepassDXStyle.Simple.Base" />
+    <style name="KeepassDXStyle.Simple.Base" parent="KeepassDXStyle.Light" >
+        <item name="colorPrimary">@color/white_slight</item>
+        <item name="colorPrimaryDark">@color/white_slight</item>
+        <item name="colorAccent">@color/blue_deep</item>
+        <item name="colorAccentLight">@color/blue_deep</item>
+        <item name="colorControlActivated">@color/blue_deep</item>
+        <item name="android:textColorPrimary">@color/grey</item>
+        <item name="android:textColorHintInverse">@color/grey</item>
+        <item name="android:windowBackground">@color/white_slight</item>
+        <item name="toolbarColorControl">@color/grey_light</item>
+        <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Simple</item>
+        <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Simple</item>
+        <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Simple</item>
+        <item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Simple</item>
+        <item name="popupTheme">@style/KeepassDXStyle.Toolbar.Popup.Simple</item>
+        <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
+        <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Dialog</item>
+        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Simple</item>
+        <item name="cardBackgroundTransparentColor">@color/white_slight_transparent</item>
+        <item name="educationCircleColor">@color/blue_dark</item>
+        <item name="educationTextColor">@color/white</item>
+
+        <item name="android:textColor">@color/text_color_light</item>
+        <item name="android:editTextColor">@color/grey_light</item>
+        <item name="textColorInverse">@color/grey_light</item>
+        <item name="android:textColorPrimaryInverse">@color/grey_light</item>
+        <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
+        <item name="android:textColorSecondaryInverse">@color/grey_lighter</item>
+        <item name="android:textColorHint">@color/grey_lighter</item>
+
+        <item name="chipFilterTextColor">@color/text_color_light</item>
+        <item name="chipFilterBackgroundColor">@color/blue_white</item>
+        <item name="chipFilterBackgroundColorDisabled">@color/white_dark</item>
+    </style>
+    <!-- Toolbar Style Simple -->
+    <style name="KeepassDXStyle.Toolbar.Simple" parent="KeepassDXStyle.Simple">
+        <item name="colorControlNormal">@color/grey_light</item>
+        <item name="android:textColorPrimary">@color/grey_light</item>
+        <item name="android:textColorSecondary">@color/grey_lighter</item>
+        <item name="android:tint">@color/grey_light</item>
+    </style>
+    <!-- Toolbar Popup menu -->
+    <style name="KeepassDXStyle.Toolbar.Popup.Simple" parent="KeepassDXStyle.Toolbar.Simple">
+        <item name="android:colorBackground">@color/white</item>
+    </style>
+    <!-- Toolbar Home Simple -->
+    <style name="KeepassDXStyle.Toolbar.Home.Simple" parent="KeepassDXStyle.Toolbar.Simple">
+        <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
+    </style>
+    <!-- Special Toolbar Simple -->
+    <style name="KeepassDXStyle.Toolbar.Special.Simple" parent="KeepassDXStyle.Toolbar.Simple">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Simple</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Special.Simple" parent="KeepassDXStyle.Toolbar.Widget.Special">
+        <item name="android:background">@color/white_slight</item>
+    </style>
+    <!-- Action Toolbar Simple -->
+    <style name="KeepassDXStyle.Toolbar.Action.Simple" parent="KeepassDXStyle.Toolbar.Simple">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Simple</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Action.Simple" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/white_slight</item>
+    </style>
+    <!-- Dialog -->
+    <style name="KeepassDXStyle.Simple.Dialog" parent="KeepassDXStyle.Light.Dialog">
+        <item name="colorAccent">@color/blue_deep</item>
+        <item name="android:textColorPrimary">@color/grey</item>
+        <item name="android:background">@color/white_slight</item>
+        <item name="background">@color/white_slight</item>
+    </style>
+    <style name="KeepassDXStyle.Simple.DateTime.Dialog" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">@color/blue_deep</item>
+        <item name="android:textColorPrimary">@color/grey</item>
+        <item name="android:windowBackground">@color/white_slight</item>
+    </style>
+    <!-- CardView -->
+    <style name="KeepassDXStyle.Cardview.Simple" parent="KeepassDXStyle.Cardview">
+        <item name="cardBackgroundColor">@color/white_slight</item>
+    </style>
+
+    <!-- Classic Night Style -->
+    <style name="KeepassDXStyle.Simple.Night" parent="KeepassDXStyle.Simple.Night.v21" />
+    <style name="KeepassDXStyle.Simple.Night.v21" parent="KeepassDXStyle.Night" >
+        <item name="colorPrimary">@color/grey_slight</item>
+        <item name="colorPrimaryDark">@color/grey_slight</item>
+        <item name="colorAccent">@color/blue_slight</item>
+        <item name="colorAccentLight">@color/blue_slight</item>
+        <item name="colorControlActivated">@color/blue_slight</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorHintInverse">@color/white</item>
+        <item name="android:textColorSecondaryInverse">@color/white_dark</item>
+        <item name="android:windowBackground">@color/grey_slight</item>
+        <item name="toolbarAppearance">@style/KeepassDXStyle.Toolbar.Simple.Night</item>
+        <item name="toolbarHomeAppearance">@style/KeepassDXStyle.Toolbar.Home.Simple.Night</item>
+        <item name="toolbarSpecialAppearance">@style/KeepassDXStyle.Toolbar.Special.Simple.Night</item>
+        <item name="toolbarActionAppearance">@style/KeepassDXStyle.Toolbar.Action.Simple.Night</item>
+        <item name="android:alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
+        <item name="alertDialogTheme">@style/KeepassDXStyle.Simple.Night.Dialog</item>
+        <item name="cardViewStyle">@style/KeepassDXStyle.Cardview.Simple.Night</item>
+        <item name="cardBackgroundTransparentColor">@color/grey_slight_transparent</item>
+        <item name="educationCircleColor">@color/blue_slight</item>
+        <item name="educationTextColor">@color/white</item>
+
+        <item name="chipFilterTextColor">@color/white</item>
+        <item name="chipFilterBackgroundColor">@color/grey_black_slight</item>
+        <item name="chipFilterBackgroundColorDisabled">@color/grey_darker</item>
+    </style>
+    <!-- Toolbar Style Night -->
+    <style name="KeepassDXStyle.Toolbar.Simple.Night" parent="KeepassDXStyle.Simple.Night">
+        <item name="colorControlNormal">@color/white</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/grey_lighter</item>
+        <item name="android:tint">@color/white</item>
+    </style>
+    <!-- Toolbar Home Night -->
+    <style name="KeepassDXStyle.Toolbar.Home.Simple.Night" parent="KeepassDXStyle.Toolbar.Simple.Night">
+        <item name="toolbarNavigationButtonStyle">@style/KeepassDXStyle.Toolbar.Navigation.Tinted</item>
+    </style>
+    <!-- Special Toolbar Night -->
+    <style name="KeepassDXStyle.Toolbar.Special.Simple.Night" parent="KeepassDXStyle.Toolbar.Simple.Night">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Special.Simple.Night</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Special.Simple.Night" parent="KeepassDXStyle.Toolbar.Widget.Special">
+        <item name="android:background">@color/grey_slight</item>
+    </style>
+    <!-- Action Toolbar Night -->
+    <style name="KeepassDXStyle.Toolbar.Action.Simple.Night" parent="KeepassDXStyle.Toolbar.Simple.Night">
+        <item name="toolbarStyle">@style/KeepassDXStyle.Toolbar.Widget.Action.Simple.Night</item>
+    </style>
+    <style name="KeepassDXStyle.Toolbar.Widget.Action.Simple.Night" parent="Widget.AppCompat.Toolbar">
+        <item name="android:background">@color/grey_slight</item>
+    </style>
+    <!-- Dialog -->
+    <style name="KeepassDXStyle.Simple.Night.Dialog" parent="KeepassDXStyle.Night.Dialog">
+        <item name="colorAccent">@color/blue_slight</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:background">@color/grey_slight</item>
+        <item name="background">@color/grey_slight</item>
+    </style>
+    <style name="KeepassDXStyle.Simple.Night.DateTime.Dialog" parent="Theme.AppCompat.DayNight.Dialog">
+        <item name="colorAccent">@color/blue_slight</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:windowBackground">@color/grey_slight</item>
+    </style>
+    <!-- CardView -->
+    <style name="KeepassDXStyle.Cardview.Simple.Night" parent="KeepassDXStyle.Cardview">
+        <item name="cardBackgroundColor">@color/grey_slight</item>
+    </style>
+</resources>
\ 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 f6d021df4..d387816f9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -559,7 +559,7 @@
     <!-- Keyboard -->
     <style name="KeepassDXStyle.Keyboard" parent="Theme.AppCompat">
         <item name="android:paddingTop">4dp</item>
-        <item name="background">@color/grey_blue_dark</item>
+        <item name="background">@color/grey_blue_deep</item>
         <item name="keyBackground">@drawable/key_background</item>
         <item name="keyTextSize">22sp</item>
         <item name="keyTextColor">@color/white</item>
diff --git a/fastlane/metadata/android/en-US/changelogs/98.txt b/fastlane/metadata/android/en-US/changelogs/98.txt
index e22e121b7..347cdbea5 100644
--- a/fastlane/metadata/android/en-US/changelogs/98.txt
+++ b/fastlane/metadata/android/en-US/changelogs/98.txt
@@ -4,4 +4,5 @@
  * Search with regular expression #175
  * Merge from file and save as copy #1221 #1204 #840
  * Fix custom data #1236
- * New UI and fix styles
\ No newline at end of file
+ * New UI and fix styles
+ * Add "Simple" theme
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/98.txt b/fastlane/metadata/android/fr-FR/changelogs/98.txt
index 1af60f3de..93e2f1eee 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/98.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/98.txt
@@ -4,4 +4,5 @@
  * Recherche avec expression régulière #175
  * 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
\ No newline at end of file
+ * Nouvelle interface utilisateur et correction des styles
+ * Ajout du thème "Simple"
\ No newline at end of file