From 6a5b6492e3dbb88c6db77a128f1daefaf5871cc5 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Mon, 30 Aug 2021 11:34:58 -0700
Subject: [PATCH] Replaces duplicated list item layouts with a single shared
 SimpleListItem.

---
 Android/.idea/misc.xml                        | 13 ++++++
 .../EditLanguagesRecyclerViewAdapter.java     |  5 +--
 .../EditSkillsRecyclerViewAdapter.java        |  5 +--
 .../EditStringsRecyclerViewAdapter.java       |  6 +--
 .../EditTraitsRecyclerViewAdapter.java        |  6 +--
 .../layout/fragment_dashboard_list_item.xml   | 42 -------------------
 .../layout/fragment_edit_languages_list.xml   |  2 +-
 .../res/layout/fragment_edit_skills_list.xml  |  2 +-
 .../layout/fragment_edit_skills_list_item.xml | 13 ------
 .../res/layout/fragment_edit_strings_list.xml |  2 +-
 .../res/layout/fragment_edit_traits_list.xml  |  2 +-
 .../layout/fragment_edit_traits_list_item.xml | 13 ------
 ...ges_list_item.xml => simple_list_item.xml} |  0
 13 files changed, 27 insertions(+), 84 deletions(-)
 delete mode 100644 Android/app/src/main/res/layout/fragment_dashboard_list_item.xml
 delete mode 100644 Android/app/src/main/res/layout/fragment_edit_skills_list_item.xml
 delete mode 100644 Android/app/src/main/res/layout/fragment_edit_traits_list_item.xml
 rename Android/app/src/main/res/layout/{fragment_edit_languages_list_item.xml => simple_list_item.xml} (100%)

diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
index 340b192..7448533 100644
--- a/Android/.idea/misc.xml
+++ b/Android/.idea/misc.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/dropdown_list_item.xml" value="0.12777777777777777" />
+        <entry key="app/src/main/res/layout/fragment_dashboard_list_item.xml" value="0.2210144927536232" />
+        <entry key="app/src/main/res/layout/fragment_edit_strings_list.xml" value="0.2210144927536232" />
+        <entry key="app/src/main/res/layout/fragment_edit_strings_list_item.xml" value="0.2210144927536232" />
+        <entry key="app/src/main/res/layout/fragment_edit_traits_list.xml" value="0.2210144927536232" />
+        <entry key="app/src/main/res/layout/fragment_edit_traits_list_item.xml" value="0.2210144927536232" />
+        <entry key="app/src/main/res/layout/simple_list_item.xml" value="0.2210144927536232" />
+      </map>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="androidx.annotation.Nullable" />
     <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
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 ec15691..d3b4885 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
@@ -10,7 +10,6 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.majinnaibu.monstercards.databinding.FragmentEditLanguagesListHeaderBinding;
-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;
@@ -45,7 +44,7 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         if (viewType == HEADER_VIEW_TYPE) {
             return new HeaderViewHolder(FragmentEditLanguagesListHeaderBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
         }
-        return new ItemViewHolder(FragmentEditLanguagesListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+        return new ItemViewHolder(com.majinnaibu.monstercards.databinding.SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
@@ -97,7 +96,7 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         public final TextView mContentView;
         public Language mItem;
 
-        public ItemViewHolder(@NonNull FragmentEditLanguagesListItemBinding binding) {
+        public ItemViewHolder(@NonNull com.majinnaibu.monstercards.databinding.SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
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 dbc5cf3..dc7764f 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
@@ -7,7 +7,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.majinnaibu.monstercards.databinding.FragmentEditSkillsListItemBinding;
 import com.majinnaibu.monstercards.models.Skill;
 import com.majinnaibu.monstercards.utils.ItemCallback;
 
@@ -28,7 +27,7 @@ public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkil
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new ViewHolder(FragmentEditSkillsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+        return new ViewHolder(com.majinnaibu.monstercards.databinding.SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
@@ -51,7 +50,7 @@ public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkil
         public final TextView mContentView;
         public Skill mItem;
 
-        public ViewHolder(@NonNull FragmentEditSkillsListItemBinding binding) {
+        public ViewHolder(@NonNull com.majinnaibu.monstercards.databinding.SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
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 643a961..6632091 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
@@ -7,7 +7,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.majinnaibu.monstercards.databinding.FragmentEditStringsListItemBinding;
+import com.majinnaibu.monstercards.databinding.SimpleListItemBinding;
 import com.majinnaibu.monstercards.utils.ItemCallback;
 
 import java.util.List;
@@ -24,7 +24,7 @@ public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStr
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new ViewHolder(FragmentEditStringsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+        return new ViewHolder(SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
@@ -47,7 +47,7 @@ public class EditStringsRecyclerViewAdapter extends RecyclerView.Adapter<EditStr
         public final TextView mContentView;
         public String mItem;
 
-        public ViewHolder(@NonNull FragmentEditStringsListItemBinding binding) {
+        public ViewHolder(@NonNull SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
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 ddf1aea..776f7ac 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
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.majinnaibu.monstercards.databinding.FragmentEditTraitsListItemBinding;
+import com.majinnaibu.monstercards.databinding.SimpleListItemBinding;
 import com.majinnaibu.monstercards.models.Trait;
 import com.majinnaibu.monstercards.utils.ItemCallback;
 
@@ -36,7 +36,7 @@ public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraits
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new ViewHolder(FragmentEditTraitsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+        return new ViewHolder(SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
@@ -54,7 +54,7 @@ public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraits
         public final TextView mContentView;
         public Trait mItem;
 
-        public ViewHolder(@NonNull FragmentEditTraitsListItemBinding binding) {
+        public ViewHolder(@NonNull SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
diff --git a/Android/app/src/main/res/layout/fragment_dashboard_list_item.xml b/Android/app/src/main/res/layout/fragment_dashboard_list_item.xml
deleted file mode 100644
index e89b69a..0000000
--- a/Android/app/src/main/res/layout/fragment_dashboard_list_item.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem" />
-
-    <!--            <include-->
-    <!--                layout="@layout/card_monster"-->
-    <!--                android:layout_width="0dp"-->
-    <!--                android:layout_height="wrap_content"-->
-    <!--                android:layout_columnWeight="1"-->
-    <!--                android:layout_marginVertical="8dp"/>-->
-
-    <!--            <include-->
-    <!--                layout="@layout/card_monster_short"-->
-    <!--                android:layout_width="0dp"-->
-    <!--                android:layout_height="wrap_content"-->
-    <!--                android:layout_columnWeight="1"-->
-    <!--                android:layout_marginVertical="8dp"/>-->
-
-    <!--            <include-->
-    <!--                layout="@layout/tile_monster"-->
-    <!--                android:layout_width="0dp"-->
-    <!--                android:layout_height="wrap_content"-->
-    <!--                android:layout_columnWeight="1"-->
-    <!--                android:layout_marginVertical="8dp"/>-->
-
-    <!--            <include-->
-    <!--                layout="@layout/tile_monster_short"-->
-    <!--                android:layout_width="0dp"-->
-    <!--                android:layout_height="wrap_content"-->
-    <!--                android:layout_columnWeight="1"-->
-    <!--                android:layout_marginVertical="8dp" />-->
-
-</LinearLayout>
diff --git a/Android/app/src/main/res/layout/fragment_edit_languages_list.xml b/Android/app/src/main/res/layout/fragment_edit_languages_list.xml
index e5d8254..79fe0e5 100644
--- a/Android/app/src/main/res/layout/fragment_edit_languages_list.xml
+++ b/Android/app/src/main/res/layout/fragment_edit_languages_list.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/fragment_edit_languages_list_item" />
+        tools:listitem="@layout/simple_list_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_language"
diff --git a/Android/app/src/main/res/layout/fragment_edit_skills_list.xml b/Android/app/src/main/res/layout/fragment_edit_skills_list.xml
index 00eeaef..78a30cd 100644
--- a/Android/app/src/main/res/layout/fragment_edit_skills_list.xml
+++ b/Android/app/src/main/res/layout/fragment_edit_skills_list.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/fragment_edit_skills_list_item" />
+        tools:listitem="@layout/simple_list_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_skill"
diff --git a/Android/app/src/main/res/layout/fragment_edit_skills_list_item.xml b/Android/app/src/main/res/layout/fragment_edit_skills_list_item.xml
deleted file mode 100644
index ea0dc65..0000000
--- a/Android/app/src/main/res/layout/fragment_edit_skills_list_item.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem" />
-</LinearLayout>
diff --git a/Android/app/src/main/res/layout/fragment_edit_strings_list.xml b/Android/app/src/main/res/layout/fragment_edit_strings_list.xml
index 765d3e9..cee063f 100644
--- a/Android/app/src/main/res/layout/fragment_edit_strings_list.xml
+++ b/Android/app/src/main/res/layout/fragment_edit_strings_list.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/fragment_edit_traits_list_item" />
+        tools:listitem="@layout/simple_list_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_item"
diff --git a/Android/app/src/main/res/layout/fragment_edit_traits_list.xml b/Android/app/src/main/res/layout/fragment_edit_traits_list.xml
index a4b9f4b..64c6cad 100644
--- a/Android/app/src/main/res/layout/fragment_edit_traits_list.xml
+++ b/Android/app/src/main/res/layout/fragment_edit_traits_list.xml
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:listitem="@layout/fragment_edit_traits_list_item" />
+        tools:listitem="@layout/simple_list_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_trait"
diff --git a/Android/app/src/main/res/layout/fragment_edit_traits_list_item.xml b/Android/app/src/main/res/layout/fragment_edit_traits_list_item.xml
deleted file mode 100644
index ea0dc65..0000000
--- a/Android/app/src/main/res/layout/fragment_edit_traits_list_item.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem" />
-</LinearLayout>
diff --git a/Android/app/src/main/res/layout/fragment_edit_languages_list_item.xml b/Android/app/src/main/res/layout/simple_list_item.xml
similarity index 100%
rename from Android/app/src/main/res/layout/fragment_edit_languages_list_item.xml
rename to Android/app/src/main/res/layout/simple_list_item.xml