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

Fixes screen titles.

Browse Source
This commit is contained in:
Tom Hicks
2021-06-30 23:50:05 -07:00
parent 75cd32b0d8
commit 64216d3aba
18 changed files with 87 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java
View File

@@ -31,7 +31,6 @@ public class EditAbilityScoresFragment extends MCFragment {
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_ability_scores, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_ability_scores));
mViewModel.getStrength().observe(getViewLifecycleOwner(), value -> mHolder.strength.setValue(value));
mHolder.strength.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setStrength(newValue));

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java
View File

@@ -37,7 +37,6 @@ public class EditArmorFragment extends MCFragment {
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_armor, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_armor));
mHolder.armorType.setAdapter(new ArrayAdapter<ArmorType>(requireContext(), R.layout.dropdown_list_item, ArmorType.values()) {
@NonNull

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java
View File

@@ -34,7 +34,6 @@ public class EditBasicInfoFragment extends MCFragment {
NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_basic_info, container, false);
setTitle(getString(R.string.title_edit_basic_info));
mHolder = new ViewHolder(root);
mHolder.name.setText(mViewModel.getName().getValue());

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java
View File

@@ -35,7 +35,6 @@ public class EditChallengeRatingFragment extends MCFragment {
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_challenge_rating, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_challenge_rating));
mHolder.challengeRating.setAdapter(new ArrayAdapter<ChallengeRating>(requireContext(), R.layout.dropdown_list_item, ChallengeRating.values()) {
@NonNull

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java
View File

@@ -50,7 +50,6 @@ public class EditLanguageFragment extends MCFragment {
mEditMonsterViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_language, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_language));
mHolder.name.setText(mViewModel.getName().getValue());
mHolder.name.addTextChangedListener(new TextChangedListener((TextChangedListener.OnTextChangedCallback) (s, start, before, count) -> mViewModel.setName(s.toString())));

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java
View File

@@ -43,7 +43,6 @@ public class EditLanguagesFragment extends MCFragment {
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_languages_list, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_languages));
setupRecyclerView(mHolder.list);
setupAddLanguageButton(mHolder.addLanguage);

4
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java
View File

@@ -55,7 +55,7 @@ public class EditMonsterFragment extends MCFragment {
View root = inflater.inflate(R.layout.fragment_edit_monster, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_monster, getString(R.string.default_monster_name)));
setTitle(getString(R.string.title_editMonster_fmt, getString(R.string.default_monster_name)));
// TODO: Show a loading spinner until we have the monster loaded.
if (mViewModel.hasError() || !mViewModel.hasLoaded() || !Objects.equals(mViewModel.getMonsterId().getValue(), monsterId)) {
@@ -67,7 +67,7 @@ public class EditMonsterFragment extends MCFragment {
mViewModel.setHasLoaded(true);
mViewModel.setHasError(false);
mViewModel.copyFromMonster(monster);
setTitle(getString(R.string.title_edit_monster, monster.name));
setTitle(getString(R.string.title_editMonster_fmt, monster.name));
dispose();
}

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java
View File

@@ -27,7 +27,6 @@ public class EditSavingThrowsFragment extends MCFragment {
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_saving_throws, container, false);
mViewHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_saving_throws));
mViewHolder.strengthProficiency.setValue(mViewModel.getStrengthProficiency().getValue());
mViewHolder.strengthProficiency.setOnValueChangedListener(value -> mViewModel.setStrengthProficiency(value));

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java
View File

@@ -51,7 +51,6 @@ public class EditSkillFragment extends MCFragment {
mEditMonsterViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_skill, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_skill));
mHolder.abilityScore.setValue(mViewModel.getAbilityScore().getValue());
mHolder.abilityScore.setOnValueChangedListener(value -> mViewModel.setAbilityScore(value));

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java
View File

@@ -44,7 +44,6 @@ public class EditSkillsFragment extends MCFragment {
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_skills_list, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_skills));
setupRecyclerView(mHolder.list);
setupAddSkillButton(mHolder.addSkill);

1
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java
View File

@@ -29,7 +29,6 @@ public class EditSpeedFragment extends MCFragment {
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_speed, container, false);
mHolder = new ViewHolder(root);
setTitle(getString(R.string.title_edit_speed));
mHolder.baseSpeed.setOnValueChangeListener((newValue, oldValue) -> mViewModel.setWalkSpeed(newValue));
mHolder.baseSpeed.setOnFormatValueCallback(value -> String.format(getString(R.string.format_distance_in_feet), value));

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

