From faaea0ea7efafe7f4247c0f0687d1ef7615bb889 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Fri, 25 Jun 2021 20:33:33 -0700 Subject: [PATCH] Renames EditTraitListFragment to EditTraitsFragment to match the other list fragments. --- ...{EditTraitListFragment.java => EditTraitsFragment.java} | 7 +++---- .../monstercards/ui/monster/MonsterDetailFragment.java | 2 ++ app/src/main/res/layout/fragment_edit_traits_list.xml | 2 +- app/src/main/res/navigation/mobile_navigation.xml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) rename app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/{EditTraitListFragment.java => EditTraitsFragment.java} (92%) diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitListFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java similarity index 92% rename from app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitListFragment.java rename to app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java index 299d89c..71803d9 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitListFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitsFragment.java @@ -31,8 +31,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -// TODO: rename to EditTraitsFragment -public class EditTraitListFragment extends MCFragment { +public class EditTraitsFragment extends MCFragment { private EditMonsterViewModel mViewModel; private ViewHolder mHolder; private TraitType mTraitType; @@ -41,7 +40,7 @@ public class EditTraitListFragment extends MCFragment { @Override public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { if (getArguments() != null) { - EditTraitListFragmentArgs args = EditTraitListFragmentArgs.fromBundle(getArguments()); + EditTraitsFragmentArgs args = EditTraitsFragmentArgs.fromBundle(getArguments()); mTraitType = args.getTraitType(); } else { Logger.logWTF("EditTraitFragment needs arguments"); @@ -98,7 +97,7 @@ public class EditTraitListFragment extends MCFragment { } protected void navigateToEditTrait(Trait trait) { - NavDirections action = EditTraitListFragmentDirections.actionEditTraitListFragmentToEditTraitFragment(trait.description, trait.name, mTraitType); + NavDirections action = EditTraitsFragmentDirections.actionEditTraitListFragmentToEditTraitFragment(trait.description, trait.name, mTraitType); Navigation.findNavController(requireView()).navigate(action); } 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 564db66..c9288fb 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 @@ -229,6 +229,8 @@ public class MonsterDetailFragment extends MCFragment { } }); + // TODO: add lair actions, legendary actions, reactions, and regional actions + return root; } diff --git a/app/src/main/res/layout/fragment_edit_traits_list.xml b/app/src/main/res/layout/fragment_edit_traits_list.xml index fde537b..a4b9f4b 100644 --- a/app/src/main/res/layout/fragment_edit_traits_list.xml +++ b/app/src/main/res/layout/fragment_edit_traits_list.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.editmonster.EditTraitListFragment"> + tools:context=".ui.editmonster.EditTraitsFragment">