Always display tabs on Now Playing

4 files changed, 43 insertions, 79 deletions

diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index 1c752542..8e54c184 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -210,6 +210,6 @@
 

     <include layout="@layout/download_slider"/>

 

-    <include layout="@layout/download_button_bar_flipper"/>

+    <include layout="@layout/button_bar"/>

 

 </LinearLayout>

diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index 4b077bfd..906179ea 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -136,7 +136,7 @@
 

     <include layout="@layout/download_slider"/>

 

-    <include layout="@layout/download_button_bar_flipper"/>

+    <include layout="@layout/button_bar"/>

 

 </LinearLayout>

 

diff --git a/subsonic-android/res/layout/download_button_bar_flipper.xml b/subsonic-android/res/layout/download_button_bar_flipper.xml
deleted file mode 100644
index 9c885359..00000000
--- a/subsonic-android/res/layout/download_button_bar_flipper.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<github.daneren2005.dsub.util.MyViewFlipper

-        xmlns:android="http://schemas.android.com/apk/res/android"

-        android:id="@+id/download_button_bar_flipper"

-        android:layout_width="fill_parent"

-        android:layout_height="wrap_content"

-        android:background="@android:color/transparent">

-

-    <RelativeLayout

-            android:layout_width="fill_parent"

-            android:layout_height="wrap_content"

-            android:background="@android:color/transparent"

-            android:paddingLeft="8dip"

-            android:paddingRight="8dip">

-

-        <TextView

-                android:id="@+id/download_position"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_alignParentLeft="true"

-                android:layout_alignParentTop="true"

-                android:layout_marginRight="6dip"

-                android:text="0:00"

-                android:textAppearance="?android:attr/textAppearanceSmall"

-                android:textColor="@color/mediaControlForeground"/>

-        <TextView

-                android:id="@+id/download_duration"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_alignParentRight="true"

-                android:layout_alignParentTop="true"

-                android:layout_marginLeft="6dip"

-                android:text="-:--"

-                android:textAppearance="?android:attr/textAppearanceSmall"

-                android:textColor="@color/mediaControlForeground"/>

-        <TextView

-                android:id="@+id/download_artist"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_toRightOf="@+id/download_position"

-                android:layout_toLeftOf="@+id/download_duration"

-                android:layout_centerHorizontal="true"

-                android:layout_alignParentTop="true"

-                android:singleLine="true"

-                android:ellipsize="end"

-                android:gravity="center_horizontal"

-                android:textAppearance="?android:attr/textAppearanceSmall"

-                android:textColor="#c0c0c0"/>

-        <TextView

-                android:id="@+id/download_album"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_centerHorizontal="true"

-                android:layout_below="@+id/download_artist"

-                android:singleLine="true"

-                android:ellipsize="end"

-                android:textAppearance="?android:attr/textAppearanceSmall"

-                android:textColor="#c0c0c0"/>

-    </RelativeLayout>

-

-    <include layout="@layout/button_bar"/>

-

-</github.daneren2005.dsub.util.MyViewFlipper>

-

-

-

-

diff --git a/subsonic-android/res/layout/download_slider.xml b/subsonic-android/res/layout/download_slider.xml
index 549950a0..32e146e7 100644
--- a/subsonic-android/res/layout/download_slider.xml
+++ b/subsonic-android/res/layout/download_slider.xml
@@ -1,13 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>

-<github.daneren2005.dsub.util.HorizontalSlider

+<RelativeLayout

         xmlns:android="http://schemas.android.com/apk/res/android"

-        style="?android:attr/progressBarStyleHorizontal"

-        android:id="@+id/download_progress_bar"

-        android:indeterminate="false"

-        android:background="@android:color/transparent"

-        android:layout_width="fill_parent"

         android:layout_height="wrap_content"

-        android:paddingLeft="7dip"

-        android:paddingRight="7dip"

-        android:paddingTop="3dip"

-        android:paddingBottom="7dip"/>

+        android:layout_width="fill_parent"

+        android:background="@android:color/transparent">

+			

+	<TextView

+            android:id="@+id/download_position"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_alignParentLeft="true"

+            android:layout_centerVertical="true"

+            android:paddingLeft="8dip"

+            android:text="0:00"

+            android:textSize="12sp"

+			android:textColor="?android:textColorPrimary"

+			android:paddingBottom="4dip"/>

+

+	<github.daneren2005.dsub.util.HorizontalSlider

+			xmlns:android="http://schemas.android.com/apk/res/android"

+			style="?android:attr/progressBarStyleHorizontal"

+			android:id="@+id/download_progress_bar"

+			android:indeterminate="false"

+			android:background="@android:color/transparent"

+			android:layout_width="fill_parent"

+			android:layout_height="wrap_content"

+			android:paddingLeft="55dip"

+			android:paddingRight="55dip"

+			android:paddingTop="3dip"

+			android:paddingBottom="7dip"/>

+			

+	<TextView

+            android:id="@+id/download_duration"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_alignParentRight="true"

+            android:layout_centerVertical="true"

+            android:paddingRight="8dip"

+            android:text="-:--"

+            android:textSize="12sp"

+			android:textColor="?android:textColorPrimary"

+			android:paddingBottom="4dip"/>

+</RelativeLayout>
\ No newline at end of file