From 05fb1d84f4d18b8a9795e3b9132e6871193eaf62 Mon Sep 17 00:00:00 2001
From: Ryan Harg <ryan.harg@mailbox.org>
Date: Fri, 2 Jul 2021 14:07:17 +0000
Subject: [PATCH] Update colors of light and dark scheme

---
 app/src/main/res/drawable-night/funkwhale.png | Bin 0 -> 18086 bytes
 app/src/main/res/drawable/login_input.xml     |   8 +-
 .../main/res/layout-land/activity_main.xml    |   2 +-
 app/src/main/res/layout/activity_login.xml    | 227 +++++++++---------
 .../main/res/layout/partial_now_playing.xml   |   4 +-
 app/src/main/res/layout/row_track.xml         | 132 +++++-----
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values-night/colors.xml      |  20 +-
 app/src/main/res/values/colors.xml            |  18 +-
 9 files changed, 208 insertions(+), 205 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/funkwhale.png

diff --git a/app/src/main/res/drawable-night/funkwhale.png b/app/src/main/res/drawable-night/funkwhale.png
new file mode 100644
index 0000000000000000000000000000000000000000..d616e9d5ea117cd69786b5e943400229695e6d7c
GIT binary patch
literal 18086
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%0DHiW)A1a
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
TH7*njM}V2ZbApZs$n*aXIkcd9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/login_input.xml b/app/src/main/res/drawable/login_input.xml
index df9aa73..edc8b7d 100644
--- a/app/src/main/res/drawable/login_input.xml
+++ b/app/src/main/res/drawable/login_input.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <item android:color="@android:color/white" android:state_focused="true" />
-  <item android:color="@android:color/white" android:state_hovered="true" />
-  <item android:color="@android:color/white" />
+  <item android:color="@color/controlColorHintText" android:state_focused="true" />
+  <item android:color="@color/controlColorHintText" android:state_hovered="true" />
+  <item android:color="@color/controlColorHintText" />
 
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 0c6e1d9..085ca5c 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -53,7 +53,7 @@
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
     android:theme="@style/AppTheme.AppBar"
-    app:backgroundTint="@color/colorPrimary"
+    app:backgroundTint="@color/colorPrimaryDark"
     app:layout_insetEdge="bottom"
     app:navigationIcon="@drawable/funkwhaleshape"
     tools:menu="@menu/toolbar" />
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 24f767b..4a5bc76 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,132 +1,131 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:background="@color/colorPrimary">
-
-  <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="32dp">
+    android:layout_height="match_parent"
+    android:background="@color/surface">
 
-    <ImageView
-      android:layout_width="128dp"
-      android:layout_height="128dp"
-      android:layout_marginBottom="32dp"
-      android:contentDescription="@string/alt_app_logo"
-      android:src="@drawable/funkwhale"
-      app:tint="@android:color/white" />
-
-    <TextView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="32dp"
-      android:text="@string/login_welcome"
-      android:textAlignment="center"
-      android:textColor="@android:color/white" />
-
-    <com.google.android.material.textfield.TextInputLayout
-      android:id="@+id/hostname_field"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="8dp"
-      android:textColorHint="@drawable/login_input"
-      app:boxBackgroundColor="@color/controlAccent"
-      app:boxBackgroundMode="filled"
-      app:boxStrokeWidth="0dp"
-      app:hintTextColor="@drawable/login_input">
-
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/hostname"
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/login_hostname"
-        android:inputType="textUri"
-        android:lines="1"
-        android:text="@string/debug.hostname"
-        android:textColor="@android:color/white"
-        android:textCursorDrawable="@null" />
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="32dp">
 
-    </com.google.android.material.textfield.TextInputLayout>
+        <ImageView
+            android:layout_width="128dp"
+            android:layout_height="128dp"
+            android:layout_marginBottom="32dp"
+            android:contentDescription="@string/alt_app_logo"
+            android:src="@drawable/funkwhale"/>
 
