aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/adapter
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-01-21 17:30:58 -0800
committerScott Jackson <daneren2005@gmail.com>2016-01-21 17:30:58 -0800
commit1fe86e60f0e143bbf4afc8680306b68fa4cb0d30 (patch)
tree9a27feb065d4c9274cb30c5afbc41d0bf2c5fee0 /app/src/main/java/github/daneren2005/dsub/adapter
parent3a42cbb96609235cb56ec16821f274013b817942 (diff)
downloaddsub-1fe86e60f0e143bbf4afc8680306b68fa4cb0d30.tar.gz
dsub-1fe86e60f0e143bbf4afc8680306b68fa4cb0d30.tar.bz2
dsub-1fe86e60f0e143bbf4afc8680306b68fa4cb0d30.zip
Fixes #624: Add Madsonic specific song lists to Home tab
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/adapter')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java3
-rw-r--r--app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
index 2c4f75dc..a757149a 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
@@ -26,6 +26,7 @@ import github.daneren2005.dsub.R;
import github.daneren2005.dsub.domain.MusicDirectory;
import github.daneren2005.dsub.domain.MusicDirectory.Entry;
import github.daneren2005.dsub.domain.ServerInfo;
+import github.daneren2005.dsub.fragments.MainFragment;
import github.daneren2005.dsub.service.MusicService;
import github.daneren2005.dsub.service.MusicServiceFactory;
import github.daneren2005.dsub.util.ImageLoader;
@@ -126,6 +127,8 @@ public class EntryInfiniteGridAdapter extends EntryGridAdapter {
result = service.getAlbumList(type, extra, size, offset, false, context, null);
} else if("genres".equals(type) || "genres-songs".equals(type)) {
result = service.getSongsByGenre(extra, size, offset, context, null);
+ }else if(type.indexOf(MainFragment.SONGS_LIST_PREFIX) != -1) {
+ result = service.getSongList(type, size, offset, context, null);
} else {
result = service.getAlbumList(type, size, offset, false, context, null);
}
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java
index 8f1f1c38..473366fe 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java
+++ b/app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java
@@ -100,6 +100,9 @@ public class MainAdapter extends SectionAdapter<Integer> {
} else if("videos".equals(header)) {
display = context.getResources().getString(R.string.main_videos);
checkBox.setVisibility(View.GONE);
+ } else if("songs".equals(header)) {
+ display = context.getResources().getString(R.string.search_songs);
+ checkBox.setVisibility(View.GONE);
} else {
display = header;
checkBox.setVisibility(View.GONE);