Merge commit

8 files changed, 115 insertions, 57 deletions

diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index b896509e..c71ff4b7 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -40,7 +40,38 @@
 				android:layout_weight="1"

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

 

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

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

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

+						android:orientation="horizontal"

+						android:layout_width="wrap_content"

+						android:layout_height="wrap_content"

+						android:layout_gravity="center_horizontal">

+

+						<Button

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

+							android:text="RC"

+							style="@style/DownloadActionButton"/>

+

+						<Button

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

+							android:text="EQ"

+							style="@style/DownloadActionButton"/>

+

+						<Button

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

+							android:text="VIS"

+							style="@style/DownloadActionButton"/>

+

+						<ImageButton

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

+							style="@style/DownloadActionImageButton"

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

+

+						<ImageButton

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

+							style="@style/DownloadActionImageButton"

+							android:src="?attr/bookmark"/>

+					</LinearLayout>

 

 				<LinearLayout

 						android:id="@+id/download_visualizer_view_layout"

diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index a70160a1..7d89baf3 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -49,7 +49,38 @@
 							android:layout_height="wrap_content"

 							android:layout_centerHorizontal="true">

 

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

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

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

+								android:orientation="horizontal"

+								android:layout_width="wrap_content"

+								android:layout_height="wrap_content"

+								android:layout_gravity="center_horizontal">

+

+								<Button

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

+									android:text="RC"

+									style="@style/DownloadActionButton"/>

+

+								<Button

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

+									android:text="EQ"

+									style="@style/DownloadActionButton"/>

+

+								<Button

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

+									android:text="VIS"

+									style="@style/DownloadActionButton"/>

+

+								<ImageButton

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

+									style="@style/DownloadActionImageButton"

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

+

+								<ImageButton

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

+									style="@style/DownloadActionImageButton"

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

+							</LinearLayout>

 						</LinearLayout>

 					</RelativeLayout>

 

diff --git a/res/layout/download_action_buttons.xml b/res/layout/download_action_buttons.xml
deleted file mode 100644
index e3a45151..00000000
--- a/res/layout/download_action_buttons.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

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

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

-	android:orientation="horizontal"

-	android:layout_width="wrap_content"

-	android:layout_height="wrap_content"

-	android:layout_gravity="center_horizontal">

-

-	<Button

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

-		android:text="RC"

-		style="@style/DownloadActionButton"/>

-

-	<Button

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

-		android:text="EQ"

-		style="@style/DownloadActionButton"/>

-

-	<Button

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

-		android:text="VIS"

-		style="@style/DownloadActionButton"/>

-

-	<ImageButton

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

-		style="@style/DownloadActionImageButton"

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

-

-	<ImageButton

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

-		style="@style/DownloadActionImageButton"

-		android:src="?attr/bookmark"/>

-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/select_album_header.xml b/res/layout/select_album_header.xml
index 14bdf365..8f5883bf 100644
--- a/res/layout/select_album_header.xml
+++ b/res/layout/select_album_header.xml
@@ -30,7 +30,16 @@
 			android:textAppearance="?android:attr/textAppearanceLarge"
 			android:textStyle="bold"
 			android:singleLine="true"
-			android:ellipsize="end"/>
+			android:ellipsize="marquee"
+			android:marqueeRepeatLimit="marquee_forever"
+			android:scrollHorizontally="true"
+			android:focusable="true"
+			android:focusableInTouchMode="true">
+
+			<requestFocus android:focusable="true"
+				android:focusableInTouchMode="true"
+				android:duplicateParentState="true" />
+		</TextView>
 
 		<TextView
 			android:text="This is the artist name"
diff --git a/res/raw/changelog.xml b/res/raw/changelog.xml
index 0f1a0c46..c07419af 100644
--- a/res/raw/changelog.xml
+++ b/res/raw/changelog.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="4.3.6" versioncode="81" releasedate="1/19/2014">
+		<change>Added optional SSID to use for local network address (requires new permission: ACCESS_WIFI_STATE)</change>
+		<change>Fix not being able to clear local network address</change>
+		<change>Fix Galaxy S3 issues</change>
+		<change>Hide star button on now playing screen if hidden in settings</change>
+		<change>Fix podcasts not being clickable in offline mode</change>
+		<change>Bunch of minor improvements/bugfixes</change>
+	</release>
 	<release version="4.3.5" versioncode="80" releasedate="1/11/2014">
 		<change>Fix downloads not limiting bitrate correctly</change>
 	</release>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 461f73c7..5c2a4614 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -244,7 +244,9 @@
     <string name="settings.server_unused">Unused</string>

     <string name="settings.server_name">Name</string>

     <string name="settings.server_address">Server address</string>

-	<string name="settings.server_internal_address">Internal network address</string>

+	<string name="settings.server_local_network_ssid" >Local network SSID</string>

+	<string name="settings.server_local_network_ssid_hint">Current SSID: %s</string>

+	<string name="settings.server_internal_address">Local network address</string>

     <string name="settings.server_username">Username</string>

     <string name="settings.server_password">Password</string>

 	<string name="settings.server_open_browser">Open in browser</string>

@@ -438,6 +440,7 @@
     <string name="parser.not_authenticated">Wrong username or password.</string>

     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>

     <string name="parser.artist_count">Got %d artists.</string>

+	<string name="parser.server_error">Server error: %s</string>

 

     <string name="select_artist.refresh">Refresh</string>

     <string name="select_artist.folder">Select folder</string>

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9aa83d2a..8a2bff2c 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -25,7 +25,7 @@
 		<item name="share">@drawable/ic_menu_share_light</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
 	</style>
 	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
@@ -53,7 +53,7 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
@@ -84,7 +84,7 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
-		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 	</style>
 	
 	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
@@ -111,6 +111,8 @@
 	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
 	</style>
 
-	<style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button">
+	<style name="DSub.ButtonStyle.Dark" parent="android:Widget.Holo.Button">
+	</style>
+	<style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button">
 	</style>
 </resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 5d1a1ce6..30b2e584 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -207,6 +207,25 @@
 		</PreferenceCategory>
 
 		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.hide_media_title"
+				android:summary="@string/settings.hide_media_summary"
+				android:key="hideMedia"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.screen_lit_title"
+				android:summary="@string/settings.screen_lit_summary"
+				android:key="screenLitOnDownload"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.sync_title">
+		<PreferenceCategory
 			android:title="@string/settings.sync_title">
 
 			<CheckBoxPreference
@@ -233,6 +252,10 @@
 				android:summary="@string/settings.sync_notification_summary"
 				android:key="syncNotification"
 				android:defaultValue="true"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
 
 			<CheckBoxPreference
 				android:title="@string/settings.sync_starred"
@@ -246,22 +269,6 @@
 				android:key="syncMostRecent"
 				android:defaultValue="false"/>
 		</PreferenceCategory>
-
-		<PreferenceCategory
-			android:title="@string/settings.other_title">
-
-			<CheckBoxPreference
-				android:title="@string/settings.hide_media_title"
-				android:summary="@string/settings.hide_media_summary"
-				android:key="hideMedia"
-				android:defaultValue="false"/>
-
-			<CheckBoxPreference
-				android:title="@string/settings.screen_lit_title"
-				android:summary="@string/settings.screen_lit_summary"
-				android:key="screenLitOnDownload"
-				android:defaultValue="true"/>
-		</PreferenceCategory>
 	</PreferenceScreen>
 
 	<PreferenceScreen