Add debug icon and update color palette (#931)

23 files changed, 17 insertions, 34 deletions

diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 00000000..5b266c22
--- /dev/null
+++ b/app/src/debug/res/mipmap-hdpi/ic_launcher.webp
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..5b327a0e
--- /dev/null
+++ b/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 00000000..f3a1ffd5
--- /dev/null
+++ b/app/src/debug/res/mipmap-mdpi/ic_launcher.webp
diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..e51822c1
--- /dev/null
+++ b/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 00000000..034d724a
--- /dev/null
+++ b/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..18fa08da
--- /dev/null
+++ b/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..291580ea
--- /dev/null
+++ b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..17b8647f
--- /dev/null
+++ b/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..024a6712
--- /dev/null
+++ b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 00000000..55ea3223
--- /dev/null
+++ b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
deleted file mode 100644
index 650d6818..00000000
--- a/app/src/debug/res/values/colors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<resources>
-    <color name="ic_launcher_background">#fcd1c5</color>
-</resources>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 3486e4a5..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved.
-  ~ SPDX-License-Identifier: GPL-3.0-only
-  -->
-
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-</adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index cb3697ef..00000000
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ /dev/null
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 368d0619..00000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ /dev/null
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
deleted file mode 100644
index f9e5efb4..00000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
+++ /dev/null
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 368d0619..00000000
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ /dev/null
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 55f610eb..00000000
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ /dev/null
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index df2ab1ff..00000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ /dev/null
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 33529fe0..00000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ /dev/null
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 77ab6b37..06ef3a3d 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -5,16 +5,14 @@
 
 <resources>
     <!-- Base palette -->
-    <color name="primary_color">#FF111111</color>
-    <color name="primary_light_color">#FF373737</color>
-    <color name="primary_dark_color">#FF000000</color>
-    <color name="secondary_color">#FFFF7539</color>
-    <color name="primary_text_color">#FFFFFFFF</color>
+    <color name="primary_color">#ff111111</color>
+    <color name="primary_light_color">#ff373737</color>
+    <color name="primary_dark_color">#ff000000</color>
+    <color name="secondary_color">#ff3b6888</color>
+    <color name="primary_text_color">#ffffffff</color>
 
     <!-- Theme variables -->
-    <color name="navigation_bar_color">@color/primary_color</color>
-    <color name="list_multiselect_background">#66EEEEEE</color>
-    <color name="status_bar_color">@color/primary_color</color>
-    <color name="ripple_color">#aaff7539</color>
-    <color name="button_color">#44ff7539</color>
+    <color name="list_multiselect_background">#66eeeeee</color>
+    <color name="ripple_color">#aa3b6888</color>
+    <color name="button_color">#443b6888</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 49250a2e..ebfc822f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,16 +8,17 @@
     <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="secondary_color">#003e5b</color>
+    <color name="secondary_light_color">#3b6888</color>
+    <color name="secondary_dark_color">#001831</color>
     <color name="primary_text_color">#212121</color>
     <color name="white">#ffffffff</color>
 
     <!-- Theme variables -->
-    <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">@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>
+    <color name="status_bar_color">@color/primary_color</color>
+    <color name="ripple_color">#aa003e5b</color>
+    <color name="button_color">#44003e5b</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d84143ce..8b42d91e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,11 +12,12 @@
         <item name="colorPrimaryDark">@color/primary_color</item>
         <item name="colorPrimaryVariant">@color/primary_light_color</item>
         <item name="colorSecondary">@color/secondary_color</item>
+        <item name="colorSecondaryVariant">@color/secondary_dark_color</item>
         <item name="colorOnSecondary">@color/white</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:textColor">@color/primary_text_color</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>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 0d71d6cc..3c39bfad 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -190,7 +190,7 @@
 
     <PreferenceCategory>
         <Preference
-            app:icon="@mipmap/ic_launcher_round"
+            app:icon="@mipmap/ic_launcher"
             app:key="app_version"
             app:title="@string/prefs_version" />
     </PreferenceCategory>