From 424e466ff8a5e65fe7e866045113f63b844a8e3b Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 6 May 2020 00:21:08 +0900
Subject: [PATCH] improve image loading on detail activities

---
 .../gramophone/ui/activities/AlbumDetailActivity.java     | 8 +++++---
 .../gramophone/ui/activities/ArtistDetailActivity.java    | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index c85224a6..9b85edb0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -103,6 +103,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
         if (Build.VERSION.SDK_INT > 21) postponeEnterTransition();
         Album album = getIntent().getExtras().getParcelable(EXTRA_ALBUM);
         setAlbum(album);
+        loadAlbumCover();
 
         QueryUtil.getAlbum(album.id, new MediaCallback() {
             @Override
@@ -279,6 +280,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
                 NavigationUtil.goToArtist(this, new Artist(album));
                 return true;
         }
+
         return super.onOptionsItemSelected(item);
     }
 
@@ -311,8 +313,9 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
 
     @Override
     public void onBackPressed() {
-        if (cab != null && cab.isActive()) cab.finish();
-        else {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+        } else {
             recyclerView.stopScroll();
             super.onBackPressed();
         }
@@ -331,7 +334,6 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
 
     private void setAlbum(Album album) {
         this.album = album;
-        loadAlbumCover();
 
         getSupportActionBar().setTitle(album.getTitle());
         artistTextView.setText(album.getArtistName());
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index be593a87..fea0582a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -121,6 +121,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         if (Build.VERSION.SDK_INT > 21) postponeEnterTransition();
         Artist artist = getIntent().getExtras().getParcelable(EXTRA_ARTIST);
         setArtist(artist);
+        loadArtistImage();
 
         QueryUtil.getArtist(artist.id, new MediaCallback() {
             @Override
@@ -301,6 +302,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
                 setUsePalette(item.isChecked());
                 return true;
         }
+
         return super.onOptionsItemSelected(item);
     }
 
@@ -333,8 +335,9 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
     @Override
     public void onBackPressed() {
-        if (cab != null && cab.isActive()) cab.finish();
-        else {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+        } else {
             albumRecyclerView.stopScroll();
             super.onBackPressed();
         }
@@ -353,7 +356,6 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
     private void setArtist(Artist artist) {
         this.artist = artist;
-        loadArtistImage();
 
         getSupportActionBar().setTitle(artist.getName());
         songCountTextView.setText(MusicUtil.getSongCountString(this, artist.getSongCount()));