diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java index 9ed54e4..da53ba2 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityScoresFragment.java @@ -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)); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java index ec94c9e..6abfe4e 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditArmorFragment.java @@ -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(requireContext(), R.layout.dropdown_list_item, ArmorType.values()) { @NonNull diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java index 17a9657..b2aae02 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditBasicInfoFragment.java @@ -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()); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java index f37f630..23c1365 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditChallengeRatingFragment.java @@ -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(requireContext(), R.layout.dropdown_list_item, ChallengeRating.values()) { @NonNull diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java index 369b18c..35f258c 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java @@ -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()))); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java index 8714a9f..fbc802a 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java @@ -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); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java index 4d7a2ec..c8743b4 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java @@ -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(); } diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java index 1138696..7e66172 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSavingThrowsFragment.java @@ -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)); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java index 8d086c3..9c5ba50 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillFragment.java @@ -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)); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java index f14389d..af49bae 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java @@ -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); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java index cc94e84..504f132 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSpeedFragment.java @@ -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)); diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java index a3385ad..af63b73 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringFragment.java @@ -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); } } diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java index 18966aa..4084bcc 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditStringsFragment.java @@ -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); } } diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java index 1c69d04..f22aa1f 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitFragment.java @@ -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); } } diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java index 4b09d00..293476a 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java @@ -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); } } diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java index 52a254c..9968ce0 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterDetailFragment.java @@ -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)); diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 71cb792..0f7b0d2 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -14,7 +14,6 @@ android:id="@+id/action_navigation_search_to_navigation_monster" app:destination="@id/navigation_monster" /> - - - - + android:label="@string/title_editAbilityScores" /> + android:label="@string/title_editTrait"> @@ -197,7 +193,7 @@ + android:label="@string/title_editTraits"> @@ -219,7 +215,7 @@ + android:label="@string/title_editString"> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dc5d036..87bf8cb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,41 +88,48 @@ STR Collections Dashboard - Ability - Abilities - Ability Scores - Action - Actions - Armor - Basic Info - Challenge Rating - Condition Immunities - Condition Immunity - Damage Immunities - Damage Immunity - Damage Resistance - Damage Resistances - Damage Vulnerabilities - Damage Vulnerability - Lair Action - Lair Actions - Language - Languages - Legendary Action - Legendary Actions - Edit %1$s - Reaction - Reactions - Regional Action - Regional Actions - Speed - Saving Throws - Senses - Senses - Skill - Skills + Ability + Abilities + Ability Scores + Action + Actions + Armor + Basic Info + Challenge Rating + Condition Immunities + Condition Immunity + Damage Immunities + Damage Immunity + Damage Resistance + Damage Resistances + Damage Vulnerabilities + Damage Vulnerability + Lair Action + Lair Actions + Language + Languages + Legendary Action + Legendary Actions + Edit Monster + Edit %1$s + Reaction + Reactions + Regional Action + Regional Actions + Speed + Saving Throws + Senses + Senses + Skill + Skills + String + Strings + Trait + Traits Import Monster Library + Monster Details + %1$s Details Search WIS