diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java index 5353206..4812d47 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Objects; import java.util.UUID; -@SuppressWarnings({"ConstantConditions", "unused"}) +@SuppressWarnings({"ConstantConditions"}) public class EditMonsterViewModel extends ChangeTrackedViewModel { private final ChangeTrackedLiveData mMonsterId; private final MutableLiveData mHasError; @@ -247,10 +247,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { return mMonsterId; } - public LiveData getErrorMessage() { - return mErrorMessage; - } - public void setErrorMessage(@NonNull String errorMessage) { mErrorMessage.setValue(errorMessage); } @@ -319,48 +315,22 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mCustomHitPoints.setValue(customHitPoints); } - public LiveData getHitDice() { - return mHitDice; - } - public void setHitDice(int hitDice) { mHitDice.setValue(hitDice); } - public void setHitDice(String hitDice) { - Integer parsedHitDice = StringHelper.parseInt(hitDice); - this.setHitDice(parsedHitDice != null ? parsedHitDice : 0); - } - public int getHitDiceUnboxed() { return Helpers.unboxInteger(mHitDice.getValue(), 1); } - public String getHitDiceValueAsString() { - return mHitDice.getValue().toString(); - } - - public LiveData getNaturalArmorBonus() { - return mNaturalArmorBonus; - } - public void setNaturalArmorBonus(int naturalArmorBonus) { mNaturalArmorBonus.setValue(naturalArmorBonus); } - public void setNaturalArmorBonus(String naturalArmorBonus) { - Integer parsedValue = StringHelper.parseInt(naturalArmorBonus); - this.setNaturalArmorBonus(parsedValue != null ? parsedValue : 0); - } - public int getNaturalArmorBonusUnboxed() { return Helpers.unboxInteger(mNaturalArmorBonus.getValue(), 0); } - public String getNaturalArmorBonusValueAsString() { - return mNaturalArmorBonus.getValue().toString(); - } - public LiveData getHasCustomHitPoints() { return mHasCustomHitPoints; } @@ -381,10 +351,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mArmorType.setValue(armorType); } - public LiveData getHasShield() { - return mHasShield; - } - public void setHasShield(boolean hasShield) { mHasShield.setValue(hasShield); } @@ -393,19 +359,10 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { return mHasShield.getValue(); } - public LiveData getShieldBonus() { - return mShieldBonus; - } - public void setShieldBonus(int shieldBonus) { mShieldBonus.setValue(shieldBonus); } - public void setShieldBonus(String shieldBonus) { - Integer parsedValue = StringHelper.parseInt(shieldBonus); - this.setShieldBonus(parsedValue != null ? parsedValue : 0); - } - public int getShieldBonusUnboxed() { return Helpers.unboxInteger(mShieldBonus.getValue(), 0); } @@ -430,14 +387,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mWalkSpeed.setValue(walkSpeed); } - public void incrementWalkSpeed() { - setWalkSpeed(mWalkSpeed.getValue() + 5); - } - - public void decrementWalkSpeed() { - setWalkSpeed(mWalkSpeed.getValue() - 5); - } - public LiveData getBurrowSpeed() { return mBurrowSpeed; } @@ -494,38 +443,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mCustomSpeed.setValue(customSpeed); } - public void incrementBurrowSpeed() { - setBurrowSpeed(mBurrowSpeed.getValue() + 5); - } - - public void decrementBurrowSpeed() { - setBurrowSpeed(mBurrowSpeed.getValue() - 5); - } - - public void incrementClimbSpeed() { - setClimbSpeed(mClimbSpeed.getValue() + 5); - } - - public void decrementClimbSpeed() { - setClimbSpeed(mClimbSpeed.getValue() - 5); - } - - public void incrementFlySpeed() { - setFlySpeed(mFlySpeed.getValue() + 5); - } - - public void decrementFlySpeed() { - setFlySpeed(mFlySpeed.getValue() - 5); - } - - public void incrementSwimSpeed() { - setSwimSpeed(mSwimSpeed.getValue() + 5); - } - - public void decrementSwimSpeed() { - setSwimSpeed(mSwimSpeed.getValue() - 5); - } - public LiveData getStrength() { return mStrength; } @@ -534,14 +451,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mStrength.setValue(strength); } - public void incrementStrength() { - setStrength(mStrength.getValue() + 1); - } - - public void decrementStrength() { - setStrength(mStrength.getValue() - 1); - } - public LiveData getDexterity() { return mDexterity; } @@ -550,14 +459,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mDexterity.setValue(dexterity); } - public void incrementDexterity() { - setDexterity(mDexterity.getValue() + 1); - } - - public void decrementDexterity() { - setDexterity(mDexterity.getValue() - 1); - } - public LiveData getConstitution() { return mConstitution; } @@ -566,14 +467,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mConstitution.setValue(constitution); } - public void incrementConstitution() { - setConstitution(mConstitution.getValue() + 1); - } - - public void decrementConstitution() { - setConstitution(mConstitution.getValue() - 1); - } - public LiveData getIntelligence() { return mIntelligence; } @@ -582,14 +475,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mIntelligence.setValue(intelligence); } - public void incrementIntelligence() { - setIntelligence(mIntelligence.getValue() + 1); - } - - public void decrementIntelligence() { - setIntelligence(mIntelligence.getValue() - 1); - } - public LiveData getWisdom() { return mWisdom; } @@ -598,14 +483,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mWisdom.setValue(wisdom); } - public void incrementWisdom() { - setWisdom(mWisdom.getValue() + 1); - } - - public void decrementWisdom() { - setWisdom(mWisdom.getValue() - 1); - } - public LiveData getCharisma() { return mCharisma; } @@ -614,14 +491,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { mCharisma.setValue(charisma); } - public void incrementCharisma() { - setCharisma(mCharisma.getValue() + 1); - } - - public void decrementCharisma() { - setCharisma(mCharisma.getValue() - 1); - } - public LiveData getStrengthProficiency() { return mStrengthProficiency; } @@ -821,22 +690,6 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { return mSenses; } - public List getSensesArray() { - return mSenses.getValue(); - } - - public String addNewSense() { - return Helpers.addItemToList(mSenses, "", String::compareToIgnoreCase); - } - - public void removeSense(int position) { - Helpers.removeFromList(mSenses, position); - } - - public void replaceSense(String oldSense, String newSense) { - Helpers.replaceItemInList(mSenses, oldSense, newSense, String::compareToIgnoreCase); - } - public LiveData> getDamageImmunities() { return mDamageImmunities; } @@ -845,78 +698,10 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel { return mDamageImmunities.getValue(); } - public String addNewDamageImmunity() { - return Helpers.addStringToList("", mDamageImmunities); - } - - public void removeDamageImmunity(int position) { - Helpers.removeFromList(mDamageImmunities, position); - } - - public void replaceDamageImmunity(String oldDamageType, String newDamageType) { - Helpers.replaceItemInList(mDamageImmunities, oldDamageType, newDamageType, String::compareToIgnoreCase); - } - public LiveData> getDamageResistances() { return mDamageResistances; } - public List getDamageResistancesArray() { - return mDamageResistances.getValue(); - } - - public String addNewDamageResistance() { - return Helpers.addStringToList("", mDamageResistances); - } - - public void removeDamageResistance(int position) { - Helpers.removeFromList(mDamageResistances, position); - } - - public void replaceDamageResistance(String oldDamageType, String newDamageType) { - Helpers.replaceItemInList(mDamageResistances, oldDamageType, newDamageType, String::compareToIgnoreCase); - } - - public LiveData> getDamageVulnerabilities() { - return mDamageVulnerabilities; - } - - public List getDamageVulnerabilitiesArray() { - return mDamageVulnerabilities.getValue(); - } - - public String addNewDamageVulnerability() { - return Helpers.addStringToList("", mDamageVulnerabilities); - } - - public void removeDamageVulnerability(int position) { - Helpers.removeFromList(mDamageVulnerabilities, position); - } - - public void replaceDamageVulnerability(String oldDamageType, String newDamageType) { - Helpers.replaceItemInList(mDamageVulnerabilities, oldDamageType, newDamageType, String::compareToIgnoreCase); - } - - public LiveData> getConditionImmunities() { - return mConditionImmunities; - } - - public List getConditionImmunitiesArray() { - return mConditionImmunities.getValue(); - } - - public String addNewConditionImmunity() { - return Helpers.addStringToList("", mConditionImmunities); - } - - public void removeConditionImmunity(int position) { - Helpers.removeFromList(mConditionImmunities, position); - } - - public void replaceConditionImmunity(String oldDamageType, String newDamageType) { - Helpers.replaceItemInList(mConditionImmunities, oldDamageType, newDamageType, String::compareToIgnoreCase); - } - public LiveData> getLanguages() { return mLanguages; }