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

Keeps skills on the edit skills screen sorted.

Browse Source
This commit is contained in:
Tom Hicks
2021-06-12 22:14:31 -07:00
parent 363bad5931
commit 186c1a80bd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java
View File

@@ -18,6 +18,7 @@ import com.majinnaibu.monstercards.models.Trait;
import com.majinnaibu.monstercards.utils.ChangeTrackedLiveData; import com.majinnaibu.monstercards.utils.ChangeTrackedLiveData;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -215,14 +216,13 @@ public class EditMonsterViewModel extends ViewModel {
mTelepathyRange.resetValue(monster.telepathyRange); mTelepathyRange.resetValue(monster.telepathyRange);
mUnderstandsButDescription.resetValue(monster.understandsButDescription); mUnderstandsButDescription.resetValue(monster.understandsButDescription);
if (monster.skills.size() == 0) { ArrayList<Skill> skills = new ArrayList<>(monster.skills);
ArrayList<Skill> skills = new ArrayList<>(); if (skills.size() == 0) {
skills.add(new Skill("Acrobatics", AbilityScore.STRENGTH)); skills.add(new Skill("Acrobatics", AbilityScore.STRENGTH));
skills.add(new Skill("Stealth", AbilityScore.DEXTERITY)); skills.add(new Skill("Stealth", AbilityScore.DEXTERITY));
mSkills.resetValue(skills);
} else {
mSkills.resetValue(new ArrayList<>(monster.skills));
} }
Collections.sort(skills, (skill1, skill2) -> skill1.name.compareToIgnoreCase(skill2.name));
mSkills.resetValue(skills);
mDamageImmunities.resetValue(monster.damageImmunities); mDamageImmunities.resetValue(monster.damageImmunities);
mDamageResistances.resetValue(monster.damageResistances); mDamageResistances.resetValue(monster.damageResistances);
mDamageVulnerabilities.resetValue(monster.damageVulnerabilities); mDamageVulnerabilities.resetValue(monster.damageVulnerabilities);
@@ -901,6 +901,8 @@ public class EditMonsterViewModel extends ViewModel {
Skill newSkill = new Skill("Unnamed Skill", AbilityScore.DEXTERITY); Skill newSkill = new Skill("Unnamed Skill", AbilityScore.DEXTERITY);
ArrayList<Skill> newSkills = new ArrayList<>(mSkills.getValue()); ArrayList<Skill> newSkills = new ArrayList<>(mSkills.getValue());
newSkills.add(newSkill); newSkills.add(newSkill);
Collections.sort(newSkills, (skill1, skill2) -> skill1.name.compareToIgnoreCase(skill2.name));
mSkills.setValue(newSkills);
mSkills.setValue(newSkills); mSkills.setValue(newSkills);
} }
} }