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

cleanup

Browse Source
This commit is contained in:
Tom Hicks
2021-08-30 10:49:41 -07:00
committed by Tom Hicks
parent 92ea5b6a0d
commit 3dc39ad6a4
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardRecyclerViewAdapter.java
View File

@@ -51,7 +51,6 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
@Override @Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) { public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
Logger.logUnimplementedMethod();
Monster monster = getItem(position); Monster monster = getItem(position);
holder.monster = monster; holder.monster = monster;
holder.name.setText(monster.name); holder.name.setText(monster.name);
@@ -242,7 +241,6 @@ public class DashboardRecyclerViewAdapter extends ListAdapter<Monster, Dashboard
@NonNull @NonNull
public static String getChallengeRatingAbbreviation(@NonNull ChallengeRating challengeRating) { public static String getChallengeRatingAbbreviation(@NonNull ChallengeRating challengeRating) {
Logger.logUnimplementedMethod();
switch (challengeRating) { switch (challengeRating) {
case CUSTOM: case CUSTOM:
return "*"; return "*";

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

@@ -27,8 +27,6 @@ import com.majinnaibu.monstercards.ui.shared.MCFragment;
import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback; import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback;
import com.majinnaibu.monstercards.utils.Logger; import com.majinnaibu.monstercards.utils.Logger;
import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
public class EditTraitsFragment extends MCFragment { public class EditTraitsFragment extends MCFragment {
@@ -37,9 +35,8 @@ public class EditTraitsFragment extends MCFragment {
private TraitType mTraitType; private TraitType mTraitType;
private EditTraitsRecyclerViewAdapter mAdapter; private EditTraitsRecyclerViewAdapter mAdapter;
@Override @Override
public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
if (getArguments() != null) { if (getArguments() != null) {
EditTraitsFragmentArgs args = EditTraitsFragmentArgs.fromBundle(getArguments()); EditTraitsFragmentArgs args = EditTraitsFragmentArgs.fromBundle(getArguments());
mTraitType = args.getTraitType(); mTraitType = args.getTraitType();
@@ -49,10 +46,8 @@ public class EditTraitsFragment extends MCFragment {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }
@Nullable
@org.jetbrains.annotations.Nullable
@Override @Override
public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment); NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation); NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class); mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
@@ -64,22 +59,23 @@ public class EditTraitsFragment extends MCFragment {
return root; return root;
} }
@NonNull
private String getTitleForTraitType(TraitType type) { private String getTitleForTraitType(TraitType type) {
switch (type) { switch (type) {
case ABILITY: case ABILITY:
return getString(R.string.title_edit_abilities); return getString(R.string.title_editAbilities);
case ACTION: case ACTION:
return getString(R.string.title_edit_actions); return getString(R.string.title_editActions);
case LAIR_ACTION: case LAIR_ACTION:
return getString(R.string.title_edit_lair_actions); return getString(R.string.title_editLairActions);
case LEGENDARY_ACTION: case LEGENDARY_ACTION:
return getString(R.string.title_edit_legendary_actions); return getString(R.string.title_editLegendaryActions);
case REACTIONS: case REACTIONS:
return getString(R.string.title_edit_reactions); return getString(R.string.title_editReactions);
case REGIONAL_ACTION: case REGIONAL_ACTION:
return getString(R.string.title_edit_regional_actions); return getString(R.string.title_editRegionalActions);
default: default:
return ""; return getString(R.string.title_editTraits);
} }
} }
@@ -116,7 +112,7 @@ public class EditTraitsFragment extends MCFragment {
}); });
} }
protected void navigateToEditTrait(Trait trait) { protected void navigateToEditTrait(@NonNull Trait trait) {
NavDirections action = EditTraitsFragmentDirections.actionEditTraitListFragmentToEditTraitFragment(trait.description, trait.name, mTraitType); NavDirections action = EditTraitsFragmentDirections.actionEditTraitListFragmentToEditTraitFragment(trait.description, trait.name, mTraitType);
Navigation.findNavController(requireView()).navigate(action); Navigation.findNavController(requireView()).navigate(action);
} }
@@ -125,7 +121,7 @@ public class EditTraitsFragment extends MCFragment {
RecyclerView list; RecyclerView list;
FloatingActionButton addTrait; FloatingActionButton addTrait;
ViewHolder(View root) { ViewHolder(@NonNull View root) {
list = root.findViewById(R.id.list); list = root.findViewById(R.id.list);
addTrait = root.findViewById(R.id.add_trait); addTrait = root.findViewById(R.id.add_trait);
} }