Makes DashboardFragment use its ViewModel

Android/.idea/misc.xml

@@ -1,6 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <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/fragment_search.xml" value="0.16875" />
+        <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" />
+    <option name="myNullables">
+      <value>
+        <list size="14">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="14">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="5" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java

@@ -21,15 +21,12 @@ import com.majinnaibu.monstercards.utils.Logger;
 
 import java.util.List;
 
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
 public class DashboardFragment extends MCFragment {
-    private static final String MODIFIER_FORMAT = "%+d";
     private DashboardViewModel mViewModel;
     private ViewHolder mHolder;
     private DashboardRecyclerViewAdapter mAdapter;
 
+    @Override
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
         mViewModel = new ViewModelProvider(this).get(DashboardViewModel.class);
@@ -38,20 +35,11 @@ public class DashboardFragment extends MCFragment {
 
         setupRecyclerView(mHolder.list);
 
-        getMonsterRepository()
-                .getMonsters()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(monsters -> {
-                    mViewModel.setMonsters(monsters);
-                });
-
         return root;
     }
 
     private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
-        int columnCount = Math.max(1, (int) Math.floor(getResources().getConfiguration().screenWidthDp / 396));
+        int columnCount = Math.max(1, getResources().getConfiguration().screenWidthDp / 396);
-        Logger.logWTF(String.format("Setting column count to %d", columnCount));
         Context context = requireContext();
         GridLayoutManager layoutManager = new GridLayoutManager(context, columnCount);
         recyclerView.setLayoutManager(layoutManager);

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;

Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardViewModel.java

@@ -1,26 +1,50 @@
 package com.majinnaibu.monstercards.ui.dashboard;
 
+import android.app.Application;
+
+import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
 
+import com.majinnaibu.monstercards.AppDatabase;
 import com.majinnaibu.monstercards.models.Monster;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class DashboardViewModel extends ViewModel {
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.DisposableSubscriber;
+
+public class DashboardViewModel extends AndroidViewModel {
+    private final AppDatabase mDB;
     private final MutableLiveData<List<Monster>> mMonsters;
 
-    public DashboardViewModel() {
+    public DashboardViewModel(Application application) {
+        super(application);
+        mDB = AppDatabase.getInstance(application);
         mMonsters = new MutableLiveData<>(new ArrayList<>());
+        mDB.monsterDAO()
+                .getAll()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new DisposableSubscriber<List<Monster>>() {
+                    @Override
+                    public void onNext(List<Monster> monsters) {
+                        mMonsters.setValue(monsters);
+                    }
+
+                    @Override
+                    public void onError(Throwable t) {
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
     }
 
     public LiveData<List<Monster>> getMonsters() {
         return mMonsters;
     }
-
-    public void setMonsters(List<Monster> monsters) {
-        mMonsters.setValue(monsters);
-    }
 }

Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java

@@ -6,20 +6,20 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
 
+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;
-import org.jetbrains.annotations.NotNull;
 
 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,40 +29,40 @@ 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 undderstandsBut, 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;
         mOnTelepathyRangeChanged = telepathyRangeChangedListener;
-        mUnderstandsBut = undderstandsBut;
+        mUnderstandsBut = understandsBut;
         mOnUnderstandsButChanged = understandsButChangedListener;
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         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
-    public void onBindViewHolder(@NotNull final RecyclerView.ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof HeaderViewHolder) {
             HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
-            headerViewHolder.telepathy.setOnFormatValueCallback(value -> String.format(DISTANCE_IN_FEET_FORMAT, value));
+            headerViewHolder.telepathy.setOnFormatValueCallback(value -> String.format(Locale.getDefault(), DISTANCE_IN_FEET_FORMAT, value));
             headerViewHolder.telepathy.setValue(mTelepathyRange);
             headerViewHolder.telepathy.setOnValueChangeListener(mOnTelepathyRangeChanged);
             headerViewHolder.understandsBut.setText(mUnderstandsBut);
             headerViewHolder.understandsBut.addTextChangedListener(mOnUnderstandsButChanged);
-        } else if(holder instanceof ItemViewHolder) {
+        } else if (holder instanceof ItemViewHolder) {
-            ItemViewHolder itemViewHolder = (ItemViewHolder)holder;
+            ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
-            itemViewHolder.mItem = mValues.get(position-1);
+            itemViewHolder.mItem = mValues.get(position - 1);
             itemViewHolder.mContentView.setText(itemViewHolder.mItem.getName());
             itemViewHolder.itemView.setOnClickListener(view -> {
                 if (mOnClick != null) {
-                    mOnClick.onItemCallback(itemViewHolder.mItem);
+                    mOnClick.onItem(itemViewHolder.mItem);
                 }
             });
         }
@@ -70,7 +70,7 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
 
     @Override
     public int getItemCount() {
-        return mValues.size() +1;
+        return mValues.size() + 1;
     }
 
     @Override
@@ -81,15 +81,11 @@ 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;
 
-        public HeaderViewHolder(FragmentEditLanguagesListHeaderBinding binding) {
+        public HeaderViewHolder(@NonNull FragmentEditLanguagesListHeaderBinding binding) {
             super(binding.getRoot());
             telepathy = binding.telepathy;
             understandsBut = binding.understandsBut;
@@ -100,12 +96,12 @@ public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         public final TextView mContentView;
         public Language mItem;
 
-        public ItemViewHolder(FragmentEditLanguagesListItemBinding binding) {
+        public ItemViewHolder(@NonNull com.majinnaibu.monstercards.databinding.SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";

Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java

@@ -4,34 +4,41 @@ import android.view.LayoutInflater;
 import android.view.ViewGroup;
 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;
 
 import java.util.List;
 
 /**
  * {@link RecyclerView.Adapter} that can display a {@link Skill}.
- * TODO: Replace the implementation with code for your data type.
  */
 public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkillsRecyclerViewAdapter.ViewHolder> {
-
     private final List<Skill> mValues;
+    private final ItemCallback<Skill> mOnClick;
 
-    public EditSkillsRecyclerViewAdapter(List<Skill> items) {
+    public EditSkillsRecyclerViewAdapter(List<Skill> items, ItemCallback<Skill> onClick) {
         mValues = items;
+        mOnClick = onClick;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ViewHolder(com.majinnaibu.monstercards.databinding.SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
     }
 
     @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
-        return new ViewHolder(FragmentEditSkillsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
         holder.mItem = mValues.get(position);
         holder.mContentView.setText(mValues.get(position).name);
+        holder.itemView.setOnClickListener(v -> {
+            if (mOnClick != null) {
+                mOnClick.onItem(holder.mItem);
+            }
+        });
     }
 
     @Override
@@ -39,15 +46,16 @@ public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter<EditSkil
         return mValues.size();
     }
 
-    public class ViewHolder extends RecyclerView.ViewHolder {
+    public static class ViewHolder extends RecyclerView.ViewHolder {
         public final TextView mContentView;
         public Skill mItem;
 
-        public ViewHolder(FragmentEditSkillsListItemBinding binding) {
+        public ViewHolder(@NonNull com.majinnaibu.monstercards.databinding.SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";

Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsRecyclerViewAdapter.java

@@ -4,36 +4,36 @@ import android.view.LayoutInflater;
 import android.view.ViewGroup;
 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 org.jetbrains.annotations.NotNull;
 
 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;
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+    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
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         holder.mItem = mValues.get(position);
         holder.mContentView.setText(mValues.get(position));
         holder.itemView.setOnClickListener(v -> {
             if (mOnClick != null) {
-                mOnClick.onItemCallback(holder.mItem);
+                mOnClick.onItem(holder.mItem);
             }
         });
     }
@@ -43,20 +43,16 @@ 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;
 
-        public ViewHolder(FragmentEditStringsListItemBinding binding) {
+        public ViewHolder(@NonNull SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";

Android/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsRecyclerViewAdapter.java

@@ -9,62 +9,57 @@ 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;
-import org.jetbrains.annotations.NotNull;
 
 public class EditTraitsRecyclerViewAdapter extends ListAdapter<Trait, EditTraitsRecyclerViewAdapter.ViewHolder> {
     private static final DiffUtil.ItemCallback<Trait> DIFF_CALLBACK = new DiffUtil.ItemCallback<Trait>() {
 
         @Override
-        public boolean areItemsTheSame(@NonNull @NotNull Trait oldItem, @NonNull @NotNull Trait newItem) {
+        public boolean areItemsTheSame(@NonNull Trait oldItem, @NonNull Trait newItem) {
             return oldItem.equals(newItem);
         }
 
         @Override
-        public boolean areContentsTheSame(@NonNull @NotNull Trait oldItem, @NonNull @NotNull Trait newItem) {
+        public boolean areContentsTheSame(@NonNull Trait oldItem, @NonNull Trait newItem) {
             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;
     }
 
-    @NotNull
+    @NonNull
     @Override
-    public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+    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
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         holder.mItem = getItem(position);
         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;
 
-        public ViewHolder(FragmentEditTraitsListItemBinding binding) {
+        public ViewHolder(@NonNull SimpleListItemBinding binding) {
             super(binding.getRoot());
             mContentView = binding.content;
         }
 
-        @NotNull
+        @NonNull
         @Override
         public String toString() {
             return super.toString() + " '" + mContentView.getText() + "'";

Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java

@@ -7,6 +7,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavDirections;
 import androidx.navigation.Navigation;
 import androidx.recyclerview.widget.DividerItemDecoration;
@@ -18,65 +20,52 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.majinnaibu.monstercards.R;
 import com.majinnaibu.monstercards.data.MonsterRepository;
+import com.majinnaibu.monstercards.databinding.FragmentLibraryBinding;
 import com.majinnaibu.monstercards.models.Monster;
 import com.majinnaibu.monstercards.ui.shared.MCFragment;
 import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback;
 import com.majinnaibu.monstercards.utils.Logger;
 
-import java.util.UUID;
+import java.util.List;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class LibraryFragment extends MCFragment {
+    private LibraryViewModel mViewModel;
+    private ViewHolder mHolder;
+    private LibraryRecyclerViewAdapter mAdapter;
 
-    public View onCreateView(@NonNull LayoutInflater inflater,
+    @Override
-                             ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.fragment_library, container, false);
+        mViewModel = new ViewModelProvider(this).get(LibraryViewModel.class);
-
+        FragmentLibraryBinding binding = FragmentLibraryBinding.inflate(inflater, container, false);
-        FloatingActionButton fab = root.findViewById(R.id.fab);
+        mHolder = new ViewHolder(binding);
-        assert fab != null;
+        // TODO: set the title with setTitle(...)
-        setupAddMonsterButton(fab);
+        setupAddMonsterButton(mHolder.addButton);
-
+        setupMonsterList(mHolder.list);
-        final RecyclerView recyclerView = root.findViewById(R.id.monster_list);
+        return binding.getRoot();
-        assert recyclerView != null;
-        setupRecyclerView(recyclerView);
-
-        return root;
     }
 
-    private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
+    private void setupMonsterList(@NonNull RecyclerView recyclerView) {
         Context context = requireContext();
-        MonsterRepository repository = this.getMonsterRepository();
-
-        LibraryRecyclerViewAdapter adapter = new LibraryRecyclerViewAdapter(
-                context,
-                repository.getMonsters(),
-                (monster) -> navigateToMonsterDetail(monster.id),
-                (monster) -> repository
-                        .deleteMonster(monster)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new DisposableCompletableObserver() {
-                            @Override
-                            public void onComplete() {
-                            }
-
-                            @Override
-                            public void onError(@io.reactivex.rxjava3.annotations.NonNull Throwable e) {
-                                Logger.logError(e);
-                            }
-                        }));
-        recyclerView.setAdapter(adapter);
-
         LinearLayoutManager layoutManager = new LinearLayoutManager(context);
         recyclerView.setLayoutManager(layoutManager);
 
+        LiveData<List<Monster>> monsterData = mViewModel.getMonsters();
+        mAdapter = new LibraryRecyclerViewAdapter(this::navigateToMonsterDetail);
+        if (monsterData != null) {
+            monsterData.observe(getViewLifecycleOwner(), monsters -> mAdapter.submitList(monsters));
+        }
+        recyclerView.setAdapter(mAdapter);
         DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, layoutManager.getOrientation());
         recyclerView.addItemDecoration(dividerItemDecoration);
 
-        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new SwipeToDeleteCallback(requireContext(), (position, direction) -> adapter.deleteItem(position), null));
+        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new SwipeToDeleteCallback(
+                requireContext(),
+                (position, direction) -> mViewModel.removeMonster(position),
+                null));
         itemTouchHelper.attachToRecyclerView(recyclerView);
     }
 
@@ -98,7 +87,7 @@ public class LibraryFragment extends MCFragment {
                                             view,
                                             getString(R.string.snackbar_monster_created, monster.name),
                                             Snackbar.LENGTH_LONG)
-                                            .setAction("Action", (_view) -> navigateToMonsterDetail(monster.id))
+                                            .setAction("Action", (_view) -> navigateToMonsterDetail(monster))
                                             .show();
                                 }
 
@@ -114,10 +103,22 @@ public class LibraryFragment extends MCFragment {
         });
     }
 
-    protected void navigateToMonsterDetail(UUID monsterId) {
+    protected void navigateToMonsterDetail(Monster monster) {
-        NavDirections action = LibraryFragmentDirections.actionNavigationLibraryToNavigationMonster(monsterId.toString());
+        if (monster != null) {
-        View view = getView();
+            NavDirections action = LibraryFragmentDirections.actionNavigationLibraryToNavigationMonster(monster.id.toString());
-        assert view != null;
+            Navigation.findNavController(requireView()).navigate(action);
-        Navigation.findNavController(view).navigate(action);
+        } else {
+            Logger.logError("Can't navigate to MonsterDetail without a monster.");
+        }
+    }
+
+    private static class ViewHolder {
+        final FloatingActionButton addButton;
+        final RecyclerView list;
+
+        public ViewHolder(FragmentLibraryBinding binding) {
+            addButton = binding.fab;
+            list = binding.monsterList;
+        }
     }
 }

Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java

@@ -1,115 +1,53 @@
 package com.majinnaibu.monstercards.ui.library;
 
-import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
 
-import com.majinnaibu.monstercards.R;
+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;
 
-import java.util.ArrayList;
+public class LibraryRecyclerViewAdapter extends ListAdapter<Monster, SimpleListItemViewHolder<Monster>> {
-import java.util.List;
+    private static final DiffUtil.ItemCallback<Monster> DIFF_CALLBACK = new DiffUtil.ItemCallback<Monster>() {
-
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
-public class LibraryRecyclerViewAdapter extends RecyclerView.Adapter<LibraryRecyclerViewAdapter.ViewHolder> {
-    private final Context mContext;
-    private final ItemCallback mOnDelete;
-    private final ItemCallback mOnClick;
-    private final Flowable<List<Monster>> mItemsObservable;
-    private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
         @Override
-        public void onClick(@NonNull View view) {
+        public boolean areItemsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
-            Monster monster = (Monster) view.getTag();
+            return Monster.areItemsTheSame(oldItem, newItem);
-            if (mOnClick != null) {
-                mOnClick.onItemCallback(monster);
         }
+
+        @Override
+        public boolean areContentsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
+            return Monster.areContentsTheSame(oldItem, newItem);
         }
     };
-    private List<Monster> mValues;
+    private final ItemCallback<Monster> mOnClick;
-    private Disposable mDisposable;
 
-    public LibraryRecyclerViewAdapter(Context context,
+    public LibraryRecyclerViewAdapter(ItemCallback<Monster> onClick) {
-                                      Flowable<List<Monster>> itemsObservable,
+        super(DIFF_CALLBACK);
-                                      ItemCallback onClick,
-                                      ItemCallback onDelete) {
-        mItemsObservable = itemsObservable;
-        mValues = new ArrayList<>();
-        mContext = context;
-        mOnDelete = onDelete;
         mOnClick = onClick;
-        mDisposable = null;
     }
 
     @Override
     @NonNull
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    public SimpleListItemViewHolder<Monster> onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
+        SimpleListItemBinding binding = SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
-                .inflate(R.layout.monster_list_content, parent, false);
+        return new SimpleListItemViewHolder<>(binding);
-        return new ViewHolder(view);
     }
 
     @Override
-    public void onBindViewHolder(final @NonNull ViewHolder holder, int position) {
+    public void onBindViewHolder(final @NonNull SimpleListItemViewHolder<Monster> holder, int position) {
-        Monster monster = mValues.get(position);
+        Monster monster = getItem(position);
-        holder.mContentView.setText(monster.name);
+        holder.item = monster;
+        holder.contentView.setText(monster.name);
         holder.itemView.setTag(monster);
-        holder.itemView.setOnClickListener(mOnClickListener);
+        holder.itemView.setOnClickListener(v -> {
+            if (mOnClick != null) {
+                mOnClick.onItem(holder.item);
             }
-
-    @Override
-    public int getItemCount() {
-        return mValues.size();
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
-    @Override
-    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
-        super.onAttachedToRecyclerView(recyclerView);
-        // TODO: consider moving this subscription out of the adapter and make the subscriber call setItems on the adapter
-        mDisposable = mItemsObservable
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(monsters -> {
-                    mValues = monsters;
-                    notifyDataSetChanged();
         });
     }
-
-    @Override
-    public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView);
-        mDisposable.dispose();
-    }
-
-    public void deleteItem(int position) {
-        if (mOnDelete != null) {
-            Monster monster = mValues.get(position);
-            mOnDelete.onItemCallback(monster);
-        }
-    }
-
-    public interface ItemCallback {
-        void onItemCallback(Monster monster);
-    }
-
-    static class ViewHolder extends RecyclerView.ViewHolder {
-        final TextView mContentView;
-
-        ViewHolder(View view) {
-            super(view);
-            mContentView = view.findViewById(R.id.content);
-        }
-    }
 }

Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryViewModel.java

@@ -1,19 +1,74 @@
 package com.majinnaibu.monstercards.ui.library;
 
+import android.app.Application;
+
+import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
 
-public class LibraryViewModel extends ViewModel {
+import com.majinnaibu.monstercards.AppDatabase;
+import com.majinnaibu.monstercards.models.Monster;
 
-    private MutableLiveData<String> mText;
+import java.util.ArrayList;
+import java.util.List;
 
-    public LibraryViewModel() {
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-        mText = new MutableLiveData<>();
+import io.reactivex.rxjava3.annotations.NonNull;
-        mText.setValue("This is library fragment");
+import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.DisposableSubscriber;
+
+public class LibraryViewModel extends AndroidViewModel {
+    private final AppDatabase mDB;
+    private final MutableLiveData<List<Monster>> mMonsters;
+
+    public LibraryViewModel(Application application) {
+        super(application);
+        mDB = AppDatabase.getInstance(application);
+        mMonsters = new MutableLiveData<>(new ArrayList<>());
+        mDB.monsterDAO()
+                .getAll()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(new DisposableSubscriber<List<Monster>>() {
+                    @Override
+                    public void onNext(List<Monster> monsters) {
+                        mMonsters.setValue(monsters);
                     }
 
-    public LiveData<String> getText() {
+                    @Override
-        return mText;
+                    public void onError(Throwable t) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+
+    public LiveData<List<Monster>> getMonsters() {
+        return mMonsters;
+    }
+
+    public void removeMonster(int position) {
+        Monster monster = mMonsters.getValue().get(position);
+        mDB.monsterDAO()
+                .delete(monster)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(new DisposableCompletableObserver() {
+                    @Override
+                    public void onComplete() {
+
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+
+                    }
+                });
     }
 }

Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java

@@ -1,34 +1,49 @@
 package com.majinnaibu.monstercards.ui.search;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.NavDirections;
+import androidx.navigation.Navigation;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.majinnaibu.monstercards.R;
+import com.majinnaibu.monstercards.databinding.FragmentSearchBinding;
-import com.majinnaibu.monstercards.data.MonsterRepository;
+import com.majinnaibu.monstercards.models.Monster;
 import com.majinnaibu.monstercards.ui.shared.MCFragment;
+import com.majinnaibu.monstercards.utils.Logger;
+
+import java.util.List;
 
 public class SearchFragment extends MCFragment {
+    private SearchViewModel mViewModel;
+    private ViewHolder mHolder;
+    private SearchResultsRecyclerViewAdapter mAdapter;
 
-    public View onCreateView(@NonNull LayoutInflater inflater,
+    @Override
-                             ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.fragment_search, container, false);
+        mViewModel = new ViewModelProvider(this).get(SearchViewModel.class);
-        MonsterRepository repository = this.getMonsterRepository();
+        FragmentSearchBinding binding = FragmentSearchBinding.inflate(inflater, container, false);
-        SearchResultsRecyclerViewAdapter adapter = new SearchResultsRecyclerViewAdapter(repository, null);
+        mHolder = new ViewHolder(binding);
-        final RecyclerView recyclerView = root.findViewById(R.id.monster_list);
+        // TODO: set the title with setTitle(...)
-        assert recyclerView != null;
+        setupMonsterList(binding.monsterList);
-        setupRecyclerView(recyclerView, adapter);
+        setupFilterBox(binding.searchQuery);
+        return binding.getRoot();
+    }
 
-        final TextView textView = root.findViewById(R.id.search_query);
+    private void setupFilterBox(@NonNull TextView textBox) {
-        textView.addTextChangedListener(new TextWatcher() {
+        textBox.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             }
@@ -39,15 +54,42 @@ public class SearchFragment extends MCFragment {
 
             @Override
             public void afterTextChanged(Editable editable) {
-                adapter.doSearch(textView.getText().toString());
+                mViewModel.setFilterText(textBox.getText().toString());
             }
         });
-
-        return root;
     }
 
-    private void setupRecyclerView(@NonNull RecyclerView recyclerView, @NonNull SearchResultsRecyclerViewAdapter adapter) {
+    private void setupMonsterList(@NonNull RecyclerView recyclerView) {
-        recyclerView.setAdapter(adapter);
+        Context context = requireContext();
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        LinearLayoutManager layoutManager = new LinearLayoutManager(context);
+        recyclerView.setLayoutManager(layoutManager);
+
+        LiveData<List<Monster>> monsterData = mViewModel.getMatchedMonsters();
+        mAdapter = new SearchResultsRecyclerViewAdapter(this::navigateToMonsterDetail);
+        if (monsterData != null) {
+            monsterData.observe(getViewLifecycleOwner(), monsters -> mAdapter.submitList(monsters));
+        }
+        recyclerView.setAdapter(mAdapter);
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, layoutManager.getOrientation());
+        recyclerView.addItemDecoration(dividerItemDecoration);
+    }
+
+    public void navigateToMonsterDetail(Monster monster) {
+        if (monster == null) {
+            NavDirections action = SearchFragmentDirections.actionNavigationSearchToNavigationMonster(monster.id.toString());
+            Navigation.findNavController(requireView()).navigate(action);
+        } else {
+            Logger.logError("Can't navigate to MonsterDetail without a monster.");
+        }
+    }
+
+    private static class ViewHolder {
+        final RecyclerView monsterList;
+        final EditText filterQuery;
+
+        public ViewHolder(FragmentSearchBinding binding) {
+            monsterList = binding.monsterList;
+            filterQuery = binding.searchQuery;
+        }
     }
 }

Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java

@@ -1,91 +1,52 @@
 package com.majinnaibu.monstercards.ui.search;
 
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
 
-import com.majinnaibu.monstercards.R;
+import com.majinnaibu.monstercards.databinding.SimpleListItemBinding;
-import com.majinnaibu.monstercards.data.MonsterRepository;
 import com.majinnaibu.monstercards.models.Monster;
-import com.majinnaibu.monstercards.utils.Logger;
+import com.majinnaibu.monstercards.ui.shared.SimpleListItemViewHolder;
+import com.majinnaibu.monstercards.utils.ItemCallback;
 
-import org.jetbrains.annotations.NotNull;
+public class SearchResultsRecyclerViewAdapter extends ListAdapter<Monster, SimpleListItemViewHolder<Monster>> {
-
+    private static final DiffUtil.ItemCallback<Monster> DIFF_CALLBACK = new DiffUtil.ItemCallback<Monster>() {
-import java.util.ArrayList;
-import java.util.List;
-
-import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.disposables.Disposable;
-
-public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter<SearchResultsRecyclerViewAdapter.ViewHolder> {
-    private final MonsterRepository mRepository;
-    private final ItemCallback mOnClickHandler;
-    private String mSearchText;
-    private List<Monster> mValues;
-    private Disposable mSubscriptionHandler;
-    public SearchResultsRecyclerViewAdapter(MonsterRepository repository,
-                                            ItemCallback onClick) {
-        mRepository = repository;
-        mSearchText = "";
-        mValues = new ArrayList<>();
-        mOnClickHandler = onClick;
-        mSubscriptionHandler = null;
-
-        doSearch(mSearchText);
-    }
-
-    public void doSearch(String searchText) {
-        if (mSubscriptionHandler != null && !mSubscriptionHandler.isDisposed()) {
-            mSubscriptionHandler.dispose();
-        }
-        mSearchText = searchText;
-        Flowable<List<Monster>> foundMonsters = mRepository.searchMonsters(mSearchText);
-        mSubscriptionHandler = foundMonsters.subscribe(monsters -> {
-                    mValues = monsters;
-                    notifyDataSetChanged();
-                },
-                throwable -> Logger.logError("Error performing search", throwable));
-    }
-
-    @NotNull
         @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        public boolean areItemsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
-        View view = LayoutInflater.from(parent.getContext())
+            return Monster.areItemsTheSame(oldItem, newItem);
-                .inflate(R.layout.monster_list_content, parent, false);
-        return new ViewHolder(view);
         }
 
         @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+        public boolean areContentsTheSame(@NonNull Monster oldItem, @NonNull Monster newItem) {
-        Monster monster = mValues.get(position);
+            return Monster.areContentsTheSame(oldItem, newItem);
-        holder.mContentView.setText(monster.name);
+        }
-        holder.itemView.setTag(monster);
+    };
+    private final ItemCallback<Monster> mOnClick;
+
+    public SearchResultsRecyclerViewAdapter(ItemCallback<Monster> onClick) {
+        super(DIFF_CALLBACK);
+        mOnClick = onClick;
+    }
+
+    @NonNull
+    @Override
+    public SimpleListItemViewHolder<Monster> onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        SimpleListItemBinding binding = SimpleListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
+        return new SimpleListItemViewHolder<>(binding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final SimpleListItemViewHolder<Monster> holder, int position) {
+        Monster monster = getItem(position);
+        holder.item = monster;
+        holder.contentView.setText(monster.name);
         holder.itemView.setOnClickListener(view -> {
-            if (mOnClickHandler != null) {
+            if (mOnClick != null) {
-                mOnClickHandler.onItem(monster);
+                mOnClick.onItem(holder.item);
             }
         });
     }
-
-    @Override
-    public int getItemCount() {
-        return mValues.size();
-    }
-
-    public interface ItemCallback {
-        void onItem(Monster monster);
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        final TextView mContentView;
-
-        ViewHolder(View view) {
-            super(view);
-            mContentView = view.findViewById(R.id.content);
-        }
-    }
 }

Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchViewModel.java

@@ -1,19 +1,118 @@
 package com.majinnaibu.monstercards.ui.search;
 
+import android.app.Application;
+
+import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
 
-public class SearchViewModel extends ViewModel {
+import com.majinnaibu.monstercards.AppDatabase;
+import com.majinnaibu.monstercards.helpers.StringHelper;
+import com.majinnaibu.monstercards.models.Monster;
+import com.majinnaibu.monstercards.utils.Logger;
 
-    private MutableLiveData<String> mSearchQuery;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 
-    public SearchViewModel() {
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-        mSearchQuery = new MutableLiveData<>();
+import io.reactivex.rxjava3.schedulers.Schedulers;
-        mSearchQuery.setValue("");
+import io.reactivex.rxjava3.subscribers.DisposableSubscriber;
+
+public class SearchViewModel extends AndroidViewModel {
+    private final MutableLiveData<List<Monster>> mAllMonsters;
+    private final MediatorLiveData<List<Monster>> mFilteredMonsters;
+    private final MutableLiveData<String> mFilterText;
+    private final AppDatabase mDB;
+
+    public SearchViewModel(Application application) {
+        super(application);
+        mDB = AppDatabase.getInstance(application);
+        mAllMonsters = new MutableLiveData<>(new ArrayList<>());
+        mFilterText = new MutableLiveData<>("");
+        mFilteredMonsters = new MediatorLiveData<>();
+        mFilteredMonsters.addSource(
+                mAllMonsters,
+                allMonsters -> mFilteredMonsters.setValue(
+                        filterMonsters(allMonsters, mFilterText.getValue())));
+        mFilteredMonsters.addSource(
+                mFilterText,
+                filterText -> mFilteredMonsters.setValue(
+                        filterMonsters(mAllMonsters.getValue(), filterText)));
+        mDB.monsterDAO()
+                .getAll()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(new DisposableSubscriber<List<Monster>>() {
+                    @Override
+                    public void onNext(List<Monster> monsters) {
+                        mAllMonsters.setValue(monsters);
                     }
 
-    public LiveData<String> getSearchQuery() {
+                    @Override
-        return mSearchQuery;
+                    public void onError(Throwable t) {
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
+    }
+
+    private boolean monsterMatchesFilter(Monster monster, String filterText) {
+        if (StringHelper.isNullOrEmpty(filterText)) {
+            return true;
+        }
+
+        if (StringHelper.containsCaseInsensitive(monster.name, filterText)) {
+            return true;
+        }
+
+        if (StringHelper.containsCaseInsensitive(monster.size, filterText)) {
+            return true;
+        }
+
+        if (StringHelper.containsCaseInsensitive(monster.type, filterText)) {
+            return true;
+        }
+
+        if (StringHelper.containsCaseInsensitive(monster.subtype, filterText)) {
+            return true;
+        }
+
+        if (StringHelper.containsCaseInsensitive(monster.alignment, filterText)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private List<Monster> filterMonsters(List<Monster> allMonsters, String filterText) {
+        ArrayList<Monster> filteredMonsters = new ArrayList<>();
+        filterText = filterText.toLowerCase(Locale.ROOT);
+        if (allMonsters != null) {
+            for (Monster monster : allMonsters) {
+                // TODO: do the filtering like the iOS app does.
+                Logger.logUnimplementedFeature("do the filtering like the iOS app does");
+                // TODO: consider splitting search text into words and if each word appears in any of these fields return true e.g, "large demon" would match large in size and demon in type.
+                // TODO: add tags and search by tags
+                // TODO: add a display of what fields matched on each item in the results
+                // TODO: make the criteria configurable from this screen
+                // TODO: find a way to add challenge rating as a search criteria
+                if (monsterMatchesFilter(monster, filterText)) {
+                    filteredMonsters.add(monster);
+                }
+            }
+        }
+        return filteredMonsters;
+    }
+
+    public LiveData<List<Monster>> getMatchedMonsters() {
+        return mFilteredMonsters;
+    }
+
+    public void setFilterText(String filterText) {
+        mFilterText.setValue(filterText);
     }
 }

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;
+    }
+}

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);
+}

Android/app/src/main/res/layout/activity_main.xml

@@ -31,5 +31,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
         app:navGraph="@navigation/mobile_navigation" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/card_ability_score.xml

@@ -55,5 +55,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="+5" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/card_action.xml

@@ -35,6 +35,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/name"
         tools:text="Melee Weapon Attack: +8 to hit, reach 10 ft., one target. Hit: 14 (2d8 + 5) bludgeoning damage." />
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/card_armor_class.xml

@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="17" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/card_challenge_rating.xml

@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="1/8" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/card_hit_points.xml

@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="367" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/card_initiative.xml

@@ -31,5 +31,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="+2" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/card_monster.xml

@@ -169,6 +169,4 @@
             android:layout_marginHorizontal="4dp"
             android:layout_weight="1" />
     </LinearLayout>
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/component_advantage_picker2.xml

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="@dimen/text_margin"
-    tools:context=".ui.components.AdvantagePicker">
-    <!-- // TODO: style this control to look less awful by default -->
-
-    <TextView
-        android:id="@+id/label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/padding_normal"
-        android:layout_marginTop="@dimen/padding_small"
-        android:text="@string/label_advantage"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <RadioGroup
-        android:id="@+id/group"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/label">
-
-        <com.google.android.material.radiobutton.MaterialRadioButton
-            android:id="@+id/hasNoAdvantage"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_marginVertical="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/radio_button_selector"
-            android:button="@android:color/transparent"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/label_advantage_none"
-            android:textAppearance="@android:style/TextAppearance.Material.Button"
-            android:textColor="@color/radio_button_text"
-            tools:checked="true" />
-
-        <com.google.android.material.radiobutton.MaterialRadioButton
-            android:id="@+id/hasAdvantage"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_marginVertical="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/radio_button_selector"
-            android:button="@android:color/transparent"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/label_advantage_advantage"
-            android:textAppearance="@android:style/TextAppearance.Material.Button"
-            android:textColor="@color/radio_button_text"
-            tools:checked="false" />
-
-        <com.google.android.material.radiobutton.MaterialRadioButton
-            android:id="@+id/hasDisadvantage"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="4dp"
-            android:layout_marginVertical="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/radio_button_selector"
-            android:button="@android:color/transparent"
-            android:gravity="center"
-            android:padding="8dp"
-            android:text="@string/label_advantage_disadvantage"
-            android:textAppearance="@android:style/TextAppearance.Material.Button"
-            android:textColor="@color/radio_button_text"
-            tools:checked="false" />
-    </RadioGroup>
-</androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/fragment_dashboard_list_item.xml

@@ -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>

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"

Android/app/src/main/res/layout/fragment_edit_monster.xml

@@ -184,6 +184,5 @@
             android:text="@string/label_regional_actions"
             android:textSize="@dimen/text_h4_size"
             app:drawableEndCompat="@drawable/ic_chevron_right_24" />
-
     </LinearLayout>
 </ScrollView>

Android/app/src/main/res/layout/fragment_edit_saving_throws.xml

@@ -167,5 +167,4 @@
                 android:layout_height="wrap_content" />
         </LinearLayout>
     </LinearLayout>
-
 </ScrollView>

Android/app/src/main/res/layout/fragment_edit_skills_list.xml

@@ -1,13 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/list"
-    android:name="com.majinnaibu.monstercards.ui.editmonster.EditSkillsFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
+    tools:context=".ui.editmonster.EditSkillsFragment">
-    android:layout_marginRight="16dp"
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="?android:attr/dividerVertical"
+        android:dividerPadding="@dimen/text_margin"
         app:layoutManager="LinearLayoutManager"
-    tools:context=".ui.editmonster.EditSkillsFragment"
+        app:layout_constraintBottom_toBottomOf="parent"
-    tools:listitem="@layout/fragment_edit_skills_list_item" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:listitem="@layout/simple_list_item" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_skill"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:contentDescription="@string/action_add_skill"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@android:drawable/ic_input_add"
+        app:tint="@android:color/white" />
+</androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/fragment_edit_skills_list_item.xml

@@ -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>

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"

Android/app/src/main/res/layout/fragment_edit_strings_list_item.xml

@@ -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>

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"

Android/app/src/main/res/layout/fragment_edit_traits_list_item.xml

@@ -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>

Android/app/src/main/res/layout/fragment_library.xml

@@ -15,7 +15,7 @@
         android:layout_marginRight="16dp"
         app:layoutManager="LinearLayoutManager"
         tools:context=".MonsterListFragment"
-        tools:listitem="@layout/monster_list_content" />
+        tools:listitem="@layout/simple_list_item" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"

Android/app/src/main/res/layout/fragment_search.xml

@@ -24,17 +24,15 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/monster_list"
-        android:layout_height="0dp"
         android:layout_width="0dp"
+        android:layout_height="0dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        app:layout_constraintTop_toBottomOf="@+id/search_query"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layoutManager="LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/search_query"
         tools:context=".SearchResultsFragment"
-        tools:listitem="@layout/monster_list_content" />
+        tools:listitem="@layout/simple_list_item" />
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/monster_list_content.xml

@@ -1,14 +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">
-    <!-- // 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>

Android/app/src/main/res/layout/tile_monster.xml

@@ -97,5 +97,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

Android/app/src/main/res/layout/tile_monster_short.xml

@@ -10,10 +10,10 @@
         android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/padding_normal"
         android:ellipsize="end"
         android:lines="1"
-        android:textSize="16sp"
+        android:textSize="@dimen/monster_tile_name_text_size"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -24,10 +24,10 @@
         android:id="@+id/meta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/padding_normal"
         android:ellipsize="end"
         android:lines="1"
-        android:textSize="10sp"
+        android:textSize="@dimen/monster_tile_meta_text_size"
         android:textStyle="italic"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +38,7 @@
         android:id="@+id/boxesRow"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_margin="@dimen/padding_normal"
         android:baselineAligned="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -48,8 +48,8 @@
         <include
             android:id="@+id/armorClass"
             layout="@layout/card_armor_class"
-            android:layout_width="40dp"
+            android:layout_width="@dimen/icon_size"
-            android:layout_height="40dp" />
+            android:layout_height="@dimen/icon_size" />
 
 
         <Space
@@ -60,8 +60,8 @@
         <include
             android:id="@+id/hitPoints"
             layout="@layout/card_hit_points"
-            android:layout_width="40dp"
+            android:layout_width="@dimen/icon_size"
-            android:layout_height="40dp" />
+            android:layout_height="@dimen/icon_size" />
 
         <Space
             android:layout_width="0dp"
@@ -71,8 +71,8 @@
         <include
             android:id="@+id/initiative"
             layout="@layout/card_initiative"
-            android:layout_width="40dp"
+            android:layout_width="@dimen/icon_size"
-            android:layout_height="40dp" />
+            android:layout_height="@dimen/icon_size" />
 
         <Space
             android:layout_width="0dp"
@@ -82,9 +82,7 @@
         <include
             android:id="@+id/challengeRating"
             layout="@layout/card_challenge_rating"
-            android:layout_width="40dp"
+            android:layout_width="@dimen/icon_size"
-            android:layout_height="40dp" />
+            android:layout_height="@dimen/icon_size" />
-
     </LinearLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>