From 688cfd3397eb91fdee73b511b5286f74937215db Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Mon, 30 Aug 2021 11:06:40 -0700
Subject: [PATCH] Adds generic ItemCallback interface.

---
 .../ui/dashboard/DashboardRecyclerViewAdapter.java    | 11 ++++-------
 .../editmonster/EditLanguagesRecyclerViewAdapter.java | 11 ++++-------
 .../ui/editmonster/EditSkillsRecyclerViewAdapter.java | 11 ++++-------
 .../editmonster/EditStringsRecyclerViewAdapter.java   | 11 ++++-------
 .../ui/editmonster/EditTraitsRecyclerViewAdapter.java | 11 ++++-------
 .../ui/library/LibraryRecyclerViewAdapter.java        | 11 ++++-------
 .../ui/search/SearchResultsRecyclerViewAdapter.java   |  9 +++------
 .../majinnaibu/monstercards/utils/ItemCallback.java   |  5 +++++
 8 files changed, 32 insertions(+), 48 deletions(-)
 create mode 100644 Android/app/src/main/java/com/majinnaibu/monstercards/utils/ItemCallback.java

diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java
index b1ab732..a76cf69 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java
@@ -20,6 +20,7 @@ import com.majinnaibu.monstercards.databinding.CardMonsterBinding;
 import com.majinnaibu.monstercards.helpers.CommonMarkHelper;
 import com.majinnaibu.monstercards.models.Monster;
 import com.majinnaibu.monstercards.models.Trait;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 import com.majinnaibu.monstercards.utils.Logger;
 
 import java.util.Locale;
@@ -36,9 +37,9 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
             return Monster.areContentsTheSame(oldItem, newItem);
         }
     };
-    private final ItemCallback mOnClick;
+    private final ItemCallback<Monster> mOnClick;
 
-    protected DashboardRecyclerViewAdapter(ItemCallback onClick) {
+    protected DashboardRecyclerViewAdapter(ItemCallback<Monster> onClick) {
         super(DIFF_CALLBACK);
         mOnClick = onClick;
     }
@@ -119,15 +120,11 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
 
         holder.itemView.setOnClickListener(v -> {
             if (mOnClick != null) {
-                mOnClick.onItemCallback(holder.monster);
+                mOnClick.onItem(holder.monster);
             }
         });
     }
 
-    public interface ItemCallback {
-        void onItemCallback(Monster monster);
-    }
-
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public final TextView name;
         public final TextView meta;
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java
index e9163c6..ec15691 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java
@@ -13,13 +13,14 @@ import com.majinnaibu.monstercards.databinding.FragmentEditLanguagesListHeaderBi
 import com.majinnaibu.monstercards.databinding.FragmentEditLanguagesListItemBinding;
 import com.majinnaibu.monstercards.models.Language;
 import com.majinnaibu.monstercards.ui.components.Stepper;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 
 import java.util.List;
 import java.util.Locale;
 
 public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private final List<Language> mValues;
-    private final ItemCallback mOnClick;
+    private final ItemCallback<Language> mOnClick;
     private final int mTelepathyRange;
     private final String mUnderstandsBut;
     private final Stepper.OnValueChangeListener mOnTelepathyRangeChanged;
@@ -29,7 +30,7 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     private final int ITEM_VIEW_TYPE = 2;
     private final String DISTANCE_IN_FEET_FORMAT = "%d ft.";
 
-    public EditLanguagesRecyclerViewAdapter(List<Language> items, ItemCallback onClick, int telepathyRange, Stepper.OnValueChangeListener telepathyRangeChangedListener, String understandsBut, TextWatcher understandsButChangedListener) {
+    public EditLanguagesRecyclerViewAdapter(List<Language> items, ItemCallback<Language> onClick, int telepathyRange, Stepper.OnValueChangeListener telepathyRangeChangedListener, String understandsBut, TextWatcher understandsButChangedListener) {
         mValues = items;
         mOnClick = onClick;
         mTelepathyRange = telepathyRange;
@@ -62,7 +63,7 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
             itemViewHolder.mContentView.setText(itemViewHolder.mItem.getName());
             itemViewHolder.itemView.setOnClickListener(view -> {
                 if (mOnClick != null) {
-                    mOnClick.onItemCallback(itemViewHolder.mItem);
+                    mOnClick.onItem(itemViewHolder.mItem);
                 }
             });
         }
@@ -81,10 +82,6 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         return ITEM_VIEW_TYPE;
     }
 
