Merge remote-tracking branch 'upstream/master'

13 files changed, 24 insertions, 226 deletions

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

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

-        android:layout_width="fill_parent"

-        android:layout_height="45dp"

-        android:background="@drawable/menubar_button_disabled">

-

-    <ImageView

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

-            android:src="@drawable/main_header_icon2"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_gravity="center_vertical"

-            android:layout_alignParentTop="true"

-            android:layout_alignParentLeft="true"

-            android:layout_alignParentBottom="true"

-            android:paddingLeft="4dip"

-            android:paddingRight="4dip"

-            android:paddingTop="2dip"

-            android:paddingBottom="2dip"

-            android:scaleType="centerInside"

-            />

-			

-	<ImageButton

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

-            android:src="@drawable/action_settings"

-            android:layout_width="44dip"

-            android:layout_height="wrap_content"

-			android:layout_alignParentRight="true"

-            android:layout_alignParentTop="true"

-            android:layout_alignParentBottom="true"

-            android:scaleType="fitCenter"

-            android:padding="5dp"

-            android:background="@drawable/actionbar_button"

-            />

-			

-	<ImageButton

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

-            android:src="@drawable/action_help"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_alignParentTop="true"

-            android:layout_alignParentBottom="true"

-			android:layout_toLeftOf="@id/action_button_4"

-            android:scaleType="center"

-            android:padding="5dp"

-            android:background="@drawable/actionbar_button"

-            />

-

-    <ImageButton

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

-            android:src="@drawable/action_search"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_alignParentTop="true"

-            android:layout_alignParentBottom="true"

-			android:layout_toLeftOf="@id/action_button_3"

-            android:scaleType="center"

-            android:padding="5dp"

-            android:background="@drawable/actionbar_button"

-            />

-

-    <ImageButton

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

-            android:src="@drawable/action_shuffle"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_alignParentTop="true"

-            android:layout_alignParentBottom="true"

-            android:layout_toLeftOf="@id/action_button_2"

-            android:scaleType="center"

-            android:padding="5dp"

-            android:background="@drawable/actionbar_button"

-            />

-

-    <TextView

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

-            android:text="Subsonic"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_alignParentTop="true"

-            android:layout_alignParentBottom="true"

-            android:layout_toLeftOf="@id/action_button_1"

-            android:layout_toRightOf="@id/actionbar_home_icon"

-            android:gravity="center_vertical"

-            android:textColor="#FFFFFF"

-            android:textSize="18sp"

-            android:textStyle="bold"

-            android:shadowColor="#000000"

-            android:shadowDx="1"

-            android:shadowDy="1"

-            android:shadowRadius="1"

-            android:lineSpacingMultiplier="0.85"

-            android:ellipsize="middle"

-            android:inputType="none"

-            />

-

-</RelativeLayout>

diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml
index 15d999c3..2e74390f 100644
--- a/subsonic-android/res/layout/album_list_item.xml
+++ b/subsonic-android/res/layout/album_list_item.xml
@@ -38,7 +38,7 @@
     </LinearLayout>

 

     <ImageView

-            android:src="@drawable/list_item_artist"

+            android:src="@drawable/list_item_more"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_gravity="right|center_vertical"

diff --git a/subsonic-android/res/layout/artist_list_item.xml b/subsonic-android/res/layout/artist_list_item.xml
index 8aaa42d0..3c99ccbd 100644
--- a/subsonic-android/res/layout/artist_list_item.xml
+++ b/subsonic-android/res/layout/artist_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@android:id/text1"
-          android:drawableRight="@drawable/list_item_artist"
+          android:drawableRight="@drawable/list_item_more"
           android:drawablePadding="6dip"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/button_bar.xml b/subsonic-android/res/layout/button_bar.xml
index 1d576775..52c78ba1 100644
--- a/subsonic-android/res/layout/button_bar.xml
+++ b/subsonic-android/res/layout/button_bar.xml
@@ -6,47 +6,42 @@
               android:layout_width="fill_parent"

               android:layout_height="wrap_content">

 

-    <View

-            android:layout_width="fill_parent"

-            android:layout_height="1px"

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

-

     <LinearLayout android:orientation="horizontal"

                   android:layout_width="fill_parent"

-                  android:layout_height="wrap_content"

+                  android:layout_height="48dp"

                   android:gravity="center_horizontal">

 

         <ImageButton android:id="@+id/button_bar_home"

                      android:src="@drawable/menu_home"

                      android:contentDescription="@string/button_bar.home"

                      android:background="@drawable/menubar_button"

+					 android:layout_height="match_parent"

                      android:layout_weight="1"

