diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-06-05 17:40:42 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-06-05 17:40:42 -0700 |
| commit | 6caaca0cecd9f4f60f695a68c72eb662b4a45b34 (patch) | |
| tree | 3e5ccfd55508aed288e923046739f353a5133465 /app/src/main/java | |
| parent | e62cbdae5a41909a03652ae4a967a4e72fe96748 (diff) | |
| parent | 6f218cf51b27e24012335a27e806e3a24cc52c75 (diff) | |
| download | dsub-6caaca0cecd9f4f60f695a68c72eb662b4a45b34.tar.gz dsub-6caaca0cecd9f4f60f695a68c72eb662b4a45b34.tar.bz2 dsub-6caaca0cecd9f4f60f695a68c72eb662b4a45b34.zip | |
Merge branch 'RecyclerView' into NavigationView
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java b/app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java index 0563b38d..7461af69 100644 --- a/app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java +++ b/app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java @@ -59,7 +59,7 @@ public class ArtistAdapter extends SectionAdapter<Artist> { header.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - PopupMenu popup = new PopupMenu(context, header); + PopupMenu popup = new PopupMenu(context, header.findViewById(R.id.select_artist_folder_2)); popup.getMenu().add(R.string.select_artist_all_folders); for (MusicFolder musicFolder : musicFolders) { diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java index 065d622f..8a2b7153 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java @@ -220,7 +220,7 @@ public class SelectArtistFragment extends SelectRecyclerFragment<Artist> impleme if(empty && !Util.isOffline(context)) { objects.clear(); - recyclerView.setAdapter(new ArtistAdapter(context, objects, this)); + recyclerView.setAdapter(new ArtistAdapter(context, objects, musicFolders, this, this)); recyclerView.setVisibility(View.VISIBLE); View view = rootView.findViewById(R.id.tab_progress); |