aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/activity
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-09-14 22:08:08 -0700
committerScott Jackson <daneren2005@gmail.com>2016-09-14 22:08:08 -0700
commite774bc406535cb90896c1370dc67c8cf8ee491f0 (patch)
tree30c83ccb9cc80d2d1aa4cfbe5f584e996d3e6513 /app/src/main/java/github/daneren2005/dsub/activity
parent09c787dfd2e406920b7d4daf75b7759d2c3b7c43 (diff)
downloaddsub-e774bc406535cb90896c1370dc67c8cf8ee491f0.tar.gz
dsub-e774bc406535cb90896c1370dc67c8cf8ee491f0.tar.bz2
dsub-e774bc406535cb90896c1370dc67c8cf8ee491f0.zip
#172 Implement playback of internet radio stations + hide UI elements which don't make sense on streams
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/activity')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java31
1 files changed, 22 insertions, 9 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
index 33b7d033..c7190046 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
@@ -925,7 +925,13 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
if (currentPlaying != null) {
song = currentPlaying.getSong();
trackView.setText(song.getTitle());
- artistView.setText(song.getArtist());
+
+ if(song.getArtist() != null) {
+ artistView.setVisibility(View.VISIBLE);
+ artistView.setText(song.getArtist());
+ } else {
+ artistView.setVisibility(View.GONE);
+ }
} else {
trackView.setText(R.string.main_title);
artistView.setText(R.string.main_artist);
@@ -942,18 +948,25 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
getImageLoader().loadImage(coverArtView, song, false, height, false);
}
- if(currentPlaying != null && currentPlaying.getSong() != null && (currentPlaying.getSong().isPodcast() || currentPlaying.getSong().isAudioBook())) {
+ if(getDownloadService().isCurrentPlayingSingle()) {
previousButton.setVisibility(View.GONE);
nextButton.setVisibility(View.GONE);
-
- rewindButton.setVisibility(View.VISIBLE);
- fastforwardButton.setVisibility(View.VISIBLE);
- } else {
- previousButton.setVisibility(View.VISIBLE);
- nextButton.setVisibility(View.VISIBLE);
-
rewindButton.setVisibility(View.GONE);
fastforwardButton.setVisibility(View.GONE);
+ } else {
+ if (currentPlaying != null && currentPlaying.getSong() != null && (currentPlaying.getSong().isPodcast() || currentPlaying.getSong().isAudioBook())) {
+ previousButton.setVisibility(View.GONE);
+ nextButton.setVisibility(View.GONE);
+
+ rewindButton.setVisibility(View.VISIBLE);
+ fastforwardButton.setVisibility(View.VISIBLE);
+ } else {
+ previousButton.setVisibility(View.VISIBLE);
+ nextButton.setVisibility(View.VISIBLE);
+
+ rewindButton.setVisibility(View.GONE);
+ fastforwardButton.setVisibility(View.GONE);
+ }
}
}