From 8d7836172b5247afc86862da5bb4a7e89f867b8e Mon Sep 17 00:00:00 2001
From: Antoine POPINEAU <antoine@popineau.eu>
Date: Sat, 11 Jul 2020 19:24:38 +0200
Subject: [PATCH] Reorganized Now Playing view to be more legible.

---
 app/src/main/res/drawable/circle.xml          |  8 +++
 .../res/layout-land/partial_now_playing.xml   |  7 ++-
 .../main/res/layout/partial_now_playing.xml   | 60 ++++++++++++-------
 app/src/main/res/values-night/colors.xml      |  1 +
 app/src/main/res/values/colors.xml            |  1 +
 5 files changed, 53 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/res/drawable/circle.xml

diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml
new file mode 100644
index 0000000..bfbaf62
--- /dev/null
+++ b/app/src/main/res/drawable/circle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="oval">
+
+  <solid android:color="@color/elevatedSurface" />
+  <padding android:top="5dp" android:left="5dp" android:right="5dp" android:bottom="5dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/partial_now_playing.xml b/app/src/main/res/layout-land/partial_now_playing.xml
index 440f107..f767f20 100644
--- a/app/src/main/res/layout-land/partial_now_playing.xml
+++ b/app/src/main/res/layout-land/partial_now_playing.xml
@@ -5,6 +5,7 @@
   android:id="@+id/now_playing_root"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:background="@color/elevatedSurface"
   android:orientation="vertical">
 
   <LinearLayout
@@ -97,10 +98,10 @@
     android:id="@+id/now_playing_details"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="32dp"
-    android:paddingEnd="32dp"
     android:orientation="vertical"
-    android:paddingTop="16dp">
+    android:paddingStart="32dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="32dp">
 
     <TextView
       android:id="@+id/now_playing_details_title"
diff --git a/app/src/main/res/layout/partial_now_playing.xml b/app/src/main/res/layout/partial_now_playing.xml
index ae77545..6291df9 100644
--- a/app/src/main/res/layout/partial_now_playing.xml
+++ b/app/src/main/res/layout/partial_now_playing.xml
@@ -5,6 +5,7 @@
   android:id="@+id/now_playing_root"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:background="@color/elevatedSurface"
   android:orientation="vertical">
 
   <LinearLayout
@@ -126,18 +127,10 @@
         android:layout_height="32dp"
         android:layout_gravity="top|end"
         android:layout_margin="8dp"
+        android:background="@drawable/circle"
         android:contentDescription="@string/alt_track_info"
-        android:src="@drawable/more" />
-
-      <ImageButton
-        android:id="@+id/now_playing_details_favorite"
-        style="@style/IconButton"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="8dp"
-        android:contentDescription="@string/alt_album_cover"
-        android:src="@drawable/favorite" />
+        android:src="@drawable/more"
+        android:tint="@color/controlForeground" />
 
     </FrameLayout>
 
@@ -150,19 +143,44 @@
       android:orientation="vertical"
       android:paddingTop="16dp">
 
-      <TextView
-        android:id="@+id/now_playing_details_title"
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/itemTitle"
-        android:textSize="18sp"
-        tools:text="Supermassive Black Hole" />
+        android:orientation="horizontal">
 
-      <TextView
-        android:id="@+id/now_playing_details_artist"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:text="Muse" />
+        <LinearLayout
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="vertical">
+
+          <TextView
+            android:id="@+id/now_playing_details_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/itemTitle"
+            android:textSize="18sp"
+            tools:text="Supermassive Black Hole" />
+
+          <TextView
+            android:id="@+id/now_playing_details_artist"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="Muse" />
+
+        </LinearLayout>
+
+        <ImageButton
+          android:id="@+id/now_playing_details_favorite"
+          style="@style/IconButton"
+          android:layout_width="24dp"
+          android:layout_height="24dp"
+          android:layout_gravity="bottom|end"
+          android:layout_margin="8dp"
+          android:contentDescription="@string/alt_album_cover"
+          android:src="@drawable/favorite" />
+
+      </LinearLayout>
 
       <SeekBar
         android:id="@+id/now_playing_details_progress"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index d71ea50..17ec816 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <color name="surface">#121212</color>
+  <color name="elevatedSurface">#191919</color>
 
   <color name="colorPrimary">#283f4e</color>
   <color name="colorAccent">#f1b44f</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b88314f..64a94a0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
 <?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="colorPrimary">#327eae</color>
   <color name="colorPrimaryDark">#3d3e40</color>