From fb40e7519952ac3858c56bd81e7538a691079b15 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headunter3@gmail.com>
Date: Thu, 1 Jul 2021 00:02:48 -0700
Subject: [PATCH] Fixes lists to use similar sized items.

---
 .../monstercards/ui/library/LibraryFragment.java  |  2 +-
 ...apter.java => LibraryRecyclerViewAdapter.java} | 10 +++++-----
 .../layout/fragment_edit_languages_list_item.xml  |  4 ++--
 .../res/layout/fragment_edit_skills_list_item.xml |  2 +-
 .../layout/fragment_edit_strings_list_item.xml    |  2 +-
 .../res/layout/fragment_edit_traits_list_item.xml |  2 +-
 app/src/main/res/layout/monster_list_content.xml  | 15 +++++++++++----
 7 files changed, 22 insertions(+), 15 deletions(-)
 rename app/src/main/java/com/majinnaibu/monstercards/ui/library/{MonsterListRecyclerViewAdapter.java => LibraryRecyclerViewAdapter.java} (89%)

diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
index 8966015..51f7e1f 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
@@ -50,7 +50,7 @@ public class LibraryFragment extends MCFragment {
         Context context = requireContext();
         MonsterRepository repository = this.getMonsterRepository();
 
-        MonsterListRecyclerViewAdapter adapter = new MonsterListRecyclerViewAdapter(
+        LibraryRecyclerViewAdapter adapter = new LibraryRecyclerViewAdapter(
                 context,
                 repository.getMonsters(),
                 (monster) -> navigateToMonsterDetail(monster.id),
diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/library/MonsterListRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
similarity index 89%
rename from app/src/main/java/com/majinnaibu/monstercards/ui/library/MonsterListRecyclerViewAdapter.java
rename to app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
index ca0bab0..6b20d59 100644
--- a/app/src/main/java/com/majinnaibu/monstercards/ui/library/MonsterListRecyclerViewAdapter.java
+++ b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
@@ -20,7 +20,7 @@ import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-public class MonsterListRecyclerViewAdapter extends RecyclerView.Adapter<MonsterListRecyclerViewAdapter.ViewHolder> {
+public class LibraryRecyclerViewAdapter extends RecyclerView.Adapter<LibraryRecyclerViewAdapter.ViewHolder> {
     private final Context mContext;
     private final ItemCallback mOnDelete;
     private final ItemCallback mOnClick;
@@ -37,10 +37,10 @@ public class MonsterListRecyclerViewAdapter extends RecyclerView.Adapter<Monster
     private List<Monster> mValues;
     private Disposable mDisposable;
 
-    public MonsterListRecyclerViewAdapter(Context context,
-                                          Flowable<List<Monster>> itemsObservable,
-                                          ItemCallback onClick,
-                                          ItemCallback onDelete) {
+    public LibraryRecyclerViewAdapter(Context context,
+                                      Flowable<List<Monster>> itemsObservable,
+                                      ItemCallback onClick,
+                                      ItemCallback onDelete) {
         mItemsObservable = itemsObservable;
         mValues = new ArrayList<>();
         mContext = context;
diff --git a/app/src/main/res/layout/fragment_edit_languages_list_item.xml b/app/src/main/res/layout/fragment_edit_languages_list_item.xml
index 6e9049a..ea0dc65 100644
--- a/app/src/main/res/layout/fragment_edit_languages_list_item.xml
+++ b/app/src/main/res/layout/fragment_edit_languages_list_item.xml
@@ -6,8 +6,8 @@
 
     <TextView
         android:id="@+id/content"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
         android:textAppearance="?attr/textAppearanceListItem" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_edit_skills_list_item.xml b/app/src/main/res/layout/fragment_edit_skills_list_item.xml
index 93d00b2..ea0dc65 100644
--- a/app/src/main/res/layout/fragment_edit_skills_list_item.xml
+++ b/app/src/main/res/layout/fragment_edit_skills_list_item.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/content"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
         android:textAppearance="?attr/textAppearanceListItem" />
diff --git a/app/src/main/res/layout/fragment_edit_strings_list_item.xml b/app/src/main/res/layout/fragment_edit_strings_list_item.xml
index 93d00b2..ea0dc65 100644
--- a/app/src/main/res/layout/fragment_edit_strings_list_item.xml
+++ b/app/src/main/res/layout/fragment_edit_strings_list_item.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/content"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
         android:textAppearance="?attr/textAppearanceListItem" />
diff --git a/app/src/main/res/layout/fragment_edit_traits_list_item.xml b/app/src/main/res/layout/fragment_edit_traits_list_item.xml
index 93d00b2..ea0dc65 100644
--- a/app/src/main/res/layout/fragment_edit_traits_list_item.xml
+++ b/app/src/main/res/layout/fragment_edit_traits_list_item.xml
@@ -6,7 +6,7 @@
 
     <TextView
         android:id="@+id/content"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/text_margin"
         android:textAppearance="?attr/textAppearanceListItem" />
diff --git a/app/src/main/res/layout/monster_list_content.xml b/app/src/main/res/layout/monster_list_content.xml
index 704645a..b45ad3b 100644
--- a/app/src/main/res/layout/monster_list_content.xml
+++ b/app/src/main/res/layout/monster_list_content.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/text_margin"
-    android:textAppearance="?attr/textAppearanceListItem" />
+    android:orientation="horizontal">
+    <!-- // TODO: combine all of these similar list layouts into a single one -->
+
+    <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>