From cc324681057ea5053469d3018ba13c0548c200e3 Mon Sep 17 00:00:00 2001 From: Jesus Bravo Alvarez Date: Sat, 27 Feb 2021 08:37:35 +0100 Subject: [PATCH] Allow genre tab to expand to albums and artists when tracks tab is not present (#1072) --- .../android/vanilla/LibraryPagerAdapter.java | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java index 0a250f17..98c79725 100644 --- a/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java +++ b/app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java @@ -262,12 +262,21 @@ public class LibraryPagerAdapter */ public void computeExpansions() { - if (mArtistAdapter != null) - mArtistAdapter.setExpandable(getMediaTypePosition(MediaUtils.TYPE_SONG) != -1 || getMediaTypePosition(MediaUtils.TYPE_ALBUM) != -1); - if (mAlbumAdapter != null) - mAlbumAdapter.setExpandable(getMediaTypePosition(MediaUtils.TYPE_SONG) != -1); if (mGenreAdapter != null) - mGenreAdapter.setExpandable(getMediaTypePosition(MediaUtils.TYPE_SONG) != -1); + mGenreAdapter.setExpandable( + getMediaTypePosition(MediaUtils.TYPE_SONG) != -1 || + getMediaTypePosition(MediaUtils.TYPE_ALBUM) != -1 || + getMediaTypePosition(MediaUtils.TYPE_ARTIST) != -1 + ); + if (mArtistAdapter != null) + mArtistAdapter.setExpandable( + getMediaTypePosition(MediaUtils.TYPE_SONG) != -1 || + getMediaTypePosition(MediaUtils.TYPE_ALBUM) != -1 + ); + if (mAlbumAdapter != null) + mAlbumAdapter.setExpandable( + getMediaTypePosition(MediaUtils.TYPE_SONG) != -1 + ); } @Override @@ -314,7 +323,11 @@ public class LibraryPagerAdapter break; case MediaUtils.TYPE_GENRE: adapter = mGenreAdapter = new MediaAdapter(activity, MediaUtils.TYPE_GENRE, null, activity); - mGenreAdapter.setExpandable(getMediaTypePosition(MediaUtils.TYPE_SONG) != -1); + mGenreAdapter.setExpandable( + getMediaTypePosition(MediaUtils.TYPE_SONG) != -1 || + getMediaTypePosition(MediaUtils.TYPE_ALBUM) != -1 || + getMediaTypePosition(MediaUtils.TYPE_ARTIST) != -1 + ); break; case MediaUtils.TYPE_FILE: adapter = mFilesAdapter = new FileSystemAdapter(activity, mPendingFileLimiter);