From 7408b9b139c25928d95d1dce22dafd12ce8af7ef Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Fri, 25 Jun 2021 10:54:10 -0700 Subject: [PATCH] Replaces manual view != null assertions with requireView. --- .../ui/editmonster/EditConditionImmunitiesFragment.java | 4 +--- .../ui/editmonster/EditDamageImmunitiesFragment.java | 4 +--- .../ui/editmonster/EditDamageResistancesFragment.java | 4 +--- .../ui/editmonster/EditDamageVulnerabilitiesFragment.java | 4 +--- .../monstercards/ui/editmonster/EditSensesFragment.java | 4 +--- .../monstercards/ui/editmonster/EditSkillsFragment.java | 4 +--- .../majinnaibu/monstercards/ui/library/LibraryFragment.java | 4 +--- .../monstercards/ui/monster/MonsterDetailFragment.java | 4 +--- 8 files changed, 8 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java index ac3e605..ef9b60a 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditConditionImmunitiesFragment.java @@ -35,9 +35,7 @@ public class EditConditionImmunitiesFragment extends Fragment { private void navigateToEditConditionImmunity(String condition) { NavDirections action = EditConditionImmunitiesFragmentDirections.actionEditConditionImmunitiesFragmentToEditConditionImmunity(condition); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + Navigation.findNavController(requireView()).navigate(action); } @Nullable diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesFragment.java index 58bf169..379aaf7 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageImmunitiesFragment.java @@ -32,9 +32,7 @@ public class EditDamageImmunitiesFragment extends MCFragment { private void navigateToEditDamageImmunity(String damageImmunity) { NavDirections action = EditDamageImmunitiesFragmentDirections.actionEditDamageImmunitiesFragmentToEditDamageImmunityFragment(damageImmunity); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + Navigation.findNavController(requireView()).navigate(action); } @Override diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesFragment.java index 56c2234..6fb3bf2 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageResistancesFragment.java @@ -32,9 +32,7 @@ public class EditDamageResistancesFragment extends MCFragment { private void navigateToEditDamageResistance(String damageResistance) { NavDirections action = EditDamageResistancesFragmentDirections.actionEditDamageResistancesFragmentToEditDamageResistanceFragment(damageResistance); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + Navigation.findNavController(requireView()).navigate(action); } @Override diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageVulnerabilitiesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageVulnerabilitiesFragment.java index 9ea643b..68f854c 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageVulnerabilitiesFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditDamageVulnerabilitiesFragment.java @@ -32,9 +32,7 @@ public class EditDamageVulnerabilitiesFragment extends MCFragment { private void navigateToEditDamageVulnerability(String damageVulnerability) { NavDirections action = EditDamageVulnerabilitiesFragmentDirections.actionEditDamageVulnerabilitiesFragmentToEditDamageVulnerabilityFragment(damageVulnerability); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + Navigation.findNavController(requireView()).navigate(action); } @Override diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSensesFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSensesFragment.java index 5c7482a..5b0d90a 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSensesFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSensesFragment.java @@ -32,9 +32,7 @@ public class EditSensesFragment extends MCFragment { private void navigateToEditSense(String sense) { NavDirections action = EditSensesFragmentDirections.actionEditSensesFragmentToEditSenseFragment(sense); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + Navigation.findNavController(requireView()).navigate(action); } @Override 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 608896f..579c357 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 @@ -33,9 +33,7 @@ public class EditSkillsFragment extends MCFragment { private void navigateToEditSkill(Skill skill) { NavDirections action = EditSkillsFragmentDirections.actionEditSkillsFragmentToEditSkillFragment(skill.name, skill.abilityScore, skill.proficiencyType, skill.advantageType); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + Navigation.findNavController(requireView()).navigate(action); } @Override diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java index b1881b6..ac0a8a9 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java @@ -116,8 +116,6 @@ public class LibraryFragment extends MCFragment { protected void navigateToMonsterDetail(UUID monsterId) { NavDirections action = LibraryFragmentDirections.actionNavigationLibraryToNavigationMonster(monsterId.toString()); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + 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 cf0031d..564db66 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 @@ -244,9 +244,7 @@ public class MonsterDetailFragment extends MCFragment { UUID monsterId = monsterDetailViewModel.getId().getValue(); if (monsterId != null) { NavDirections action = MonsterDetailFragmentDirections.actionNavigationMonsterToEditMonsterFragment(monsterId.toString()); - View view = getView(); - assert view != null; - Navigation.findNavController(view).navigate(action); + Navigation.findNavController(requireView()).navigate(action); } else { Logger.logWTF("monsterId cannot be null."); }