From ca15682a5ec9b26736b62482c75c02bcad74dad4 Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Tue, 19 Mar 2019 00:12:47 -0400
Subject: [PATCH] Update now playing layout

---
 app/src/main/res/drawable/gradient.xml        | 13 ++++
 app/src/main/res/layout/download.xml          | 59 ++++++++++++-------
 .../res/layout/download_media_buttons.xml     |  6 +-
 app/src/main/res/layout/download_slider.xml   |  5 +-
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/styles.xml            |  5 ++
 6 files changed, 63 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/drawable/gradient.xml

diff --git a/app/src/main/res/drawable/gradient.xml b/app/src/main/res/drawable/gradient.xml
new file mode 100644
index 0000000..bc1d8cc
--- /dev/null
+++ b/app/src/main/res/drawable/gradient.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape>
+        <gradient
+            android:angle="270"
+            android:startColor="#00000000"
+            android:centerColor="#00000000"
+            android:endColor="#bb000000"
+            android:type="linear"/>
+    </shape>
+</item>
+</selector>
diff --git a/app/src/main/res/layout/download.xml b/app/src/main/res/layout/download.xml
index f1c54a3..eb350b9 100644
--- a/app/src/main/res/layout/download.xml
+++ b/app/src/main/res/layout/download.xml
@@ -3,7 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <net.nullsum.audinaut.view.RecyclingImageView
+        android:id="@+id/download_album_art_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
     <LinearLayout
+        android:background="@drawable/gradient"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:orientation="vertical">
@@ -25,12 +32,6 @@
                     android:layout_height="0dp"
                     android:layout_weight="1">
 
-                    <net.nullsum.audinaut.view.RecyclingImageView
-                        android:id="@+id/download_album_art_background"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop" />
-
                     <net.nullsum.audinaut.view.RecyclingImageView
                         android:id="@+id/download_album_art_image"
                         android:layout_width="match_parent"
@@ -39,15 +40,24 @@
 
                 </RelativeLayout>
 
-                <LinearLayout
-                    android:id="@+id/download_overlay_buttons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:background="@color/overlayColor"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    android:visibility="invisible" />
+            </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="#000000"
+            android:orientation="vertical">
+
+            <include layout="@layout/download_playlist" />
+        </LinearLayout>
+
+        </ViewFlipper>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="20dp"
+            android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/download_status"
@@ -73,14 +83,19 @@
                     android:maxLines="1"
                     android:textColor="?android:textColorPrimary"
                     android:textStyle="bold" />
-            </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/download_overlay_buttons"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal|bottom"
+                    android:background="@color/overlayColor"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:visibility="invisible" />
 
-            <include layout="@layout/download_playlist" />
 
-        </ViewFlipper>
-
-        <include layout="@layout/download_media_buttons" />
-
-        <include layout="@layout/download_slider" />
+            <include layout="@layout/download_slider" />
+            <include layout="@layout/download_media_buttons" />
+        </LinearLayout>
     </LinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml
index 120ff06..e20d100 100644
--- a/app/src/main/res/layout/download_media_buttons.xml
+++ b/app/src/main/res/layout/download_media_buttons.xml
@@ -29,21 +29,21 @@
 
     <ImageButton
         android:id="@+id/download_pause"
-        style="@style/PlaybackControl.Large"
+        style="@style/PlaybackControl.Larger"
         android:layout_centerInParent="true"
         android:src="?attr/media_button_pause"
         android:visibility="invisible" />
 
     <ImageButton
         android:id="@+id/download_stop"
-        style="@style/PlaybackControl.Large"
+        style="@style/PlaybackControl.Larger"
         android:layout_centerInParent="true"
         android:src="?attr/media_button_stop"
         android:visibility="invisible" />
 
     <ImageButton
         android:id="@+id/download_start"
-        style="@style/PlaybackControl.Large"
+        style="@style/PlaybackControl.Larger"
         android:layout_centerInParent="true"
         android:src="?attr/media_button_start" />
 
diff --git a/app/src/main/res/layout/download_slider.xml b/app/src/main/res/layout/download_slider.xml
index 6e2788c..5fd019c 100644
--- a/app/src/main/res/layout/download_slider.xml
+++ b/app/src/main/res/layout/download_slider.xml
@@ -3,7 +3,10 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:background="@android:color/transparent"
-    android:paddingBottom="10dip">
+    android:layout_marginTop="15dp"
+    android:layout_marginBottom="5dp"
+    android:paddingLeft="10dip"
+    android:paddingRight="10dip">
 
     <TextView
         android:id="@+id/download_position"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 56ceb11..ede06a8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="Button">54dip</dimen>
+    <dimen name="Button.Larger">80dip</dimen>
     <dimen name="Button.Large">60dip</dimen>
     <dimen name="Button.Small">42dip</dimen>
     <dimen name="AlbumArt.Small">78dip</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 833c4aa..7a396d6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -66,6 +66,11 @@
         <item name="android:paddingRight">3dp</item>
     </style>
 
+    <style name="PlaybackControl.Larger" parent="@style/PlaybackControl">
+        <item name="android:layout_width">@dimen/Button.Larger</item>
+        <item name="android:layout_height">@dimen/Button.Larger</item>
+    </style>
+
     <style name="PlaybackControl.Match" parent="@style/PlaybackControl">
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_width">wrap_content</item>