From c1740b5291d4e8c8d242259c42a50be3de8634a1 Mon Sep 17 00:00:00 2001
From: Joshua Bahnsen <archrival@gmail.com>
Date: Fri, 24 Jan 2014 23:33:47 -0700
Subject: [PATCH] Optimize now playing screen layouts

---
 res/layout-land/download.xml               | 133 ++++++++++-----------
 res/layout-port/download.xml               |  10 +-
 res/layout/download_button_bar_flipper.xml |   5 +-
 res/layout/media_buttons.xml               |   5 +-
 res/values-fr/strings.xml                  |   1 +
 res/values-hu/strings.xml                  |   1 +
 res/values/strings.xml                     |   1 +
 7 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index cc53ed9c..5a354b52 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -1,86 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-    a:layout_width="fill_parent"
-    a:layout_height="fill_parent"
-    a:orientation="vertical" >
+              a:layout_width="fill_parent"
+              a:layout_height="fill_parent"
+              a:orientation="horizontal">
+
+    <com.thejoshwa.ultrasonic.androidapp.util.MyViewFlipper
+        a:id="@+id/download_playlist_flipper"
+        a:layout_width="fill_parent"
+        a:layout_height="fill_parent"
+        a:layout_weight="1">
+
+        <FrameLayout
+            a:id="@+id/download_album_art_layout"
+            a:layout_width="fill_parent"
+            a:layout_height="fill_parent"
+            a:layout_weight="1"
+            a:gravity="left"
+            a:orientation="horizontal">
+
+            <ImageView
+                a:id="@+id/download_album_art_image"
+                a:layout_width="wrap_content"
+                a:layout_height="wrap_content"
+                a:scaleType="center"
+                a:contentDescription="@string/albumArt"/>
+
+            <LinearLayout
+                a:id="@+id/download_visualizer_view_layout"
+                a:layout_width="fill_parent"
+                a:layout_height="60dip"
+                a:layout_gravity="bottom|center_horizontal"
+                a:layout_marginLeft="60dip"
+                a:layout_marginRight="60dip"
+                a:background="@color/translucent"
+                a:orientation="vertical"/>
+
+        </FrameLayout>
+
+        <include layout="@layout/download_playlist"/>
+    </com.thejoshwa.ultrasonic.androidapp.util.MyViewFlipper>
 
     <RelativeLayout
+        a:id="@+id/download_control_layout"
         a:layout_width="fill_parent"
-        a:layout_height="0dip"
+        a:layout_height="fill_parent"
         a:layout_weight="1"
-        a:orientation="horizontal" >
+        a:orientation="vertical">
 
-        <RelativeLayout
-            a:id="@+id/download_control_layout"
-            a:layout_width="wrap_content"
-            a:layout_height="fill_parent"
-            a:layout_alignParentRight="true" >
+        <LinearLayout
+            a:layout_height="wrap_content"
+            a:layout_width="fill_parent"
+            a:id="@+id/buttons"
+            a:layout_above="@+id/slider">
 
-            <LinearLayout
-                a:id="@+id/linearLayout2"
-                a:layout_width="wrap_content"
-                a:layout_height="wrap_content"
-                a:layout_alignParentTop="true"
-                a:layout_centerHorizontal="true"
-                a:orientation="vertical"
-                a:paddingBottom="8dip"
-                a:paddingTop="8dip" >
+            <include layout="@layout/media_buttons"/>
+        </LinearLayout>
 
-            </LinearLayout>
+        <LinearLayout
+            a:layout_height="wrap_content"
+            a:layout_width="fill_parent"
+            a:id="@+id/slider"
+            a:layout_above="@+id/playback_text">
 
-            <LinearLayout
-                a:id="@+id/linearLayout1"
-                a:layout_width="wrap_content"
-                a:layout_height="wrap_content"
-                a:layout_alignParentBottom="true"
-                a:layout_alignParentLeft="true"
-                a:orientation="vertical"
-                a:paddingBottom="8dip"
-                a:paddingTop="8dip" >
+            <include layout="@layout/download_slider"/>
+        </LinearLayout>
 
-                <include layout="@layout/media_buttons" />
-            </LinearLayout>
+        <LinearLayout
+            a:layout_height="wrap_content"
+            a:layout_width="fill_parent"
+            a:layout_alignParentBottom="true"
+            a:id="@+id/playback_text">
 
-        </RelativeLayout>
+            <include layout="@layout/download_button_bar_flipper"/>
+        </LinearLayout>
 
