From 7b28f65e14ed982072f934225305c781862e21a6 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 21 Jan 2016 17:51:31 -0800
Subject: Show shuffle mode/artist radio instead of Playing: x of y as subtitle

---
 .../daneren2005/dsub/fragments/NowPlayingFragment.java  | 17 +++++++++++++++--
 .../daneren2005/dsub/service/DownloadService.java       |  3 +++
 app/src/main/res/values/strings.xml                     |  3 ++-
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
index d77f476f..f18b22a0 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
@@ -1158,11 +1158,23 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 	@Override
 	public void onSongChanged(DownloadFile currentPlaying, int currentPlayingIndex) {
 		this.currentPlaying = currentPlaying;
+		setupSubtitle(currentPlayingIndex);
+	}
+
+	private void setupSubtitle(int currentPlayingIndex) {
 		if (currentPlaying != null) {
 			Entry song = currentPlaying.getSong();
 			songTitleTextView.setText(song.getTitle());
 			getImageLoader().loadImage(albumArtImageView, song, true, true);
-			setSubtitle(context.getResources().getString(R.string.download_playing_out_of, currentPlayingIndex + 1, currentPlayingSize));
+
+			DownloadService downloadService = getDownloadService();
+			if(downloadService.isShufflePlayEnabled()) {
+				setSubtitle(context.getResources().getString(R.string.download_playerstate_playing_shuffle));
+			} else if(downloadService.isArtistRadio()) {
+				setSubtitle(context.getResources().getString(R.string.download_playerstate_playing_artist_radio));
+			} else {
+				setSubtitle(context.getResources().getString(R.string.download_playing_out_of, currentPlayingIndex + 1, currentPlayingSize));
+			}
 		} else {
 			songTitleTextView.setText(null);
 			getImageLoader().loadImage(albumArtImageView, (Entry) null, true, false);
@@ -1199,10 +1211,11 @@ public class NowPlayingFragment extends SubsonicFragment implements OnGestureLis
 			scrollWhenLoaded = false;
 		}
 
-		setSubtitle(context.getResources().getString(R.string.download_playing_out_of, currentPlayingIndex + 1, currentPlayingSize));
 		if(this.currentPlaying != currentPlaying) {
 			onSongChanged(currentPlaying, currentPlayingIndex);
 			onMetadataUpdate(currentPlaying != null ? currentPlaying.getSong() : null, DownloadService.METADATA_UPDATED_ALL);
+		} else {
+			setupSubtitle(currentPlayingIndex);
 		}
 	}
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
index a4f88ee2..3e771d70 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
@@ -601,6 +601,9 @@ public class DownloadService extends Service {
 		}
 		editor.commit();
 	}
+	public boolean isArtistRadio() {
+		return artistRadio;
+	}
 
 	public synchronized void shuffle() {
 		Collections.shuffle(downloadList);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1e4cfea9..b59cf620 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,7 +190,8 @@
     <string name="download.playerstate_downloading">Downloading - %s</string>
 	<string name="download.playerstate_mobile_disabled">Waiting for WiFi network to download</string>
     <string name="download.playerstate_buffering">Buffering</string>
-    <string name="download.playerstate_playing_shuffle">Playing shuffle</string>
+    <string name="download.playerstate_playing_shuffle">Shuffle mode</string>
+	<string name="download.playerstate_playing_artist_radio">Artist radio</string>
     <string name="download.menu_show_album">Show Album</string>
     <string name="download.menu_lyrics">Lyrics</string>
 	<string name="download.menu_remove_all">Remove all</string>
-- 
cgit v1.2.3