-    <com.google.android.material.checkbox.MaterialCheckBox
-      android:id="@+id/cleartext"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:buttonTint="@android:color/white"
-      android:text="@string/login_cleartext"
-      android:textColor="@android:color/white" />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp"
+            android:text="@string/login_welcome"
+            android:textAlignment="center"
+            android:textColor="@color/colorPrimary" />
 
-    <com.google.android.material.checkbox.MaterialCheckBox
-      android:id="@+id/anonymous"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:buttonTint="@android:color/white"
-      android:text="@string/login_anonymous"
-      android:textColor="@android:color/white" />
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/hostname_field"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:textColorHint="@drawable/login_input"
+            app:boxBackgroundColor="@color/elevatedSurface"
+            app:boxBackgroundMode="filled"
+            app:boxStrokeWidth="0dp"
+            app:hintTextColor="@drawable/login_input">
 
-    <com.google.android.material.textfield.TextInputLayout
-      android:id="@+id/username_field"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="8dp"
-      android:hint="@string/login_username"
-      android:textColorHint="@drawable/login_input"
-      app:boxBackgroundColor="@color/controlAccent"
-      app:boxBackgroundMode="filled"
-      app:boxStrokeColor="@drawable/login_input"
-      app:boxStrokeWidth="0dp"
-      app:hintTextColor="@drawable/login_input">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/hostname"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/login_hostname"
+                android:inputType="textUri"
+                android:lines="1"
+                android:text="@string/debug.hostname"
+                android:textColor="@color/controlColorText"
+                android:textCursorDrawable="@null" />
 
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/username"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textEmailAddress"
-        android:lines="1"
-        android:text="@string/debug.username"
-        android:textColor="@android:color/white"
-        android:textCursorDrawable="@null" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-    </com.google.android.material.textfield.TextInputLayout>
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/cleartext"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:buttonTint="@color/controlColorText"
+            android:text="@string/login_cleartext"
+            android:textColor="@color/controlColorText" />
 
-    <com.google.android.material.textfield.TextInputLayout
-      android:id="@+id/password_field"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="8dp"
-      android:hint="@string/login_password"
-      android:textColorHint="@drawable/login_input"
-      app:boxBackgroundColor="@color/controlAccent"
-      app:boxBackgroundMode="filled"
-      app:boxStrokeColor="@drawable/login_input"
-      app:boxStrokeWidth="0dp"
-      app:hintTextColor="@drawable/login_input"
-      app:passwordToggleEnabled="true">
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/anonymous"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:buttonTint="@color/controlColorText"
+            android:text="@string/login_anonymous"
+            android:textColor="@color/controlColorText" />
 
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/password"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textPassword"
-        android:lines="1"
-        android:text="@string/debug.password"
-        android:textColor="@android:color/white"
-        android:textCursorDrawable="@null" />
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/username_field"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:hint="@string/login_username"
+            android:textColorHint="@drawable/login_input"
+            app:boxBackgroundColor="@color/elevatedSurface"
+            app:boxBackgroundMode="filled"
+            app:boxStrokeColor="@drawable/login_input"
+            app:boxStrokeWidth="0dp"
+            app:hintTextColor="@drawable/login_input">
 
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textEmailAddress"
+                android:lines="1"
+                android:text="@string/debug.username"
+                android:textColor="@color/controlColorText"
+                android:textCursorDrawable="@null" />
 
-    <com.google.android.material.button.MaterialButton
-      android:id="@+id/login"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:backgroundTint="@color/colorAccent"
-      android:text="@string/login_submit"
-      android:textColor="@color/whiteWhileLight" />
-  </LinearLayout>
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/password_field"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:hint="@string/login_password"
+            android:textColorHint="@drawable/login_input"
+            app:boxBackgroundColor="@color/elevatedSurface"
+            app:boxBackgroundMode="filled"
+            app:boxStrokeColor="@drawable/login_input"
+            app:boxStrokeWidth="0dp"
+            app:hintTextColor="@drawable/login_input"
+            app:passwordToggleEnabled="true">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword"
+                android:lines="1"
+                android:text="@string/debug.password"
+                android:textColor="@color/controlColorText"
+                android:textCursorDrawable="@null" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/colorAccent"
+            android:text="@string/login_submit"
+            android:textColor="@color/whiteWhileLight" />
+    </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/partial_now_playing.xml b/app/src/main/res/layout/partial_now_playing.xml
index eef06e8..4eb5207 100644
--- a/app/src/main/res/layout/partial_now_playing.xml
+++ b/app/src/main/res/layout/partial_now_playing.xml
@@ -22,7 +22,7 @@
       android:layout_marginTop="-6dp"
       android:layout_marginBottom="-6dp"
       android:progress="40"