-    public interface ItemCallback {
-        void onItemCallback(Language language);
-    }
-
     public static class HeaderViewHolder extends RecyclerView.ViewHolder {
         public final Stepper telepathy;
         public final EditText understandsBut;
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java
index f91b8ef..dbc5cf3 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java
@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.FragmentEditSkillsListItemBinding;
 import com.majinnaibu.monstercards.models.Skill;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 
 import java.util.List;
 
@@ -17,9 +18,9 @@ import java.util.List;
  */
 public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkillsRecyclerViewAdapter.ViewHolder> {
     private final List<Skill> mValues;
-    private final ItemCallback mOnClick;
+    private final ItemCallback<Skill> mOnClick;
 
-    public EditSkillsRecyclerViewAdapter(List<Skill> items, ItemCallback onClick) {
+    public EditSkillsRecyclerViewAdapter(List<Skill> items, ItemCallback<Skill> onClick) {
         mValues = items;
         mOnClick = onClick;
     }
@@ -36,7 +37,7 @@ public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkil
         holder.mContentView.setText(mValues.get(position).name);
         holder.itemView.setOnClickListener(v -> {
             if (mOnClick != null) {
-                mOnClick.onItemCallback(holder.mItem);
+                mOnClick.onItem(holder.mItem);
             }
         });
     }
@@ -46,10 +47,6 @@ public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkil
         return mValues.size();
     }
 
-    public interface ItemCallback {
-        void onItemCallback(Skill skill);
-    }
-
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public final TextView mContentView;
         public Skill mItem;
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java
index fda532c..643a961 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java
@@ -8,14 +8,15 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.FragmentEditStringsListItemBinding;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 
 import java.util.List;
 
 public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStringsRecyclerViewAdapter.ViewHolder> {
     private final List<String> mValues;
-    private final ItemCallback mOnClick;
+    private final ItemCallback<String> mOnClick;
 
-    public EditStringsRecyclerViewAdapter(List<String> items, ItemCallback onClick) {
+    public EditStringsRecyclerViewAdapter(List<String> items, ItemCallback<String> onClick) {
         mValues = items;
         mOnClick = onClick;
     }
@@ -32,7 +33,7 @@ public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStr
         holder.mContentView.setText(mValues.get(position));
         holder.itemView.setOnClickListener(v -> {
             if (mOnClick != null) {
-                mOnClick.onItemCallback(holder.mItem);
+                mOnClick.onItem(holder.mItem);
             }
         });
     }
@@ -42,10 +43,6 @@ public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStr
         return mValues.size();
     }
 
-    public interface ItemCallback {
-        void onItemCallback(String value);
-    }
-
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public final TextView mContentView;
         public String mItem;
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java
index b7fc0c6..ddf1aea 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.FragmentEditTraitsListItemBinding;
 import com.majinnaibu.monstercards.models.Trait;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 
 public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraitsRecyclerViewAdapter.ViewHolder> {
     private static final DiffUtil.ItemCallback<Trait> DIFF_CALLBACK = new DiffUtil.ItemCallback<Trait>() {
@@ -25,9 +26,9 @@ public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraits
             return oldItem.equals(newItem);
         }
     };
-    private final ItemCallback mOnClick;
+    private final ItemCallback<Trait> mOnClick;
 
-    protected EditTraitsRecyclerViewAdapter(ItemCallback onClick) {
+    protected EditTraitsRecyclerViewAdapter(ItemCallback<Trait> onClick) {
         super(DIFF_CALLBACK);
         mOnClick = onClick;
     }
@@ -44,15 +45,11 @@ public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraits
         holder.mContentView.setText(holder.mItem.name);
         holder.itemView.setOnClickListener(v -> {
             if (mOnClick != null) {
-                mOnClick.onItemCallback(holder.mItem);
+                mOnClick.onItem(holder.mItem);
             }
         });
     }
 
-    public interface ItemCallback {
-        void onItemCallback(Trait trait);
-    }
-
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public final TextView mContentView;
         public Trait mItem;
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 f9382e2..171cfb3 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
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.R;
 import com.majinnaibu.monstercards.models.Monster;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 
 public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, LibraryRecyclerViewAdapter.ViewHolder> {
     private static final DiffUtil.ItemCallback<Monster> DIFF_CALLBACK = new DiffUtil.ItemCallback<Monster>() {
@@ -25,9 +26,9 @@ public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, LibraryRecy
             return Monster.areContentsTheSame(oldItem, newItem);
         }
     };
-    private final ItemCallback mOnClick;
+    private final ItemCallback<Monster> mOnClick;
 
-    public LibraryRecyclerViewAdapter(ItemCallback onClick) {
+    public LibraryRecyclerViewAdapter(ItemCallback<Monster> onClick) {
         super(DIFF_CALLBACK);
         mOnClick = onClick;
     }
@@ -48,15 +49,11 @@ public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, LibraryRecy
         holder.itemView.setTag(monster);
         holder.itemView.setOnClickListener(v -> {
             if (mOnClick != null) {
-                mOnClick.onItemCallback(holder.item);
+                mOnClick.onItem(holder.item);
             }
         });
     }
 
-    public interface ItemCallback {
-        void onItemCallback(Monster monster);
-    }
-
     static class ViewHolder extends RecyclerView.ViewHolder {
         final TextView contentView;
         Monster item;
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 93c546a..d9b5dac 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
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.majinnaibu.monstercards.R;
 import com.majinnaibu.monstercards.data.MonsterRepository;
 import com.majinnaibu.monstercards.models.Monster;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 import com.majinnaibu.monstercards.utils.Logger;
 
 import java.util.ArrayList;
@@ -21,13 +22,13 @@ import io.reactivex.rxjava3.disposables.Disposable;
 
 public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter<SearchResultsRecyclerViewAdapter.ViewHolder> {
     private final MonsterRepository mRepository;
-    private final ItemCallback mOnClickHandler;
+    private final ItemCallback<Monster> mOnClickHandler;
     private String mSearchText;
     private List<Monster> mValues;
     private Disposable mSubscriptionHandler;
 
     public SearchResultsRecyclerViewAdapter(MonsterRepository repository,
-                                            ItemCallback onClick) {
+                                            ItemCallback<Monster> onClick) {
         mRepository = repository;
         mSearchText = "";
         mValues = new ArrayList<>();
@@ -75,10 +76,6 @@ public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter<Searc
         return mValues.size();
     }
 
-    public interface ItemCallback {
-        void onItem(Monster monster);
-    }
-
     public static class ViewHolder extends RecyclerView.ViewHolder {
         final TextView mContentView;
 
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/utils/ItemCallback.java b/Android/app/src/main/java/com/majinnaibu/monstercards/utils/ItemCallback.java
new file mode 100644
index 0000000..8dd0ecc
--- /dev/null
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/utils/ItemCallback.java
@@ -0,0 +1,5 @@
+package com.majinnaibu.monstercards.utils;
+
+public interface ItemCallback<T> {
+    void onItem(T item);
+}