Merge branch 'master_star_support'

6 files changed, 55 insertions, 4 deletions

diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index 01a9b68d..b0303e52 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -14,15 +14,15 @@
                 android:layout_width="wrap_content"

                 android:layout_height="fill_parent"

                 android:layout_alignParentRight="true"

-                android:background="@color/mediaControlBackground"

-                >

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

 

             <LinearLayout

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

                     android:orientation="horizontal"

                     android:layout_width="wrap_content"

                     android:layout_height="wrap_content"

                     android:layout_alignParentTop="true"

-                    android:layout_alignParentLeft="true">

+                    android:layout_centerHorizontal="true">

 

                 <ImageButton

                         android:id="@+id/download_previous"

@@ -87,7 +87,6 @@
                     android:id="@+id/download_song_title"

                     android:layout_width="150dip"

                     android:layout_height="wrap_content"

-                    android:layout_gravity="center_horizontal"

                     android:layout_above="@+id/download_status"

                     android:layout_centerHorizontal="true"

                     android:layout_marginLeft="12dip"

@@ -99,6 +98,7 @@
                     android:textColor="@color/mediaControlForeground"/>

 

             <LinearLayout

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

                     android:orientation="horizontal"

                     android:layout_width="wrap_content"

                     android:layout_height="wrap_content"

@@ -111,6 +111,7 @@
                         android:background="@android:color/transparent"

                         android:layout_width="wrap_content"

                         android:layout_height="wrap_content"

+                        android:layout_below="@+id/download_play_controls_layout"

                         android:padding="9dip"/>

                 <ImageButton

                         android:id="@+id/download_repeat"

@@ -120,6 +121,13 @@
                         android:layout_height="wrap_content"

                         android:padding="9dip"/>

                 <ImageButton

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

+                        android:layout_width="wrap_content"

+                        android:layout_height="wrap_content"

+                        android:layout_gravity="center_vertical"

+                        android:background="@null"

+                        android:src="@android:drawable/star_big_off"/>

+                <ImageButton

                         android:id="@+id/download_toggle_list"

                         android:src="@drawable/media_toggle_list"

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

diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index e2a198a2..e6a2358a 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -72,6 +72,15 @@
                     android:paddingTop="12dip"

                     android:paddingRight="12dip"

                     android:paddingBottom="12dip"/>

+            

+            <ImageButton

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

+                    android:layout_width="wrap_content"

+                    android:layout_height="wrap_content"

+                    android:layout_alignRight="@+id/download_repeat"

+                    android:layout_below="@+id/download_jukebox"

+                    android:background="@null"

+                    android:src="@android:drawable/star_big_off"/>

 

             <ImageView

                     android:id="@+id/download_album_art_image"

diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml
index 2e74390f..88f3cf8b 100644
--- a/subsonic-android/res/layout/album_list_item.xml
+++ b/subsonic-android/res/layout/album_list_item.xml
@@ -36,6 +36,15 @@
                 android:singleLine="true"/>

 

     </LinearLayout>

+    

+    <ImageButton

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

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_gravity="right|center_vertical"

+            android:background="@null"

+            android:focusable="false"

+            android:src="@android:drawable/star_big_off" />

 

     <ImageView

             android:src="@drawable/list_item_more"

diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
index 655854be..7fb511ac 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -104,6 +104,18 @@
             android:paddingRight="6dip"

             android:minHeight="50dip"/>

     <TextView

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

+            android:text="@string/main.albums_starred"

+            android:drawableRight="@drawable/list_item_artist"

+            android:drawablePadding="6dip"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:textAppearance="?android:attr/textAppearanceMedium"

+            android:gravity="center_vertical"

+            android:paddingLeft="6dip"

+            android:paddingRight="6dip"

+            android:minHeight="50dip"/>

+    <TextView

             android:id="@+id/main_albums_random"

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

             android:drawableRight="@drawable/list_item_more"

diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml
index f8d518ad..b2029ccd 100644
--- a/subsonic-android/res/layout/song_list_item.xml
+++ b/subsonic-android/res/layout/song_list_item.xml
@@ -73,4 +73,14 @@
 

         </LinearLayout>

     </LinearLayout>

+    

+    <ImageButton

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

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_gravity="right|center_vertical"

+            android:background="@null"

+            android:focusable="false"

+            android:src="@android:drawable/btn_star_big_off" />

+    

 </LinearLayout>

diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index b183c95c..b39ec48f 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -30,6 +30,7 @@
     <string name="main.albums_recent">Recently played</string>

     <string name="main.albums_frequent">Most played</string>

     <string name="main.albums_highest">Top rated</string>

+    <string name="main.albums_starred">Starred</string>

     <string name="main.albums_random">Random</string>

 

 	<string name="menu.search">Search</string>

@@ -115,6 +116,8 @@
     <string name="download.jukebox_server_too_old">Remote control is not supported. Please upgrade your Subsonic server.</string>

     <string name="download.jukebox_offline">Remote control is not available in offline mode.</string>

     <string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users &gt; Settings</b> on your Subsonic server.</string>

+    

+    <string name="starring_content_error">Failed to update \"%s\", please try later.</string>

 

     <string name="song_details.all">%1$s %2$s</string>

     <string name="song_details.kbps">%d kbps</string>