Creates initial app database class and adds minimal DTO support for monsters.

Android/app/src/main/java/com/majinnaibu/monstercards/AppDatabase.java

@@ -4,27 +4,12 @@ import androidx.room.Database;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
 
+import com.majinnaibu.monstercards.converters.UUIDConverter;
 import com.majinnaibu.monstercards.data.MonsterDAO;
-import com.majinnaibu.monstercards.data.converters.ArmorTypeConverter;
-import com.majinnaibu.monstercards.data.converters.ChallengeRatingConverter;
-import com.majinnaibu.monstercards.data.converters.ListOfTraitsConverter;
-import com.majinnaibu.monstercards.data.converters.SetOfLanguageConverter;
-import com.majinnaibu.monstercards.data.converters.SetOfSkillConverter;
-import com.majinnaibu.monstercards.data.converters.SetOfStringConverter;
-import com.majinnaibu.monstercards.data.converters.UUIDConverter;
 import com.majinnaibu.monstercards.models.Monster;
-import com.majinnaibu.monstercards.models.MonsterFTS;
 
-@Database(entities = {Monster.class, MonsterFTS.class}, version = 3)
-@TypeConverters({
-        ArmorTypeConverter.class,
-        ChallengeRatingConverter.class,
-        ListOfTraitsConverter.class,
-        SetOfLanguageConverter.class,
-        SetOfSkillConverter.class,
-        SetOfStringConverter.class,
-        UUIDConverter.class,
-})
+@Database(entities = {Monster.class}, version=1)
+@TypeConverters({UUIDConverter.class})
 public abstract class AppDatabase extends RoomDatabase {
     public abstract MonsterDAO monsterDAO();
 }

Android/app/src/main/java/com/majinnaibu/monstercards/converters/UUIDConverter.java

@@ -0,0 +1,18 @@
+package com.majinnaibu.monstercards.converters;
+
+import androidx.room.TypeConverter;
+
+import java.util.UUID;
+
+public class UUIDConverter {
+
+    @TypeConverter
+    public static String fromUUID(UUID uuid) {
+        return uuid.toString();
+    }
+
+    @TypeConverter
+    public static UUID uuidFromString(String string) {
+        return UUID.fromString(string);
+    }
+}

Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterDAO.java

@@ -4,7 +4,6 @@ package com.majinnaibu.monstercards.data;
 import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
-import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
 import com.majinnaibu.monstercards.models.Monster;
@@ -16,24 +15,18 @@ import io.reactivex.rxjava3.core.Flowable;
 
 @Dao
 public interface MonsterDAO {
-    @Query("SELECT * FROM monsters")
+    @Query("SELECT * FROM monster")
     Flowable<List<Monster>> getAll();
 
-    @Query("SELECT * FROM monsters WHERE id IN (:monsterIds)")
+    @Query("SELECT * FROM monster WHERE id IN (:monsterIds)")
     Flowable<List<Monster>> loadAllByIds(String[] monsterIds);
 
-    @Query("SELECT * FROM monsters WHERE name LIKE :name LIMIT 1")
+    @Query("SELECT * FROM monster WHERE name LIKE :name LIMIT 1")
     Flowable<Monster> findByName(String name);
 
-    @Query("SELECT monsters.* FROM monsters JOIN monsters_fts ON monsters.oid = monsters_fts.docid WHERE monsters_fts MATCH :searchText")
-    Flowable<List<Monster>> search(String searchText);
-
     @Insert
     Completable insertAll(Monster... monsters);
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    Completable save(Monster... monsters);
-
     @Delete
     Completable delete(Monster monster);
 }

Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java

@@ -1,5 +1,11 @@
 package com.majinnaibu.monstercards.models;
 
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.PrimaryKey;
+
 import com.majinnaibu.monstercards.helpers.StringHelper;
 
 import java.util.ArrayList;
@@ -9,10 +15,21 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.UUID;
 
