Major UI overhaul and the introduction of a new icon (#920)

Co-authored-by: Fabian Henneke <fabian@henneke.me>

4 files changed, 24 insertions, 33 deletions

diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index 1178f5fe..fcf624a7 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -2,4 +2,5 @@
 <resources>
     <bool name="leak_canary_allow_in_non_debuggable_build">true</bool>
     <bool name="enable_accessibility_autofill">true</bool>
+    <bool name="light_status_bar">true</bool>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 55136a37..49250a2e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,27 +3,21 @@
   ~ SPDX-License-Identifier: GPL-3.0-only
   -->
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base palette -->
-    <color name="primary_color">#607d8b</color>
-    <color name="primary_light_color">#8eacbb</color>
-    <color name="primary_dark_color">#34515e</color>
+    <color name="primary_color">@color/white</color>
+    <color name="primary_light_color">@color/white</color>
+    <color name="primary_dark_color">@color/white</color>
     <color name="secondary_color">#ff7043</color>
     <color name="primary_text_color">#212121</color>
     <color name="white">#ffffffff</color>
 
     <!-- Theme variables -->
-    <color name="window_background">#eceff1</color>
     <color name="ic_launcher_background">#D4F1EA</color>
     <color name="color_control_normal">@color/primary_text_color</color>
     <color name="list_multiselect_background">#668eacbb</color>
-    <color name="navigation_bar_color">#000000</color>
+    <color name="navigation_bar_color">@color/primary_color</color>
     <color name="status_bar_color">@color/primary_dark_color</color>
     <color name="ripple_color">#aaff7043</color>
     <color name="button_color">#44ff7043</color>
-
-    <!-- Override TextInputEditText stroke color like a boss -->
-    <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">
-        @color/secondary_color
-    </color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d06a7a4..d62b5292 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -194,8 +194,8 @@
     <string name="xkpwgen_separator">Separator</string>
     <string name="xkpwgen_custom_dict_imported">Custom wordlist: %1$s</string>
     <string name="xkpwgen_separator_character">separator character</string>
-    <string name="xkpwgen_numbers">numbers:</string>
-    <string name="xkpwgen_symbols">symbols:</string>
+    <string name="xkpwgen_numbers">Numbers</string>
+    <string name="xkpwgen_symbols">Symbols</string>
     <string name="xkpwgen_builder_error">Selected dictionary does not contain enough words of given length %1$d..%2$d</string>
 
     <!-- XKPWD prefs -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 25efd39b..3bc68452 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,28 +6,39 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
         <item name="colorPrimary">@color/primary_color</item>
         <item name="colorOnPrimary">@color/color_control_normal</item>
         <item name="colorPrimaryDark">@color/primary_color</item>
         <item name="colorPrimaryVariant">@color/primary_light_color</item>
         <item name="colorSecondary">@color/secondary_color</item>
         <item name="colorOnSecondary">@color/white</item>
-        <item name="colorSurface">@color/window_background</item>
+        <item name="colorSurface">@color/primary_color</item>
         <item name="android:textColor">@color/primary_text_color</item>
         <item name="colorOnSurface">@color/color_control_normal</item>
         <item name="colorControlNormal">@color/color_control_normal</item>
         <item name="android:colorBackgroundFloating">@color/primary_color</item>
         <item name="android:statusBarColor">@color/status_bar_color</item>
         <item name="android:navigationBarColor">@color/navigation_bar_color</item>
-        <item name="android:windowBackground">@color/window_background</item>
+        <item name="android:windowLightStatusBar">@bool/light_status_bar</item>
         <item name="actionModeStyle">@style/ActionMode</item>
-        <item name="alertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item>
         <item name="materialButtonStyle">@style/AppTheme.MaterialButton</item>
         <item name="materialButtonOutlinedStyle">@style/AppTheme.OutlinedButton</item>
-        <item name="textInputStyle">@style/TextInputLayoutBase</item>
         <item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
+        <item name="textInputStyle">@style/AppTheme.TextInputLayout</item>
+    </style>
+
+    <style name="AppTheme.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
+        <item name="boxStrokeColor">@color/outlined_box_selector</item>
+        <item name="hintTextColor">?attr/colorSecondary</item>
+        <item name="materialThemeOverlay">
+            @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox
+        </item>
+    </style>
+
+    <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
+        <item name="colorControlActivated">@color/color_control_normal</item>
     </style>
 
     <style name="AppTheme.MaterialButton" parent="Widget.MaterialComponents.Button">
@@ -46,7 +57,6 @@
     <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
         <item name="colorPrimary">@color/secondary_color</item>
         <item name="colorSecondary">@color/secondary_color</item>
-        <item name="android:windowBackground">@color/window_background</item>
     </style>
 
     <style name="ActionMode" parent="@style/Widget.AppCompat.ActionMode">
@@ -55,7 +65,6 @@
 
     <style name="BottomSheetDialogTheme" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
         <item name="android:windowIsFloating">false</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowIsTranslucent">false</item>
@@ -80,19 +89,6 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
-        <item name="colorControlActivated">@color/color_control_normal</item>
-    </style>
-
-    <style name="TextInputLayoutBase" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
-        <item name="boxStrokeColor">@color/secondary_color</item>
-        <item name="hintTextColor">@color/color_control_normal</item>
-        <item name="hintEnabled">true</item>
-        <item name="materialThemeOverlay">
-            @style/ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox
-        </item>
-    </style>
-
     <style name="DialogLikeTheme" parent="AppTheme">
         <item name="android:windowActionBar">false</item>
         <item name="android:windowIsFloating">true</item>