aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowner <owner@DeeDee-Laptop>2012-12-31 21:42:52 -0800
committerowner <owner@DeeDee-Laptop>2012-12-31 21:42:52 -0800
commit9915f36ca57f6af92fb052db35b693dad51a69a5 (patch)
tree8624bdfd696722ee6e72a1a7f7b306c1f10e4858
parent253fffd035442574928dedb3b898ec6d69c11e8a (diff)
downloaddsub-9915f36ca57f6af92fb052db35b693dad51a69a5.tar.gz
dsub-9915f36ca57f6af92fb052db35b693dad51a69a5.tar.bz2
dsub-9915f36ca57f6af92fb052db35b693dad51a69a5.zip
Closes #67 Indicator of shuffle buffer loading
-rw-r--r--subsonic-android/res/values/strings.xml1
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java5
2 files changed, 6 insertions, 0 deletions
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 949c9c4b..258f721a 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -111,6 +111,7 @@
<string name="select_playlist.empty">No saved playlists on server</string>
<string name="download.empty">Playlist is empty</string>
+ <string name="download.shuffle_loading">Shuffle list is loading...</string>
<string name="download.playerstate_downloading">Downloading - %s</string>
<string name="download.playerstate_buffering">Buffering</string>
<string name="download.playerstate_playing_shuffle">Playing shuffle</string>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
index 78e4e44c..f035d3d2 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -779,6 +779,11 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
list = downloadService.getSongs();
else
list = downloadService.getBackgroundDownloads();
+
+ if(downloadService.isShufflePlayEnabled())
+ emptyTextView.setText(R.string.download_shuffle_loading);
+ else
+ emptyTextView.setText(R.string.download_empty);
playlistView.setAdapter(new SongListAdapter(list));
emptyTextView.setVisibility(list.isEmpty() ? View.VISIBLE : View.GONE);