+@Entity
 public class Monster {
 
+    @PrimaryKey
+    @NonNull
+    public UUID id;
+
+    @NonNull
+    @ColumnInfo(defaultValue = "")
+    public String name;
+
     public Monster() {
+        name = "";
         mAbilities = new ArrayList<>();
         mActions = new ArrayList<>();
         mConditionImmunities = new HashSet<>();
@@ -22,16 +39,7 @@ public class Monster {
         mSkills = new HashSet<>();
     }
 
-    private String mName;
-
-    public String getName() {
-        return mName;
-    }
-
-    public void setName(String value) {
-        mName = value;
-    }
-
+    @Ignore()
     private String mSize;
 
     public String getSize() {
@@ -42,6 +50,7 @@ public class Monster {
         mSize = value;
     }
 
+    @Ignore()
     private String mType;
 
     public String getType() {
@@ -52,6 +61,7 @@ public class Monster {
         mType = value;
     }
 
+    @Ignore()
     private String mTag;
 
     public String getTag() {
@@ -62,6 +72,7 @@ public class Monster {
         mTag = value;
     }
 
+    @Ignore()
     private String mAlignment;
 
     public String getAlignment() {
@@ -139,6 +150,7 @@ public class Monster {
         return getAbilityModifierForScore(score);
     }
 
+    @Ignore()
     private int mStrengthScore;
 
     public int getStrengthScore() {
@@ -153,6 +165,7 @@ public class Monster {
         return getAbilityModifierForScore(getStrengthScore());
     }
 
+    @Ignore()
     private int mDexterityScore;
 
     public int getDexterityScore() {
@@ -167,6 +180,7 @@ public class Monster {
         return getAbilityModifierForScore(getDexterityScore());
     }
 
+    @Ignore()
     private int mConstitutionScore;
 
     public int getConstitutionScore() {
@@ -181,6 +195,7 @@ public class Monster {
         return getAbilityModifierForScore(getConstitutionScore());
     }
 
+    @Ignore()
     private int mIntelligenceScore;
 
     public int getIntelligenceScore() {
@@ -195,6 +210,7 @@ public class Monster {
         return getAbilityModifierForScore(getIntelligenceScore());
     }
 
+    @Ignore()
     private int mWisdomScore;
 
     public int getWisdomScore() {
@@ -209,6 +225,7 @@ public class Monster {
         return getAbilityModifierForScore(getWisdomScore());
     }
 
+    @Ignore()
     private int mCharismaScore;
 
     public int getCharismaScore() {
@@ -223,6 +240,7 @@ public class Monster {
         return getAbilityModifierForScore(getCharismaScore());
     }
 
+    @Ignore()
     private String mArmorName;
 
     public String getArmorName() {
@@ -233,6 +251,7 @@ public class Monster {
         mArmorName = value;
     }
 
+    @Ignore()
     private int mShieldBonus;
 
     public int getShieldBonus() {
@@ -243,6 +262,7 @@ public class Monster {
         mShieldBonus = value;
     }
 
+    @Ignore()
     private int mNaturalArmorBonus;
 
     public int getNaturalArmorBonus() {
@@ -253,6 +273,7 @@ public class Monster {
         mNaturalArmorBonus = value;
     }
 
+    @Ignore()
     private String mOtherArmorDescription;
 
     public String getOtherArmorDescription() {
@@ -334,6 +355,7 @@ public class Monster {
     private static final int SPLINT_ARMOR_CLASS = BASE_ARMOR_CLASS + 7;
     private static final int PLATE_ARMOR_CLASS = BASE_ARMOR_CLASS + 8;
 
+    @Ignore()
     private int mHitDice;
 
     public int getHitDice() {
@@ -344,6 +366,7 @@ public class Monster {
         mHitDice = value;
     }
 
+    @Ignore()
     private boolean mCustomHP;
 
     public boolean getCustomHP() {
@@ -354,6 +377,7 @@ public class Monster {
         mCustomHP = value;
     }
 
+    @Ignore()
     private String mHPText;
 
     public String getHPText() {
@@ -397,6 +421,7 @@ public class Monster {
         }
     }
 
+    @Ignore()
     private String mSpeed;
 
     public String getSpeed() {
@@ -407,6 +432,7 @@ public class Monster {
         mSpeed = value;
     }
 
+    @Ignore()
     private String mBurrowSpeed;
 
     public String getBurrowSpeed() {
@@ -417,6 +443,7 @@ public class Monster {
         mBurrowSpeed = value;
     }
 
+    @Ignore()
     private String mClimbSpeed;
 
     public String getClimbSpeed() {
@@ -427,6 +454,7 @@ public class Monster {
         mClimbSpeed = value;
     }
 
+    @Ignore()
     private String mFlySpeed;
 
     public String getFlySpeed() {
@@ -437,6 +465,7 @@ public class Monster {
         mFlySpeed = value;
     }
 
+    @Ignore()
     private boolean mHover;
 
     public boolean getHover() {
@@ -447,6 +476,7 @@ public class Monster {
         mHover = value;
     }
 
+    @Ignore()
     private String mSwimSpeed;
 
     public String getSwimSpeed() {
@@ -457,6 +487,7 @@ public class Monster {
         mSwimSpeed = value;
     }
 
+    @Ignore()
     private boolean mCustomSpeed;
 
     public boolean getCustomSpeed() {
@@ -467,6 +498,7 @@ public class Monster {
         mCustomSpeed = value;
     }
 
+    @Ignore()
     private String mSpeedDescription;
 
     public String getSpeedDescription() {
@@ -531,6 +563,7 @@ public class Monster {
         return String.format(Locale.US, "%d (%+d)", getCharismaScore(), getCharismaModifier());
     }
 
+    @Ignore()
     private HashSet<SavingThrow> mSavingThrows;
 
     public Set<SavingThrow> getSavingThrows() {
@@ -634,6 +667,7 @@ public class Monster {
         }
     }
 
+    @Ignore()
     private String mChallengeRating;
 
     public String getChallengeRating() {
@@ -645,6 +679,7 @@ public class Monster {
         // TODO: update proficiency bonus based on CR
     }
 
+    @Ignore()
     private String mCustomChallengeRating;
 
     public String getCustomChallengeRating() {
@@ -655,6 +690,7 @@ public class Monster {
         mCustomChallengeRating = challengeRating;
     }
 
+    @Ignore()
     private int mCustomProficiencyBonus;
 
     public int getCustomProficiencyBonus() {
@@ -665,6 +701,7 @@ public class Monster {
         mCustomProficiencyBonus = proficiencyBonus;
     }
 
+    @Ignore()
     private HashSet<Skill> mSkills;
 
     public Set<Skill> getSkills() {
@@ -700,6 +737,7 @@ public class Monster {
         return sb.toString();
     }
 
+    @Ignore()
     private HashSet<DamageType> mDamageTypes;
 
     public Set<DamageType> getDamageTypes() {
@@ -752,6 +790,7 @@ public class Monster {
         return StringHelper.oxfordJoin(", ", ", and ", " and ", vulnerabilities);
     }
 
+    @Ignore()
     private HashSet<String> mConditionImmunities;
 
     public Set<String> getConditionImmunities() {
@@ -778,6 +817,7 @@ public class Monster {
         return StringHelper.oxfordJoin(", ", ", and ", " and ", immunities);
     }
 
+    @Ignore()
     private String mBlindsight;
 
     public String getBlindsight() {
@@ -788,6 +828,7 @@ public class Monster {
         mBlindsight = value;
     }
 
+    @Ignore()
     private boolean mIsBlind;
 
     public boolean getIsBlind() {
@@ -798,6 +839,7 @@ public class Monster {
         mIsBlind = value;
     }
 
+    @Ignore()
     private String mDarkvision;
 
     public String getDarkvision() {
@@ -808,6 +850,7 @@ public class Monster {
         mDarkvision = value;
     }
 
+    @Ignore()
     private String mTremorsense;
 
     public String getTremorsense() {
@@ -818,6 +861,7 @@ public class Monster {
         mTremorsense = value;
     }
 
+    @Ignore()
     private String mTruesight;
 
     public String getTruesight() {
@@ -852,6 +896,7 @@ public class Monster {
         return StringHelper.join(", ", parts);
     }
 
+    @Ignore()
     private HashSet<Language> mLanguages;
 
     public Set<Language> getLanguages() {
@@ -870,6 +915,7 @@ public class Monster {
         mLanguages.clear();
     }
 
+    @Ignore()
     private int mTelepathy;
 
     public int getTelepathy() {
@@ -880,6 +926,7 @@ public class Monster {
         mTelepathy = value;
     }
 
+    @Ignore()
     private String mUnderstandsBut;
 
     public String getUnderstandsBut() {
@@ -1023,6 +1070,7 @@ public class Monster {
         }
     }
 
+    @Ignore()
     private ArrayList<Ability> mAbilities;
 
     public List<Ability> getAbilities() {
@@ -1095,6 +1143,7 @@ public class Monster {
         return actions;
     }
 
+    @Ignore()
     private ArrayList<Action> mActions;
 
     public List<Action> getActions() {

Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java

@@ -43,7 +43,7 @@ public class MonsterFragment extends Fragment {
         // TODO: remove this block make the monster ID a parameter to the view and get the monster from saved data (sqlite)
         Monster monster = new Monster();
         // Name
-        monster.setName("Pixie");
+        monster.name ="Pixie";
         // Meta
         monster.setSize("tiny");
         monster.setType("fey");

Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java

@@ -167,7 +167,7 @@ public class MonsterViewModel extends ViewModel {
         mIntelligence.setValue(monster.getIntelligenceDescription());
         mLanguages.setValue(mMonster.getLanguagesDescription());
         mMeta.setValue(mMonster.getMeta());
-        mName.setValue(mMonster.getName());
+        mName.setValue(mMonster.name);
         mSavingThrows.setValue(monster.getSavingThrowsDescription());
         mSenses.setValue(monster.getSensesDescription());
         mSkills.setValue(monster.getSkillsDescription());