aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/src/github
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-06-26 22:40:19 -0700
committerScott Jackson <daneren2005@gmail.com>2013-06-26 22:40:19 -0700
commit827022c301f31c518e379334573c8d1d8c76af8e (patch)
tree9383851dc7d3629f762b05233c80896fc9b41f90 /subsonic-android/src/github
parentda7aa410f8693a6b32f547a5b7f99b100ce7ad30 (diff)
downloaddsub-827022c301f31c518e379334573c8d1d8c76af8e.tar.gz
dsub-827022c301f31c518e379334573c8d1d8c76af8e.tar.bz2
dsub-827022c301f31c518e379334573c8d1d8c76af8e.zip
Fixed bottom bar
Diffstat (limited to 'subsonic-android/src/github')
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
index 4a3e341b..3b37dbb9 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
@@ -23,6 +23,7 @@ import github.daneren2005.dsub.fragments.MainFragment;
import github.daneren2005.dsub.fragments.SelectArtistFragment;
import github.daneren2005.dsub.fragments.SelectDirectoryFragment;
import github.daneren2005.dsub.fragments.SelectPlaylistFragment;
+import github.daneren2005.dsub.fragments.SelectPodcastsFragment;
import github.daneren2005.dsub.fragments.SubsonicFragment;
import github.daneren2005.dsub.service.DownloadFile;
import github.daneren2005.dsub.service.DownloadServiceImpl;
@@ -155,6 +156,7 @@ public class MainActivity extends SubsonicActivity {
addTab(R.string.button_bar_home, MainFragment.class, null);
addTab(R.string.button_bar_browse, SelectArtistFragment.class, null);
addTab(R.string.button_bar_playlists, SelectPlaylistFragment.class, null);
+ // addTab(R.string.button_bar_podcasts, SelectPodcastsFragment.class, null);
SharedPreferences prefs = Util.getPreferences(this);
if(prefs.getBoolean(Constants.PREFERENCES_KEY_CHAT_ENABLED, true)) {
addTab(R.string.button_bar_chat, ChatFragment.class, null);
@@ -248,6 +250,12 @@ public class MainActivity extends SubsonicActivity {
}
DownloadFile current = getDownloadService().getCurrentPlaying();
+ if(current == null) {
+ trackView.setText("Title");
+ artistView.setText("Artist");
+ getImageLoader().loadImage(coverArtView, null, false, false);
+ return;
+ }
bottomBar.setVisibility(View.VISIBLE);
MusicDirectory.Entry song = current.getSong();