@@ -72,17 +72,17 @@ public class EditStringFragment extends MCFragment {
private String getTitleForStringType(StringType type) {
switch (type) {
case CONDITION_IMMUNITY:
return getString(R.string.title_edit_condition_immunity);
return getString(R.string.title_editConditionImmunity);
case DAMAGE_IMMUNITY:
return getString(R.string.title_edit_damage_immunity);
return getString(R.string.title_editDamageImmunity);
case DAMAGE_RESISTANCE:
return getString(R.string.title_edit_damage_resistance);
return getString(R.string.title_editDamageResistance);
case DAMAGE_VULNERABILITY:
return getString(R.string.title_edit_damage_vulnerability);
return getString(R.string.title_editDamageVulnerability);
case SENSE:
return getString(R.string.title_edit_sense);
return getString(R.string.title_editSense);
default:
return "";
return getString(R.string.title_editString);
}
}

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

@@ -65,17 +65,17 @@ public class EditStringsFragment extends MCFragment {
private String getTitleForStringType(StringType type) {
switch (type) {
case CONDITION_IMMUNITY:
return getString(R.string.title_edit_condition_immunities);
return getString(R.string.title_editConditionImmunities);
case DAMAGE_IMMUNITY:
return getString(R.string.title_edit_damage_immunities);
return getString(R.string.title_editDamageImmunities);
case DAMAGE_RESISTANCE:
return getString(R.string.title_edit_damage_resistances);
return getString(R.string.title_editDamageResistances);
case DAMAGE_VULNERABILITY:
return getString(R.string.title_edit_damage_vulnerabilities);
return getString(R.string.title_editDamageVulnerabilities);
case SENSE:
return getString(R.string.title_edit_senses);
return getString(R.string.title_editSenses);
default:
return "";
return getString(R.string.title_editStrings);
}
}

14
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java
View File

@@ -82,19 +82,19 @@ public class EditTraitFragment extends MCFragment {
private String getTitleForTraitType(TraitType type) {
switch (type) {
case ABILITY:
return getString(R.string.title_edit_ability);
return getString(R.string.title_editAbility);
case ACTION:
return getString(R.string.title_edit_action);
return getString(R.string.title_editAction);
case LAIR_ACTION:
return getString(R.string.title_edit_lair_action);
return getString(R.string.title_editLairAction);
case LEGENDARY_ACTION:
return getString(R.string.title_edit_legendary_action);
return getString(R.string.title_editLegendaryAction);
case REACTIONS:
return getString(R.string.title_edit_reaction);
return getString(R.string.title_editReaction);
case REGIONAL_ACTION:
return getString(R.string.title_edit_regional_action);
return getString(R.string.title_editRegionalAction);
default:
return "";
return getString(R.string.title_editTrait);
}
}

14
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java
View File

@@ -67,19 +67,19 @@ public class EditTraitsFragment extends MCFragment {
private String getTitleForTraitType(TraitType type) {
switch (type) {
case ABILITY:
return getString(R.string.title_edit_abilities);
return getString(R.string.title_editAbilities);
case ACTION:
return getString(R.string.title_edit_actions);
return getString(R.string.title_editActions);
case LAIR_ACTION:
return getString(R.string.title_edit_lair_actions);
return getString(R.string.title_editLairActions);
case LEGENDARY_ACTION:
return getString(R.string.title_edit_legendary_actions);
return getString(R.string.title_editLegendaryActions);
case REACTIONS:
return getString(R.string.title_edit_reactions);
return getString(R.string.title_editReactions);
case REGIONAL_ACTION:
return getString(R.string.title_edit_regional_actions);
return getString(R.string.title_editRegionalActions);
default:
return "";
return getString(R.string.title_editTraits);
}
}

5
app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java
View File

@@ -66,7 +66,10 @@ public class MonsterDetailFragment extends MCFragment {
View root = inflater.inflate(R.layout.fragment_monster, container, false);
mHolder = new ViewHolder(root);
mViewModel.getName().observe(getViewLifecycleOwner(), mHolder.name::setText);
mViewModel.getName().observe(getViewLifecycleOwner(), name -> {
mHolder.name.setText(name);
setTitle(getString(R.string.title_monsterDetails_fmt, name));
});
mViewModel.getMeta().observe(getViewLifecycleOwner(), mHolder.meta::setText);
mViewModel.getArmorClass().observe(getViewLifecycleOwner(), armorText -> setupLabeledTextView(mHolder.armorClass, armorText, R.string.label_armor_class));
mViewModel.getHitPoints().observe(getViewLifecycleOwner(), hitPoints -> setupLabeledTextView(mHolder.hitPoints, hitPoints, R.string.label_hit_points));

34
app/src/main/res/navigation/mobile_navigation.xml
View File

@@ -14,7 +14,6 @@
android:id="@+id/action_navigation_search_to_navigation_monster"
app:destination="@id/navigation_monster" />
</fragment>
<fragment
android:id="@+id/navigation_dashboard"
android:name="com.majinnaibu.monstercards.ui.dashboard.DashboardFragment"
@@ -24,7 +23,6 @@
android:id="@+id/action_navigation_dashboard_to_navigation_monster"
app:destination="@id/navigation_monster" />
</fragment>
<fragment
android:id="@+id/navigation_collections"
android:name="com.majinnaibu.monstercards.ui.collections.CollectionsFragment"
@@ -34,7 +32,6 @@
android:id="@+id/action_navigation_collections_to_navigation_monster"
app:destination="@id/navigation_monster" />
</fragment>
<fragment
android:id="@+id/navigation_library"
android:name="com.majinnaibu.monstercards.ui.library.LibraryFragment"
@@ -44,11 +41,10 @@
android:id="@+id/action_navigation_library_to_navigation_monster"
app:destination="@id/navigation_monster" />
</fragment>
<fragment
android:id="@+id/navigation_monster"
android:name="com.majinnaibu.monstercards.ui.monster.MonsterDetailFragment"
android:label="Monster"
android:label="@string/title_monsterDetails"
tools:layout="@layout/fragment_monster">
<argument
android:name="monster_id"
@@ -67,7 +63,7 @@
<fragment
android:id="@+id/editMonsterFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditMonsterFragment"
android:label="Edit Monster"
android:label="@string/title_editMonster"
tools:layout="@layout/fragment_edit_monster">
<argument
android:name="monster_id"
@@ -106,36 +102,36 @@
<fragment
android:id="@+id/editBasicInfoFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditBasicInfoFragment"
android:label="fragment_edit_basic_info"
android:label="@string/title_editBasicInfo"
tools:layout="@layout/fragment_edit_basic_info" />
<fragment
android:id="@+id/editArmorFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditArmorFragment"
android:label="fragment_edit_armor"
android:label="@string/title_editArmor"
tools:layout="@layout/fragment_edit_armor" />
<fragment
android:id="@+id/editSpeedFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditSpeedFragment"
android:label="fragment_edit_speed"
android:label="@string/title_editSpeed"
tools:layout="@layout/fragment_edit_speed" />
<fragment
android:id="@+id/editAbilityScoresFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditAbilityScoresFragment"
android:label="EditAbilityScoresFragment" />
android:label="@string/title_editAbilityScores" />
<fragment
android:id="@+id/editSavingThrowsFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditSavingThrowsFragment"
android:label="fragment_edit_saving_throws"
android:label="@string/title_editSavingThrows"
tools:layout="@layout/fragment_edit_saving_throws" />
<fragment
android:id="@+id/editChallengeRatingFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditChallengeRatingFragment"
android:label="fragment_edit_challenge_rating"
android:label="@string/title_editChallengeRating"
tools:layout="@layout/fragment_edit_challenge_rating" />
<fragment
android:id="@+id/editSkillsFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditSkillsFragment"
android:label="fragment_edit_skills_list"
android:label="@string/title_editSkills"
tools:layout="@layout/fragment_edit_skills_list">
<action
android:id="@+id/action_editSkillsFragment_to_editSkillFragment"
@@ -144,7 +140,7 @@
<fragment
android:id="@+id/editSkillFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditSkillFragment"
android:label="fragment_edit_skill"
android:label="@string/title_editSkill"
tools:layout="@layout/fragment_edit_skill">
<argument
android:name="name"
@@ -162,7 +158,7 @@
<fragment
android:id="@+id/editLanguagesFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditLanguagesFragment"
android:label="fragment_edit_languages_list"
android:label="@string/title_editLanguages"
tools:layout="@layout/fragment_edit_languages_list">
<action
android:id="@+id/action_editLanguagesFragment_to_editLanguageFragment"
@@ -171,7 +167,7 @@
<fragment
android:id="@+id/editLanguageFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditLanguageFragment"
android:label="fragment_edit_language"
android:label="@string/title_editLanguage"
tools:layout="@layout/fragment_edit_language">
<argument
android:name="name"
@@ -183,7 +179,7 @@
<fragment
android:id="@+id/editTraitFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditTraitFragment"
android:label="EditTraitFragment">
android:label="@string/title_editTrait">
<argument
android:name="description"
app:argType="string" />
@@ -197,7 +193,7 @@
<fragment
android:id="@+id/editTraitListFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditTraitsFragment"
android:label="EditTraitListFragment">
android:label="@string/title_editTraits">
<action
android:id="@+id/action_editTraitListFragment_to_editTraitFragment"
app:destination="@id/editTraitFragment" />
@@ -219,7 +215,7 @@
<fragment
android:id="@+id/editStringFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditStringFragment"
android:label="EditStringFragment">
android:label="@string/title_editString">
<argument
android:name="stringType"
app:argType="com.majinnaibu.monstercards.data.enums.StringType" />

73
app/src/main/res/values/strings.xml
View File

@@ -88,41 +88,48 @@
<string name="strength_abbreviation">STR</string>
<string name="title_collections">Collections</string>
<string name="title_dashboard">Dashboard</string>
<string name="title_edit_abilities">Ability</string>
<string name="title_edit_ability">Abilities</string>
<string name="title_edit_ability_scores">Ability Scores</string>
<string name="title_edit_action">Action</string>
<string name="title_edit_actions">Actions</string>
<string name="title_edit_armor">Armor</string>
<string name="title_edit_basic_info">Basic Info</string>
<string name="title_edit_challenge_rating">Challenge Rating</string>
<string name="title_edit_condition_immunities">Condition Immunities</string>
<string name="title_edit_condition_immunity">Condition Immunity</string>
<string name="title_edit_damage_immunities">Damage Immunities</string>
<string name="title_edit_damage_immunity">Damage Immunity</string>
<string name="title_edit_damage_resistance">Damage Resistance</string>
<string name="title_edit_damage_resistances">Damage Resistances</string>
<string name="title_edit_damage_vulnerabilities">Damage Vulnerabilities</string>
<string name="title_edit_damage_vulnerability">Damage Vulnerability</string>
<string name="title_edit_lair_action">Lair Action</string>
<string name="title_edit_lair_actions">Lair Actions</string>
<string name="title_edit_language">Language</string>
<string name="title_edit_languages">Languages</string>
<string name="title_edit_legendary_action">Legendary Action</string>
<string name="title_edit_legendary_actions">Legendary Actions</string>
<string name="title_edit_monster">Edit %1$s</string>
<string name="title_edit_reaction">Reaction</string>
<string name="title_edit_reactions">Reactions</string>
<string name="title_edit_regional_action">Regional Action</string>
<string name="title_edit_regional_actions">Regional Actions</string>
<string name="title_edit_speed">Speed</string>
<string name="title_edit_saving_throws">Saving Throws</string>
<string name="title_edit_sense">Senses</string>
<string name="title_edit_senses">Senses</string>
<string name="title_edit_skill">Skill</string>
<string name="title_edit_skills">Skills</string>
<string name="title_editAbilities">Ability</string>
<string name="title_editAbility">Abilities</string>
<string name="title_editAbilityScores">Ability Scores</string>
<string name="title_editAction">Action</string>
<string name="title_editActions">Actions</string>
<string name="title_editArmor">Armor</string>
<string name="title_editBasicInfo">Basic Info</string>
<string name="title_editChallengeRating">Challenge Rating</string>
<string name="title_editConditionImmunities">Condition Immunities</string>
<string name="title_editConditionImmunity">Condition Immunity</string>
<string name="title_editDamageImmunities">Damage Immunities</string>
<string name="title_editDamageImmunity">Damage Immunity</string>
<string name="title_editDamageResistance">Damage Resistance</string>
<string name="title_editDamageResistances">Damage Resistances</string>
<string name="title_editDamageVulnerabilities">Damage Vulnerabilities</string>
<string name="title_editDamageVulnerability">Damage Vulnerability</string>
<string name="title_editLairAction">Lair Action</string>
<string name="title_editLairActions">Lair Actions</string>
<string name="title_editLanguage">Language</string>
<string name="title_editLanguages">Languages</string>
<string name="title_editLegendaryAction">Legendary Action</string>
<string name="title_editLegendaryActions">Legendary Actions</string>
<string name="title_editMonster">Edit Monster</string>
<string name="title_editMonster_fmt">Edit %1$s</string>
<string name="title_editReaction">Reaction</string>
<string name="title_editReactions">Reactions</string>
<string name="title_editRegionalAction">Regional Action</string>
<string name="title_editRegionalActions">Regional Actions</string>
<string name="title_editSpeed">Speed</string>
<string name="title_editSavingThrows">Saving Throws</string>
<string name="title_editSense">Senses</string>
<string name="title_editSenses">Senses</string>
<string name="title_editSkill">Skill</string>
<string name="title_editSkills">Skills</string>
<string name="title_editString">String</string>
<string name="title_editStrings">Strings</string>
<string name="title_editTrait">Trait</string>
<string name="title_editTraits">Traits</string>
<string name="title_importMonster">Import Monster</string>
<string name="title_library">Library</string>
<string name="title_monsterDetails">Monster Details</string>
<string name="title_monsterDetails_fmt">%1$s Details</string>
<string name="title_search">Search</string>
<string name="wisdom_abbreviation">WIS</string>
</resources>