-      android:progressTint="@color/colorPrimary" />
+      android:progressTint="@color/colorPrimaryDark" />
 
     <LinearLayout
       android:layout_width="match_parent"
@@ -149,7 +149,7 @@
         android:orientation="horizontal">
 
         <LinearLayout
-          android:layout_width="match_parent"
+          android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_weight="1"
           android:orientation="vertical">
diff --git a/app/src/main/res/layout/row_track.xml b/app/src/main/res/layout/row_track.xml
index 80c5ea8..cc5eaff 100644
--- a/app/src/main/res/layout/row_track.xml
+++ b/app/src/main/res/layout/row_track.xml
@@ -1,78 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:layout_marginHorizontal="8dp"
-  android:layout_marginVertical="6dp"
-  android:background="@drawable/ripple"
-  android:gravity="center_vertical"
-  android:orientation="horizontal"
-  android:padding="8dp"
-  android:transitionGroup="true"
-  tools:showIn="@layout/fragment_tracks">
-
-  <org.funkwhale.ffa.views.SquareImageView
-    android:id="@+id/handle"
-    android:layout_width="18dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginEnd="16dp"
-    android:src="@drawable/reorder"
-    android:tint="#787878"
-    android:visibility="gone"
-    tools:visibility="visible" />
+    android:layout_marginHorizontal="8dp"
+    android:layout_marginVertical="6dp"
+    android:background="@drawable/ripple"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:padding="8dp"
+    android:transitionGroup="true"
+    tools:showIn="@layout/fragment_tracks">
 
-  <org.funkwhale.ffa.views.SquareImageView
-    android:id="@+id/cover"
-    android:layout_width="48dp"
-    android:layout_height="wrap_content"
-    android:layout_marginEnd="16dp"
-    tools:src="@tools:sample/avatars" />
+    <org.funkwhale.ffa.views.SquareImageView
+        android:id="@+id/handle"
+        android:layout_width="18dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/reorder"
+        android:tint="#787878"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-  <LinearLayout
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:orientation="vertical">
+    <org.funkwhale.ffa.views.SquareImageView
+        android:id="@+id/cover"
+        android:layout_width="48dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        tools:src="@tools:sample/avatars" />
 
-    <TextView
-      android:id="@+id/title"
-      style="@style/AppTheme.ItemTitle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:drawableStart="@drawable/downloaded"
-      android:drawablePadding="8dp"
-      android:drawableTint="@color/controlColor"
-      android:ellipsize="end"
-      android:lines="1"
-      tools:text="Absolution" />
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
 
-    <TextView
-      android:id="@+id/artist"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:ellipsize="end"
-      android:lines="1"
-      tools:text="Muse" />
+        <TextView
+            android:id="@+id/title"
+            style="@style/AppTheme.ItemTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/downloaded"
+            android:drawablePadding="8dp"
+            android:drawableTint="@color/controlColor"
+            android:ellipsize="end"
+            android:lines="1"
+            tools:text="Absolution" />
 
-  </LinearLayout>
+        <TextView
+            android:id="@+id/artist"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:lines="1"
+            tools:text="Muse" />
 
-  <ImageButton
-    android:id="@+id/favorite"
-    style="@style/IconButton"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:layout_marginStart="4dp"
-    android:layout_marginEnd="8dp"
-    android:contentDescription="@string/manage_add_to_favorites"
-    android:src="@drawable/favorite" />
+    </LinearLayout>
 
