[Android] fixed search on all of the pagers of MusicFragment, updated to PagedList + ViewModel

Author: Catherine22

AAD-Preparation/.idea/workspace.xml

@@ -49,16 +49,14 @@ int index() {
         }
     }
 
-
     private final static String STATE_SELECTED_BOTTOM_NAVIGATION = "STATE_SELECTED_BOTTOM_NAVIGATION";
 
     private BottomNavigationView navigationView;
     private Toolbar toolbar;
     private TabLayout tabLayout;
-    private ViewPager viewpager;
     private String[] titles;
     private Fragment[] fragments = new Fragment[3];
-    private OnSearchViewListener[] onSearchViewListeners = new OnSearchViewListener[3];
+    private OnSearchViewListener onSearchViewListener;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -173,7 +171,6 @@ private boolean switchTab(int menuItemId) {
 
     @Override
     public void addViewPagerManager(ViewPager viewpager, String[] titles) {
-        this.viewpager = viewpager;
         tabLayout.setVisibility(View.VISIBLE);
         tabLayout.setupWithViewPager(viewpager);
         tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@@ -211,8 +208,8 @@ public void onPageScrollStateChanged(int state) {
     }
 
     @Override
-    public void addOnSearchListener(OnSearchViewListener listener) {
-        onSearchViewListeners[viewpager.getCurrentItem()] = listener;
+    public void setOnSearchListener(OnSearchViewListener listener) {
+        onSearchViewListener = listener;
     }
 
     @Override
@@ -251,17 +248,15 @@ public void onRestoreInstanceState(Bundle savedInstanceState) {
 
     @Override
     public boolean onQueryTextSubmit(String query) {
-        OnSearchViewListener listener = onSearchViewListeners[viewpager.getCurrentItem()];
-        if (listener != null)
-            listener.onQueryTextSubmit(query);
+        if (onSearchViewListener != null)
+            onSearchViewListener.onQueryTextSubmit(query);
         return false;
     }
 
     @Override
     public boolean onQueryTextChange(String newText) {
-        OnSearchViewListener listener = onSearchViewListeners[viewpager.getCurrentItem()];
-        if (listener != null)
-            listener.onQueryTextChange(newText);
+        if (onSearchViewListener != null)
+            onSearchViewListener.onQueryTextChange(newText);
         return false;
     }
 }

AAD-Preparation/app/src/main/java/com/catherine/materialdesignapp/activities/UIComponentsActivity.java

@@ -1,48 +1,35 @@
 package com.catherine.materialdesignapp.adapters;
 
-import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.paging.PagedListAdapter;
 import androidx.recyclerview.selection.ItemDetailsLookup;
 import androidx.recyclerview.selection.SelectionTracker;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
+
 import com.catherine.materialdesignapp.R;
 import com.catherine.materialdesignapp.jetpack.entities.Artist;
 import com.catherine.materialdesignapp.utils.DisplayHelper;
 import com.facebook.drawee.view.SimpleDraweeView;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.MainRvHolder> {
+public class ArtistAdapter extends PagedListAdapter<Artist, ArtistAdapter.MainRvHolder> {
     private final String TAG = ArtistAdapter.class.getSimpleName();
-    private Context ctx;
-    private List<Artist> entities;
-//    private OnItemClickListener listener;
-
     public final static int MAX_COLUMNS = 4;
     private SelectionTracker<String> selectionTracker;
     private float cellWidth;
 
-    public ArtistAdapter(Context ctx, List<Artist> entities/*, OnItemClickListener listener*/) {
-        this.ctx = ctx;
-        if (entities == null)
-            this.entities = new ArrayList<>();
-        else
-            this.entities = entities;
-//        this.listener = listener;
-
-
-        float gridMargin = ctx.getResources().getDimension(R.dimen.grid_margin);
-        cellWidth = (DisplayHelper.getScreenWidth() * 1.0f - (MAX_COLUMNS + 1) * gridMargin) / MAX_COLUMNS;
+    public ArtistAdapter() {
+        super(DIFF_CALLBACK);
     }
 
     public void setSelectionTracker(SelectionTracker<String> selectionTracker) {
@@ -52,85 +39,49 @@ public void setSelectionTracker(SelectionTracker<String> selectionTracker) {
     @NonNull
     @Override
     public MainRvHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-        return new MainRvHolder(LayoutInflater.from(ctx).inflate(R.layout.rv_artist_item, viewGroup, false));
+        float gridMargin = viewGroup.getContext().getResources().getDimension(R.dimen.grid_margin);
+        cellWidth = (DisplayHelper.getScreenWidth() * 1.0f - (MAX_COLUMNS + 1) * gridMargin) / MAX_COLUMNS;
+        return new MainRvHolder(LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.rv_artist_item, viewGroup, false));
     }
 
     @Override
     public void onBindViewHolder(@NonNull final MainRvHolder mainRvHolder, final int position) {
-        if (entities == null || entities.size() == 0)
-            return;
-        Artist artist = entities.get(position);
-
-        // OPTION1: setOncClickListener
-//        if (listener != null) {
-//            mainRvHolder.itemView.setOnClickListener(v -> listener.onItemClick(mainRvHolder.itemView, position));
-//            mainRvHolder.itemView.setOnLongClickListener(v -> {
-//                listener.onItemLongClick(mainRvHolder.itemView, position);
-//                return false;
-//            });
-//        }
-
-        // OPTION2: SelectionTracker
-        boolean isSelected = false;
-        if (selectionTracker != null) {
-            if (selectionTracker.isSelected(artist.getArtist())) {
-                isSelected = true;
-            }
-        }
-        mainRvHolder.bind(position, isSelected, artist);
-
-        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) mainRvHolder.container.getLayoutParams();
-        params.width = Math.round(cellWidth);
-        params.height = Math.round(cellWidth);
-        mainRvHolder.container.setLayoutParams(params);
-
-        if (!TextUtils.isEmpty(artist.getImage())) {
-            mainRvHolder.sdv_photo.setVisibility(View.VISIBLE);
-            Uri uri = Uri.parse(artist.getImage());
-            // show raw images
-            mainRvHolder.sdv_photo.setImageURI(uri);
-        } else
-            mainRvHolder.sdv_photo.setVisibility(View.GONE);
-
-        if (!TextUtils.isEmpty(artist.getArtist())) {
-            mainRvHolder.tv_title.setVisibility(View.VISIBLE);
-            mainRvHolder.tv_title.setText(artist.getArtist());
-        } else
-            mainRvHolder.tv_title.setVisibility(View.GONE);
-    }
-
-    @Override
-    public int getItemCount() {
-        return entities.size();
+        Artist artist = getItem(position);
+        if (artist != null)
+            mainRvHolder.bindTo(position, artist);
+        else
+            mainRvHolder.clear();
     }
 
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    public void setEntities(List<Artist> entities) {
-        this.entities = entities;
-    }
 
     public class MainRvHolder extends RecyclerView.ViewHolder {
-        TextView tv_title;
-        SimpleDraweeView sdv_photo;
-        ConstraintLayout container;
-        View itemView;
-        ArtistItemDetails artistItemDetails;
+        private TextView tv_title;
+        private SimpleDraweeView sdv_photo;
+        private ConstraintLayout container;
+        private ArtistItemDetails artistItemDetails;
+        private Artist artist;
 
         MainRvHolder(View itemView) {
             super(itemView);
-            this.itemView = itemView;
             container = itemView.findViewById(R.id.container);
             tv_title = itemView.findViewById(R.id.tv_title);
             sdv_photo = itemView.findViewById(R.id.sdv_photo);
-
             artistItemDetails = new ArtistItemDetails();
         }
 
-        void bind(int position, boolean isSelected, Artist artist) {
+        public Artist getArtist() {
+            return artist;
+        }
+
+        void bindTo(int position, Artist artist) {
+            this.artist = artist;
+            boolean isSelected = false;
+            if (selectionTracker != null) {
+                if (selectionTracker.isSelected(artist.getArtist())) {
+                    isSelected = true;
+                }
+            }
+
             artistItemDetails.position = position;
             artistItemDetails.identifier = artist.getArtist();
 
@@ -140,6 +91,30 @@ void bind(int position, boolean isSelected, Artist artist) {
             } else {
                 container.setBackgroundResource(0);
             }
+
+            RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) container.getLayoutParams();
+            params.width = Math.round(cellWidth);
+            params.height = Math.round(cellWidth);
+            container.setLayoutParams(params);
+
+            if (!TextUtils.isEmpty(artist.getImage())) {
+                sdv_photo.setVisibility(View.VISIBLE);
+                Uri uri = Uri.parse(artist.getImage());
+                // show raw images
+                sdv_photo.setImageURI(uri);
+            } else
+                sdv_photo.setVisibility(View.GONE);
+
+            if (!TextUtils.isEmpty(artist.getArtist())) {
+                tv_title.setVisibility(View.VISIBLE);
+                tv_title.setText(artist.getArtist());
+            } else
+                tv_title.setVisibility(View.GONE);
+        }
+
+        void clear() {
+            tv_title.setText("");
+            sdv_photo.setImageURI("");
         }
 
         public ItemDetailsLookup.ItemDetails<String> getArtistItemDetails(@NonNull MotionEvent motionEvent) {
@@ -172,4 +147,18 @@ public boolean inDragRegion(@NonNull MotionEvent e) {
             return true;
         }
     }
+
+    private static final DiffUtil.ItemCallback<Artist> DIFF_CALLBACK =
+            new DiffUtil.ItemCallback<Artist>() {
+                @Override
+                public boolean areItemsTheSame(@NonNull Artist oldItem, @NonNull Artist newItem) {
+                    return oldItem.compareTo(newItem) == 0;
+                }
+
+                @Override
+                public boolean areContentsTheSame(@NonNull Artist oldItem,
+                                                  @NonNull Artist newItem) {
+                    return oldItem.getImage().equals(newItem.getImage());
+                }
+            };
 }