maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds damage types to monster cards.

Browse Source 
Adds oxfordJoin to StringHelper.
This commit is contained in:
Tom Hicks
2020-09-01 22:50:04 -07:00
committed by Tom Hicks
parent 5396b7b014
commit 94edc44044
6 changed files with 217 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import androidx.lifecycle.ViewModelProvider;
import com.majinnaibu.monstercards.R;
import com.majinnaibu.monstercards.helpers.StringHelper;
import com.majinnaibu.monstercards.models.DamageType;
import com.majinnaibu.monstercards.models.Monster;
import com.majinnaibu.monstercards.models.SavingThrow;
import com.majinnaibu.monstercards.models.Skill;
@@ -70,6 +71,16 @@ public class MonsterFragment extends Fragment {
//Skills
monster.addSkill(new Skill("perception", "wis"));
monster.addSkill(new Skill("stealth", "dexterity"));
// Damage Types
monster.addDamageType(new DamageType("acid", " (Vulnerable)", "v"));
monster.addDamageType(new DamageType("bludgeoning", " (Vulnerable)", "v"));
monster.addDamageType(new DamageType("cold", " (Resistant)", "r"));
monster.addDamageType(new DamageType("fire", " (Resistant)", "r"));
monster.addDamageType(new DamageType("force", " (Immune)", "i"));
monster.addDamageType(new DamageType("lightning", " (Immune)", "i"));
monster.addDamageType(new DamageType("necrotic", " (Vulnerable)", "v"));
monster.addDamageType(new DamageType("piercing", " (Resistant)", "r"));
monster.addDamageType(new DamageType("poison", " (Immune)", "i"));
// Challenge Rating
monster.setChallengeRating("*");
@@ -194,6 +205,45 @@ public class MonsterFragment extends Fragment {
}
});
final TextView monsterDamageVulnerabilities = root.findViewById(R.id.damage_vulnerabilities);
monsterViewModel.getDamageVulnerabilities().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String damageType) {
if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageVulnerabilities.setVisibility(View.GONE);
} else {
monsterDamageVulnerabilities.setVisibility(View.VISIBLE);
}
monsterDamageVulnerabilities.setText(Html.fromHtml("<b>Damage Vulnerabilities</b> " + damageType));
}
});
final TextView monsterDamageResistances = root.findViewById(R.id.damage_resistances);
monsterViewModel.getDamageResistances().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String damageType) {
if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageResistances.setVisibility(View.GONE);
} else {
monsterDamageResistances.setVisibility(View.VISIBLE);
}
monsterDamageResistances.setText(Html.fromHtml("<b>Damage Resistances</b> " + damageType));
}
});
final TextView monsterDamageImmunities = root.findViewById(R.id.damage_immunities);
monsterViewModel.getDamageImmunities().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(String damageType) {
if (StringHelper.isNullOrEmpty(damageType)) {
monsterDamageImmunities.setVisibility(View.GONE);
} else {
monsterDamageImmunities.setVisibility(View.VISIBLE);
}
monsterDamageImmunities.setText(Html.fromHtml("<b>Damage Immunities</b> " + damageType));
}
});
return root;
}
}

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

@@ -36,6 +36,12 @@ public class MonsterViewModel extends ViewModel {
mSavingThrows.setValue("");
mSkills = new MutableLiveData<>();
mSkills.setValue("");
mDamageVulnerabilities = new MutableLiveData<>();
mDamageVulnerabilities.setValue("");
mDamageResistances = new MutableLiveData<>();
mDamageResistances.setValue("");
mDamageImmunities = new MutableLiveData<>();
mDamageImmunities.setValue("");
}
private MutableLiveData<String> mName;
@@ -90,6 +96,18 @@ public class MonsterViewModel extends ViewModel {
public LiveData<String> getSkills() {
return mSkills;
}
private MutableLiveData<String> mDamageVulnerabilities;
public LiveData<String> getDamageVulnerabilities() {
return mDamageVulnerabilities;
}
private MutableLiveData<String> mDamageResistances;
public LiveData<String> getDamageResistances() {
return mDamageResistances;
}
private MutableLiveData<String> mDamageImmunities;
public LiveData<String> getDamageImmunities() {
return mDamageImmunities;
}
private Monster mMonster;
public void setMonster(Monster monster) {
@@ -107,5 +125,9 @@ public class MonsterViewModel extends ViewModel {
mCharisma.setValue(monster.getCharismaDescription());
mSavingThrows.setValue(monster.getSavingThrowsDescription());
mSkills.setValue(monster.getSkillsDescription());
mDamageVulnerabilities.setValue(mMonster.getDamageVulnerabilitiesDescription());
mDamageResistances.setValue(mMonster.getDamageResistancesDescription());
mDamageImmunities.setValue(mMonster.getDamageImmunitiesDescription());
}
}