-                     android:layout_width="0dp"

-                     android:layout_height="wrap_content"/>

+                     android:layout_width="0dp"/>

 

         <ImageButton android:id="@+id/button_bar_music"

                      android:src="@drawable/menu_browse"

                      android:contentDescription="@string/button_bar.browse"

                      android:background="@drawable/menubar_button"

+					 android:layout_height="match_parent"

                      android:layout_weight="1"

-                     android:layout_width="0dp"

-                     android:layout_height="wrap_content"/>

+                     android:layout_width="0dp"/>

 

         <ImageButton android:id="@+id/button_bar_playlists"

                      android:src="@drawable/menu_playlists"

                      android:contentDescription="@string/button_bar.playlists"

                      android:background="@drawable/menubar_button"

+					 android:layout_height="match_parent"

                      android:layout_weight="1"

-                     android:layout_width="0dp"

-                     android:layout_height="wrap_content"/>

+                     android:layout_width="0dp"/>

 

         <ImageButton android:id="@+id/button_bar_now_playing"

                      android:src="@drawable/menu_now_playing"

                      android:contentDescription="@string/button_bar.now_playing"

                      android:background="@drawable/menubar_button"

+					 android:layout_height="match_parent"

                      android:layout_weight="1"

-                     android:layout_width="0dp"

-                     android:layout_height="wrap_content"/>

+                     android:layout_width="0dp"/>

 

     </LinearLayout>

 </LinearLayout>

diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml
index e151f319..56b013fe 100644
--- a/subsonic-android/res/layout/main.xml
+++ b/subsonic-android/res/layout/main.xml
@@ -4,12 +4,6 @@
               android:layout_width="fill_parent"

               android:layout_height="fill_parent">

 

-    <include 

-            layout="@layout/action_bar"

-            android:layout_width="fill_parent"

-            android:layout_height="45dp"

-            />

-

     <View

             android:layout_width="fill_parent"

             android:layout_height="1px"

diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
index 969ad99e..655854be 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -48,16 +48,17 @@
             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

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

-            android:textColor="#EFEFEF"

-            android:textStyle="bold"

-            android:background="#A5A5A5"

+            android:textColor="@color/cyan"

             android:gravity="center_vertical"

-            android:paddingLeft="4dp"/>

+            android:paddingLeft="6dp"

+			android:textAllCaps="true"

+			android:textStyle="bold"

+			android:textSize="16sp"/>

 

     <TextView

             android:id="@+id/main_albums_newest"

             android:text="@string/main.albums_newest"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -69,7 +70,7 @@
     <TextView

             android:id="@+id/main_albums_recent"

             android:text="@string/main.albums_recent"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -81,7 +82,7 @@
     <TextView

             android:id="@+id/main_albums_frequent"

             android:text="@string/main.albums_frequent"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -93,7 +94,7 @@
     <TextView

             android:id="@+id/main_albums_highest"

             android:text="@string/main.albums_highest"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -105,7 +106,7 @@
     <TextView

             android:id="@+id/main_albums_random"

             android:text="@string/main.albums_random"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

diff --git a/subsonic-android/res/layout/playlist_list_item.xml b/subsonic-android/res/layout/playlist_list_item.xml
index 20706dc9..3c99ccbd 100644
--- a/subsonic-android/res/layout/playlist_list_item.xml
+++ b/subsonic-android/res/layout/playlist_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@android:id/text1"
-          android:drawableRight="@drawable/list_item_playlist"
+          android:drawableRight="@drawable/list_item_more"
           android:drawablePadding="6dip"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/search.xml b/subsonic-android/res/layout/search.xml
index f65bcb36..5f5c26e0 100644
--- a/subsonic-android/res/layout/search.xml
+++ b/subsonic-android/res/layout/search.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"

               android:layout_height="fill_parent">

 

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

-

     <View

             android:layout_width="fill_parent"

             android:layout_height="1px"

diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml
index 2c9a00aa..a5802246 100644
--- a/subsonic-android/res/layout/select_album.xml
+++ b/subsonic-android/res/layout/select_album.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"

               android:layout_height="fill_parent">

 

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

-

     <View

             android:layout_width="fill_parent"

             android:layout_height="1px"

@@ -28,93 +26,6 @@
               android:layout_weight="1.0"

               android:fastScrollEnabled="true"

             />

-			

-	<LinearLayout android:orientation="horizontal"

-		android:layout_marginTop="6dp"

-		android:layout_marginBottom="3dp"

-		android:layout_width="fill_parent"

-		android:layout_height="wrap_content">				

-				

-		<Button android:id="@+id/select_album_pin"

-				android:text="@string/common.pin"

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