-  <ImageButton
-    android:id="@+id/actions"
-    style="@style/IconButton"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
-    android:contentDescription="@string/alt_more_options"
-    android:src="@drawable/more" />
+    <ImageButton
+        android:id="@+id/favorite"
+        style="@style/IconButton"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="8dp"
+        android:contentDescription="@string/manage_add_to_favorites"
+        android:src="@drawable/favorite" />
+
+    <ImageButton
+        android:id="@+id/actions"
+        style="@style/IconButton"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:contentDescription="@string/alt_more_options"
+        android:src="@drawable/more" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2911133..b6a7268 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -11,7 +11,7 @@
     <string name="login_error_hostname_https">Der Zugriff auf den Funkwhale Server sollte über https erfolgen</string>
     <string name="toolbar_search">Suche</string>
     <string name="title_settings">Einstellungen</string>
-    <string name="title_oss_licences">Open Source Lizenz</string>
+    <string name="title_oss_licences">Open Source Lizenzen</string>
     <string name="search_welcome">Gib deine Suchekritieren oben ein und drücke Enter um deine Musikbibliothek zu durchsuchen</string>
     <string name="search_placeholder">Durchsuche Künstler, Alben und Songs</string>
     <string name="search_no_results">Keine Ergebnisse wurden anhand deiner Suchkritieren gefunden</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cdf73e8..f8a4514 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="surface">#121212</color>
-  <color name="elevatedSurface">#191919</color>
+  <color name="surface">#202020</color>
+  <color name="elevatedSurface">#2f2f2f</color>
 
-  <color name="colorPrimary">#283f4e</color>
-  <color name="colorAccent">#3282b8</color>
+  <color name="colorPrimary">#949fa7</color>
+  <color name="colorAccent">#d35400</color>
 
   <color name="colorSelected">#525252</color>
-  <color name="colorFavorite">#eba999</color>
+  <color name="colorFavorite">#b34700</color>
 
   <color name="itemTitle">#abffffff</color>
 
-  <color name="controlForeground">#caffffff</color>
-  <color name="controlColor">#77a8c7</color>
-  <color name="controlAccent">#304A5A</color>
+  <color name="controlForeground">@color/colorPrimary</color>
+  <color name="controlColorText">@color/colorPrimary</color>
+  <color name="controlColorHintText">#dfebf0</color>
+  <color name="controlColor">@color/colorAccent</color>
+  <color name="controlAccent">@color/colorAccent</color>
 
   <color name="whiteWhileLight">#000000</color>
   <color name="blackWhileLight">#ffffff</color>
@@ -23,4 +25,4 @@
   <color name="cached">#aeaeae</color>
 
   <color name="ripple">#283f4e</color>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 64a94a0..138b6b6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="surface">@android:color/background_light</color>
-  <color name="elevatedSurface">@android:color/background_light</color>
+  <color name="surface">#eeeeee</color>
+  <color name="elevatedSurface">#f6f6f6</color>
 
-  <color name="colorPrimary">#327eae</color>
-  <color name="colorPrimaryDark">#3d3e40</color>
+  <color name="colorPrimary">#476d85</color>
+  <color name="colorPrimaryDark">#646568</color>
   <color name="colorAccent">#d35400</color>
   <color name="colorError">#fdcfbb</color>
 
   <color name="colorSelected">#dadada</color>
-  <color name="colorFavorite">#e17055</color>
+  <color name="colorFavorite">#d35400</color>
 
   <color name="itemTitle">#222222</color>
 
-  <color name="controlForeground">@color/colorPrimary</color>
-  <color name="controlColor">@color/colorPrimary</color>
-  <color name="controlAccent">#22648E</color>
+  <color name="controlForeground">@color/colorPrimaryDark</color>
+  <color name="controlColorText">@color/colorPrimaryDark</color>
+  <color name="controlColorHintText">#5988a6</color>
+  <color name="controlColor">@color/colorAccent</color>
+  <color name="controlAccent">@color/colorAccent</color>
 
   <color name="whiteWhileLight">#ffffff</color>
   <color name="blackWhileLight">#000000</color>