From c00765c59e887f0469cae7a8c0126d8f01376169 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Mon, 21 Sep 2020 04:09:13 +0900
Subject: [PATCH] fix some blank image issues

---
 .../gramophone/adapter/SearchAdapter.java     |  7 ++---
 .../gramophone/glide/CustomGlideRequest.java  |  3 +--
 .../ui/activities/MainActivity.java           | 27 +++++++++----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
index 8ea2dd53..8895b22c 100644
--- a/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
+++ b/app/src/main/java/com/dkanada/gramophone/adapter/SearchAdapter.java
@@ -107,6 +107,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                     itemView.setElevation(activity.getResources().getDimensionPixelSize(R.dimen.card_elevation));
                 }
+
                 if (shortSeparator != null) {
                     shortSeparator.setVisibility(View.GONE);
                 }
@@ -132,12 +133,12 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
                     break;
                 case ARTIST:
                     setImageTransitionName(activity.getString(R.string.transition_artist_image));
+                    View description = itemView.findViewById(R.id.text);
+                    if (description != null) description.setVisibility(View.GONE);
                     break;
                 default:
                     View container = itemView.findViewById(R.id.image_container);
-                    if (container != null) {
-                        container.setVisibility(View.GONE);
-                    }
+                    if (container != null) container.setVisibility(View.GONE);
                     break;
             }
         }
diff --git a/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java b/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
index 13628039..fa12419d 100644
--- a/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
+++ b/app/src/main/java/com/dkanada/gramophone/glide/CustomGlideRequest.java
@@ -55,8 +55,7 @@ public class CustomGlideRequest {
             Object uri = item != null ? createUrl(item) : R.drawable.default_album_art;
 
             return requestManager.load(uri)
-                    .apply(createRequestOptions(item))
-                    .transition(new DrawableTransitionOptions().crossFade(DEFAULT_ANIMATION));
+                    .apply(createRequestOptions(item));
         }
     }
 
diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java
index 5267381f..12325f08 100644
--- a/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java
@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 
 import com.dkanada.gramophone.databinding.ActivityMainContentBinding;
 import com.dkanada.gramophone.databinding.ActivityMainDrawerLayoutBinding;
+import com.dkanada.gramophone.databinding.NavigationDrawerHeaderBinding;
 import com.dkanada.gramophone.dialogs.ConfirmLogoutDialog;
 import androidx.fragment.app.Fragment;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -44,13 +45,11 @@ import java.util.List;
 public class MainActivity extends AbsSlidingMusicPanelActivity {
     private ActivityMainDrawerLayoutBinding binding;
     private ActivityMainContentBinding contentBinding;
+    private NavigationDrawerHeaderBinding navigationBinding;
 
     @Nullable
     MainActivityFragmentCallbacks currentFragment;
 
-    @Nullable
-    private View navigationDrawerHeader;
-
     @Nullable
     private List<BaseItemDto> libraries;
 
@@ -174,9 +173,11 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
     private void updateNavigationDrawerHeader() {
         if (!MusicPlayerRemote.getPlayingQueue().isEmpty()) {
             Song song = MusicPlayerRemote.getCurrentSong();
-            if (navigationDrawerHeader == null) {
-                navigationDrawerHeader = binding.navigationView.inflateHeaderView(R.layout.navigation_drawer_header);
-                navigationDrawerHeader.setOnClickListener(v -> {
+            if (navigationBinding == null) {
+                navigationBinding = NavigationDrawerHeaderBinding.inflate(getLayoutInflater());
+
+                binding.navigationView.addHeaderView(navigationBinding.getRoot());
+                navigationBinding.getRoot().setOnClickListener(v -> {
                     binding.drawerLayout.closeDrawers();
                     if (getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
                         expandPanel();
@@ -184,17 +185,15 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
                 });
             }
 
-            ((TextView) navigationDrawerHeader.findViewById(R.id.title)).setText(song.title);
-            ((TextView) navigationDrawerHeader.findViewById(R.id.text)).setText(MusicUtil.getSongInfoString(song));
+            navigationBinding.title.setText(song.title);
+            navigationBinding.text.setText(MusicUtil.getSongInfoString(song));
 
             CustomGlideRequest.Builder
                     .from(Glide.with(this), song.primary)
-                    .build().into(((ImageView) navigationDrawerHeader.findViewById(R.id.image)));
-        } else {
-            if (navigationDrawerHeader != null) {
-                binding.navigationView.removeHeaderView(navigationDrawerHeader);
-                navigationDrawerHeader = null;
-            }
+                    .build().into(navigationBinding.image);
+        } else if (binding.navigationView.getHeaderCount() != 0) {
+            binding.navigationView.removeHeaderView(navigationBinding.getRoot());
+            navigationBinding = null;
         }
     }