Fix artist details reveal behaviour

Signed-off-by: enricocid <[email protected]>
enricocid · Sep 16, 2018 · f1c7ab1 · f1c7ab1
1 parent 35c724e
commit f1c7ab1
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java b/project/app/src/main/java/com/iven/musicplayergo/MainActivity.java
@@ -670,11 +670,16 @@ public void onAlbumSelected(@NonNull final Album album) {
     }
 
     public void expandArtistDetails(View v) {
-        if (mPlayerAdapter != null && mPlayerAdapter.isPlaying() && mPlayerAdapter.getCurrentSong() != null) {
-            onArtistSelected(mPlayerAdapter.getCurrentSong().artistName);
-        }
-        if (!sArtistDiscographyExpanded) {
-            revealView(mArtistDetails, mArtistsRecyclerView, true);
+        if (mPlayerAdapter != null && mPlayerAdapter.getCurrentSong() != null) {
+            if (!mPlayerAdapter.getCurrentSong().artistName.equals(mSelectedArtist)) {
+                onArtistSelected(mPlayerAdapter.getCurrentSong().artistName);
+            } else if (sArtistDiscographyExpanded) {
+                revealView(mArtistDetails, mArtistsRecyclerView, false);
+            } else {
+                revealView(mArtistDetails, mArtistsRecyclerView, false);
+            }
+        } else {
+            revealView(mArtistDetails, mArtistsRecyclerView, !sArtistDiscographyExpanded);
         }
     }