-        <com.thejoshwa.ultrasonic.androidapp.util.MyViewFlipper
-            a:id="@+id/download_playlist_flipper"
-            a:layout_width="wrap_content"
-            a:layout_height="fill_parent"
-            a:layout_alignParentLeft="true"
-            a:layout_toLeftOf="@+id/download_control_layout" >
-
-            <FrameLayout
-                a:id="@+id/download_album_art_layout"
-                a:layout_width="fill_parent"
-                a:layout_height="fill_parent"
-                a:layout_weight="1"
-                a:gravity="left"
-                a:orientation="horizontal" >
-
-                <ImageView
-                    a:id="@+id/download_album_art_image"
-                    a:layout_width="wrap_content"
-                    a:layout_height="wrap_content"
-                    a:scaleType="fitCenter" />
-
-                <LinearLayout
-                    a:id="@+id/download_visualizer_view_layout"
-                    a:layout_width="fill_parent"
-                    a:layout_height="60dip"
-                    a:layout_gravity="bottom|center_horizontal"
-                    a:layout_marginLeft="60dip"
-                    a:layout_marginRight="60dip"
-                    a:background="@color/translucent"
-                    a:orientation="vertical" />
-            </FrameLayout>
-
-            <include layout="@layout/download_playlist" />
-        </com.thejoshwa.ultrasonic.androidapp.util.MyViewFlipper>
     </RelativeLayout>
 
-    <include layout="@layout/download_slider" />
-
-    <include layout="@layout/download_button_bar_flipper" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index 1e5bc28e..7a809373 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -21,10 +21,11 @@
             <ImageView
                 a:id="@+id/download_album_art_image"
                 a:layout_width="wrap_content"
-                a:layout_height="wrap_content"
-                a:scaleType="fitCenter"
+                a:layout_height="fill_parent"
+                a:scaleType="centerCrop"
                 a:layout_alignParentTop="true"
-                a:layout_centerInParent="true"/>
+                a:layout_centerInParent="true"
+                a:contentDescription="@string/albumArt"/>
 
             <LinearLayout
                 a:id="@+id/download_visualizer_view_layout"
@@ -35,7 +36,8 @@
                 a:background="@color/translucent"
                 a:layout_marginLeft="80dip"
                 a:layout_marginRight="80dip"
-                a:orientation="vertical" />
+                a:orientation="vertical"
+                />
         </RelativeLayout>
 
         <include layout="@layout/download_playlist" />
diff --git a/res/layout/download_button_bar_flipper.xml b/res/layout/download_button_bar_flipper.xml
index 528ac855..94e9d34d 100644
--- a/res/layout/download_button_bar_flipper.xml
+++ b/res/layout/download_button_bar_flipper.xml
@@ -16,9 +16,8 @@
         a:gravity="center"
         a:ellipsize="end"
         a:singleLine="true"
-        a:textAppearance="?android:attr/textAppearanceMedium"
-        a:text="Title" />
-    
+        a:textAppearance="?android:attr/textAppearanceMedium"/>
+
     <RelativeLayout
         a:id="@+id/download_items"    
         a:layout_width="fill_parent"
diff --git a/res/layout/media_buttons.xml b/res/layout/media_buttons.xml
index c2d786c6..66488ec6 100644
--- a/res/layout/media_buttons.xml
+++ b/res/layout/media_buttons.xml
@@ -6,9 +6,10 @@
               a:paddingBottom="8dip"
               a:paddingTop="8dip"
               a:paddingLeft="4dip"
-              a:paddingRight="4dip">
+              a:paddingRight="4dip"
+    >
 
-    <ImageView
+<ImageView
         a:id="@+id/download_shuffle"
         a:layout_width="0dip"
         a:layout_height="wrap_content"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c1193303..4f6d90ba 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -387,6 +387,7 @@
     <string name="settings.image_loader_concurrency_10">10</string>
     <string name="settings.image_loader_concurrency_11">11</string>
     <string name="settings.image_loader_concurrency_12">12</string>
+    <string name="albumArt">albumArt</string>
 
     <plurals name="select_album_n_songs">
         <item quantity="zero">Aucun titre</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 46d0cc20..bc3d5c3d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -387,6 +387,7 @@
     <string name="settings.image_loader_concurrency_10">10</string>
     <string name="settings.image_loader_concurrency_11">11</string>
     <string name="settings.image_loader_concurrency_12">12</string>
+    <string name="albumArt">albumArt</string>
 
     <plurals name="select_album_n_songs">
         <item quantity="zero">Nincsenek dalok</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61d9d5fa..8880666f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -387,6 +387,7 @@
     <string name="settings.image_loader_concurrency_10">10</string>
     <string name="settings.image_loader_concurrency_11">11</string>
     <string name="settings.image_loader_concurrency_12">12</string>
+    <string name="albumArt">albumArt</string>
 
     <plurals name="select_album_n_songs">
         <item quantity="zero">No songs</item>