-				android:layout_marginLeft="6dp"

-				android:layout_marginRight="3dp"

-				android:layout_weight="1"

-				android:layout_width="0dp"

-				android:layout_height="fill_parent"

-				android:visibility="gone"/>

-

-		<Button android:id="@+id/select_album_unpin"

-				android:text="@string/common.unpin"

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

-				android:layout_marginLeft="3dp"

-				android:layout_marginRight="3dp"

-				android:layout_weight="1"

-				android:layout_width="0dp"

-				android:layout_height="fill_parent"

-				android:visibility="gone"/>

-

-		<Button android:id="@+id/select_album_delete"

-				android:text="@string/common.delete"

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

-				android:layout_marginLeft="3dp"

-				android:layout_marginRight="6dp"

-				android:layout_weight="1"

-				android:layout_width="0dp"

-				android:layout_height="fill_parent"

-				android:visibility="gone"/>

-					  

-	</LinearLayout>

-	

-	<LinearLayout android:orientation="horizontal"

-		android:layout_marginTop="6dp"

-		android:layout_marginBottom="3dp"

-		android:layout_width="fill_parent"

-		android:layout_height="wrap_content">

-

-        <Button android:id="@+id/select_album_select"

-                android:text="@string/select_album.select"

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

-                android:visibility="gone"

-                android:layout_marginLeft="6dp"

-                android:layout_marginRight="3dp"

-                android:layout_weight="1"

-                android:layout_width="0dp"

-                android:layout_height="fill_parent"/>

-

-        <Button android:id="@+id/select_album_play_now"

-                android:text="@string/common.play_now"

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

-                android:visibility="gone"

-                android:layout_marginLeft="3dp"

-                android:layout_marginRight="3dp"

-                android:layout_weight="1"

-                android:layout_width="0dp"

-                android:layout_height="fill_parent"/>

-				

-		<Button android:id="@+id/select_album_play_shuffled"

-				android:text="@string/common.play_shuffled"

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

-				android:visibility="gone"

-				android:layout_marginLeft="3dp"

-				android:layout_marginRight="3dp"

-				android:layout_weight="1"

-				android:layout_width="0dp"

-				android:layout_height="fill_parent"/>

-				

-

-        <Button android:id="@+id/select_album_play_last"

-                android:text="@string/common.play_last"

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

-                android:visibility="gone"

-                android:layout_marginLeft="3dp"

-                android:layout_marginRight="6dp"

-                android:layout_weight="1"

-                android:layout_width="0dp"

-                android:layout_height="fill_parent"/>

-

-    </LinearLayout>

 

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

 

diff --git a/subsonic-android/res/layout/select_artist.xml b/subsonic-android/res/layout/select_artist.xml
index 7cf6fc77..bebfdec4 100644
--- a/subsonic-android/res/layout/select_artist.xml
+++ b/subsonic-android/res/layout/select_artist.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"

               android:layout_height="fill_parent">

 

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

-

     <View

             android:layout_width="fill_parent"

             android:layout_height="1px"

diff --git a/subsonic-android/res/layout/select_artist_header.xml b/subsonic-android/res/layout/select_artist_header.xml
index 247eb806..50e10742 100644
--- a/subsonic-android/res/layout/select_artist_header.xml
+++ b/subsonic-android/res/layout/select_artist_header.xml
@@ -10,7 +10,7 @@
         android:minHeight="?android:attr/listPreferredItemHeight">

 

     <ImageView

-            android:src="@drawable/select_artist_folder"

+            android:src="@drawable/main_select_server"

             android:layout_gravity="center_vertical"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"/>

diff --git a/subsonic-android/res/layout/select_playlist.xml b/subsonic-android/res/layout/select_playlist.xml
index c23e764b..2555687d 100644
--- a/subsonic-android/res/layout/select_playlist.xml
+++ b/subsonic-android/res/layout/select_playlist.xml
@@ -4,8 +4,6 @@
               android:layout_width="fill_parent"

               android:layout_height="fill_parent">

 

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

-

     <View

             android:layout_width="fill_parent"

             android:layout_height="1px"

diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml
index 2163ef72..f8d518ad 100644
--- a/subsonic-android/res/layout/song_list_item.xml
+++ b/subsonic-android/res/layout/song_list_item.xml
@@ -9,7 +9,7 @@
             android:layout_width="wrap_content"

             android:layout_height="fill_parent"

             android:gravity="center_vertical"

-            android:checkMark="?android:attr/textCheckMark"

+            android:checkMark="@drawable/btn_check"

             android:paddingLeft="3dip"/>

 

     <LinearLayout android:orientation="vertical"