aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/res/layout-land/download.xml31
-rw-r--r--app/src/main/res/layout-large-land/download.xml26
2 files changed, 38 insertions, 19 deletions
diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml
index 855bf2a9..9a4dcade 100644
--- a/app/src/main/res/layout-land/download.xml
+++ b/app/src/main/res/layout-land/download.xml
@@ -11,13 +11,22 @@
android:layout_height="match_parent"
android:layout_weight="1">
- <github.daneren2005.dsub.view.RecyclingImageView
- android:id="@+id/download_album_art_image"
- android:src="@drawable/unknown_album_large"
+ <github.daneren2005.dsub.view.CardView
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:scaleType="fitCenter"/>
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_margin="14dp">
+
+ <github.daneren2005.dsub.view.RecyclingImageView
+ android:id="@+id/download_album_art_image"
+ android:src="@drawable/unknown_album_large"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:adjustViewBounds="true"
+ android:scaleType="fitCenter"/>
+
+ </github.daneren2005.dsub.view.CardView>
<include layout="@layout/download_playlist"/>
@@ -35,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
- android:layout_above="@+id/download_song_title">
+ android:layout_above="@+id/download_status">
<LinearLayout
android:id="@+id/download_other_controls_layout"
@@ -83,7 +92,7 @@
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary"
- android:layout_above="@+id/download_status"/>
+ android:layout_above="@+id/download_slider_wrapper"/>
<TextView
android:id="@+id/download_status"
@@ -97,13 +106,13 @@
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary"
- android:layout_above="@+id/download_media_buttons_wrapper"/>
+ android:layout_above="@+id/download_song_title"/>
<LinearLayout
android:id="@+id/download_media_buttons_wrapper"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_above="@+id/download_slider_wrapper">
+ android:layout_alignParentBottom="true">
<include layout="@layout/download_media_buttons"/>
</LinearLayout>
@@ -112,7 +121,7 @@
android:id="@+id/download_slider_wrapper"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true">
+ android:layout_above="@+id/download_media_buttons_wrapper">
<include layout="@layout/download_slider"/>
</LinearLayout>
diff --git a/app/src/main/res/layout-large-land/download.xml b/app/src/main/res/layout-large-land/download.xml
index cf5ef571..c773e1fe 100644
--- a/app/src/main/res/layout-large-land/download.xml
+++ b/app/src/main/res/layout-large-land/download.xml
@@ -5,13 +5,23 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <github.daneren2005.dsub.view.RecyclingImageView
- android:id="@+id/download_album_art_image"
- android:src="@drawable/unknown_album_large"
+ <github.daneren2005.dsub.view.CardView
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:layout_weight="1"
- android:scaleType="fitCenter"/>
+ android:layout_margin="14dp">
+
+ <github.daneren2005.dsub.view.RecyclingImageView
+ android:id="@+id/download_album_art_image"
+ android:src="@drawable/unknown_album_large"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:adjustViewBounds="true"
+ android:scaleType="fitCenter"/>
+
+ </github.daneren2005.dsub.view.CardView>
<RelativeLayout
android:id="@+id/download_control_layout"
@@ -98,13 +108,13 @@
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary"
- android:layout_above="@+id/download_media_buttons_wrapper"/>
+ android:layout_above="@+id/download_slider_wrapper"/>
<LinearLayout
android:id="@+id/download_media_buttons_wrapper"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_above="@+id/download_slider_wrapper">
+ android:layout_alignParentBottom="true">
<include layout="@layout/download_media_buttons"/>
</LinearLayout>
@@ -113,7 +123,7 @@
android:id="@+id/download_slider_wrapper"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true">
+ android:layout_above="@id/download_media_buttons_wrapper">
<include layout="@layout/download_slider"/>
</LinearLayout>