From 4caf2dca669717a8e5d60abd60ae1f76a83b1850 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Tue, 13 Dec 2022 17:24:36 -0600
Subject: Improved Now Playing UI

---
 app/src/main/res/layout-port/download.xml | 99 +++++++++++++++++--------------
 1 file changed, 54 insertions(+), 45 deletions(-)

(limited to 'app/src/main/res/layout-port/download.xml')

diff --git a/app/src/main/res/layout-port/download.xml b/app/src/main/res/layout-port/download.xml
index 39b5e5e9..143240d9 100644
--- a/app/src/main/res/layout-port/download.xml
+++ b/app/src/main/res/layout-port/download.xml
@@ -28,53 +28,62 @@
 					android:layout_height="0dp"
 					android:layout_weight="1">
 
-					<FrameLayout android:orientation="vertical"
+					<github.daneren2005.dsub.view.CardView
 						android:layout_width="match_parent"
-						android:layout_height="wrap_content">
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:layout_margin="14dp">
 
-						<github.daneren2005.dsub.view.RecyclingImageView
-							android:id="@+id/download_album_art_image"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:scaleType="fitCenter"
-							android:layout_gravity="center_horizontal|top"/>
-
-						<LinearLayout
-							android:id="@+id/download_overlay_buttons"
+						<FrameLayout android:orientation="vertical"
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
-							android:layout_gravity="center_horizontal|bottom"
-							android:background="@color/overlayColor"
-							android:visibility="invisible"
-							android:gravity="center"
-							android:orientation="horizontal">
-
-								<ImageButton
-									android:id="@+id/download_rating_bad"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_action_rating_bad_dark"/>
-
-								<ImageButton
-									android:id="@+id/download_star"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_toggle_star_outline_dark"/>
-
-								<ImageButton
-									android:id="@+id/download_playback_speed"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_action_playback_speed_dark"/>
-
-								<ImageButton
-									android:id="@+id/download_bookmark"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_menu_bookmark_dark"/>
-
-								<ImageButton
-									android:id="@+id/download_rating_good"
-									style="@style/DownloadActionImageButton"
-									android:src="@drawable/ic_action_rating_good_dark"/>
-						</LinearLayout>
-					</FrameLayout>
+							android:layout_gravity="center_vertical">
+
+							<github.daneren2005.dsub.view.RecyclingImageView
+								android:id="@+id/download_album_art_image"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content"
+								android:scaleType="fitCenter"
+								android:adjustViewBounds="true"
+								android:layout_gravity="center"/>
+
+							<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:visibility="invisible"
+								android:gravity="center"
+								android:orientation="horizontal">
+
+									<ImageButton
+										android:id="@+id/download_rating_bad"
+										style="@style/DownloadActionImageButton"
+										android:src="@drawable/ic_action_rating_bad_dark"/>
+
+									<ImageButton
+										android:id="@+id/download_star"
+										style="@style/DownloadActionImageButton"
+										android:src="@drawable/ic_toggle_star_outline_dark"/>
+
+									<ImageButton
+										android:id="@+id/download_playback_speed"
+										style="@style/DownloadActionImageButton"
+										android:src="@drawable/ic_action_playback_speed_dark"/>
+
+									<ImageButton
+										android:id="@+id/download_bookmark"
+										style="@style/DownloadActionImageButton"
+										android:src="@drawable/ic_menu_bookmark_dark"/>
+
+									<ImageButton
+										android:id="@+id/download_rating_good"
+										style="@style/DownloadActionImageButton"
+										android:src="@drawable/ic_action_rating_good_dark"/>
+							</LinearLayout>
+						</FrameLayout>
+					</github.daneren2005.dsub.view.CardView>
 				</FrameLayout>
 
 				<TextView
@@ -107,8 +116,8 @@
 
 		</ViewFlipper>
 
-		<include layout="@layout/download_media_buttons"/>
-
 		<include layout="@layout/download_slider"/>
+
+		<include layout="@layout/download_media_buttons"/>
 	</LinearLayout>
 </FrameLayout>
-- 
cgit v1.2.3