From 93bf987bb9346e587f6379f18506b122f3b9ea7b Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Tue, 31 Aug 2021 21:22:24 -0700
Subject: [PATCH] Extracts the ViewHolder for SimpleListItemBinding to
 SimpleListItemViewHolder<T>.

---
 .../library/LibraryRecyclerViewAdapter.java   | 21 +++++--------------
 .../SearchResultsRecyclerViewAdapter.java     | 21 +++++--------------
 .../ui/shared/SimpleListItemViewHolder.java   | 17 +++++++++++++++
 3 files changed, 27 insertions(+), 32 deletions(-)
 create mode 100644 Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SimpleListItemViewHolder.java

diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
index 8c1d416..e2082d7 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
@@ -2,18 +2,17 @@ package com.majinnaibu.monstercards.ui.library;
 
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.SimpleListItemBinding;
 import com.majinnaibu.monstercards.models.Monster;
+import com.majinnaibu.monstercards.ui.shared.SimpleListItemViewHolder;
 import com.majinnaibu.monstercards.utils.ItemCallback;
 
-public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, LibraryRecyclerViewAdapter.ViewHolder> {
+public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, SimpleListItemViewHolder<Monster>> {
     private static final DiffUtil.ItemCallback<Monster> DIFF_CALLBACK = new DiffUtil.ItemCallback<Monster>() {
         @Override
         public boolean areItemsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
@@ -34,13 +33,13 @@ public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, LibraryRecy
 
     @Override
     @NonNull
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public SimpleListItemViewHolder<Monster> onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         SimpleListItemBinding binding = SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
-        return new ViewHolder(binding);
+        return new SimpleListItemViewHolder<>(binding);
     }
 
     @Override
-    public void onBindViewHolder(final @NonNull ViewHolder holder, int position) {
+    public void onBindViewHolder(final @NonNull SimpleListItemViewHolder<Monster> holder, int position) {
         Monster monster = getItem(position);
         holder.item = monster;
         holder.contentView.setText(monster.name);
@@ -51,14 +50,4 @@ public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, LibraryRecy
             }
         });
     }
-
-    static class ViewHolder extends RecyclerView.ViewHolder {
-        final TextView contentView;
-        Monster item;
-
-        ViewHolder(SimpleListItemBinding binding) {
-            super(binding.getRoot());
-            contentView = binding.content;
-        }
-    }
 }
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
index 2eabd2a..57cb8b9 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java
@@ -2,18 +2,17 @@ package com.majinnaibu.monstercards.ui.search;
 
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.SimpleListItemBinding;
 import com.majinnaibu.monstercards.models.Monster;
+import com.majinnaibu.monstercards.ui.shared.SimpleListItemViewHolder;
 import com.majinnaibu.monstercards.utils.ItemCallback;
 
-public class SearchResultsRecyclerViewAdapter extends ListAdapter<Monster, SearchResultsRecyclerViewAdapter.ViewHolder> {
+public class SearchResultsRecyclerViewAdapter extends ListAdapter<Monster, SimpleListItemViewHolder<Monster>> {
     private static final DiffUtil.ItemCallback<Monster> DIFF_CALLBACK = new DiffUtil.ItemCallback<Monster>() {
         @Override
         public boolean areItemsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
@@ -34,13 +33,13 @@ public class SearchResultsRecyclerViewAdapter extends ListAdapter<Monster, Searc
 
     @NonNull
     @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public SimpleListItemViewHolder<Monster> onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         SimpleListItemBinding binding = SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
-        return new ViewHolder(binding);
+        return new SimpleListItemViewHolder<>(binding);
     }
 
     @Override
-    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final SimpleListItemViewHolder<Monster> holder, int position) {
         Monster monster = getItem(position);
         holder.item = monster;
         holder.contentView.setText(monster.name);
@@ -50,14 +49,4 @@ public class SearchResultsRecyclerViewAdapter extends ListAdapter<Monster, Searc
             }
         });
     }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        final TextView contentView;
-        Monster item;
-
-        ViewHolder(SimpleListItemBinding binding) {
-            super(binding.getRoot());
-            contentView = binding.content;
-        }
-    }
 }
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SimpleListItemViewHolder.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SimpleListItemViewHolder.java
new file mode 100644
index 0000000..14e0b00
--- /dev/null
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/shared/SimpleListItemViewHolder.java
@@ -0,0 +1,17 @@
+package com.majinnaibu.monstercards.ui.shared;
+
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.majinnaibu.monstercards.databinding.SimpleListItemBinding;
+
+public class SimpleListItemViewHolder<T> extends RecyclerView.ViewHolder {
+    public final TextView contentView;
+    public T item;
+
+    public SimpleListItemViewHolder(SimpleListItemBinding binding) {
+        super(binding.getRoot());
+        contentView = binding.content;
+    }
+}