From 98f46694fce2979c8d542860069d88d0f59e81e5 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Thu, 10 Jun 2021 22:50:27 -0700 Subject: [PATCH] Adds edit skills view. --- .../ui/editmonster/EditMonsterFragment.java | 5 ++ .../ui/editmonster/EditMonsterViewModel.java | 27 +++++++-- .../ui/editmonster/EditSkillsFragment.java | 45 +++++++++++++++ .../EditSkillsRecyclerViewAdapter.java | 56 +++++++++++++++++++ .../res/layout/fragment_edit_skills_list.xml | 13 +++++ .../layout/fragment_edit_skills_list_item.xml | 7 +++ .../main/res/navigation/mobile_navigation.xml | 8 +++ 7 files changed, 157 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java create mode 100644 app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java create mode 100644 app/src/main/res/layout/fragment_edit_skills_list.xml create mode 100644 app/src/main/res/layout/fragment_edit_skills_list_item.xml 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 a7975bd..e461b0b 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 @@ -111,6 +111,11 @@ public class EditMonsterFragment extends MCFragment { Navigation.findNavController(requireView()).navigate(action); }); + mHolder.skills.setOnClickListener(v -> { + NavDirections action = EditMonsterFragmentDirections.actionEditMonsterFragmentToEditSkillsFragment(); + Navigation.findNavController(requireView()).navigate(action); + }); + requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) { @Override public void handleOnBackPressed() { diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java index 5c0c022..60e1a6b 100644 --- a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java @@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import com.majinnaibu.monstercards.data.enums.AbilityScore; import com.majinnaibu.monstercards.data.enums.AdvantageType; import com.majinnaibu.monstercards.data.enums.ArmorType; import com.majinnaibu.monstercards.data.enums.ChallengeRating; @@ -16,7 +17,9 @@ import com.majinnaibu.monstercards.models.Skill; import com.majinnaibu.monstercards.models.Trait; import com.majinnaibu.monstercards.utils.ChangeTrackedLiveData; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.UUID; @@ -76,7 +79,7 @@ public class EditMonsterViewModel extends ViewModel { private final ChangeTrackedLiveData mTruesightRange; private final ChangeTrackedLiveData mTelepathyRange; private final ChangeTrackedLiveData mUnderstandsButDescription; - private final ChangeTrackedLiveData> mSkills; + private final ChangeTrackedLiveData> mSkills; private final ChangeTrackedLiveData> mDamageImmunities; private final ChangeTrackedLiveData> mDamageResistances; private final ChangeTrackedLiveData> mDamageVulnerabilities; @@ -146,7 +149,7 @@ public class EditMonsterViewModel extends ViewModel { mTruesightRange = new ChangeTrackedLiveData<>(0, onDirtied); mTelepathyRange = new ChangeTrackedLiveData<>(0, onDirtied); mUnderstandsButDescription = new ChangeTrackedLiveData<>("", onDirtied); - mSkills = new ChangeTrackedLiveData<>(new HashSet<>(), onDirtied); + mSkills = new ChangeTrackedLiveData<>(new ArrayList<>(), onDirtied); mDamageImmunities = new ChangeTrackedLiveData<>(new HashSet<>(), onDirtied); mDamageResistances = new ChangeTrackedLiveData<>(new HashSet<>(), onDirtied); mDamageVulnerabilities = new ChangeTrackedLiveData<>(new HashSet<>(), onDirtied); @@ -211,7 +214,15 @@ public class EditMonsterViewModel extends ViewModel { mTruesightRange.resetValue(monster.truesightRange); mTelepathyRange.resetValue(monster.telepathyRange); mUnderstandsButDescription.resetValue(monster.understandsButDescription); - mSkills.resetValue(monster.skills); + + if (monster.skills.size() == 0) { + ArrayList skills = new ArrayList<>(); + skills.add(new Skill("Acrobatics", AbilityScore.STRENGTH)); + skills.add(new Skill("Stealth", AbilityScore.DEXTERITY)); + mSkills.resetValue(skills); + } else { + mSkills.resetValue(new ArrayList<>(monster.skills)); + } mDamageImmunities.resetValue(monster.damageImmunities); mDamageResistances.resetValue(monster.damageResistances); mDamageVulnerabilities.resetValue(monster.damageVulnerabilities); @@ -794,6 +805,10 @@ public class EditMonsterViewModel extends ViewModel { mUnderstandsButDescription.setValue(understandsButDescription); } + public LiveData> getSkills() { + return mSkills; + } + /* // TODO: add getters and setters for Senses @@ -862,7 +877,7 @@ public class EditMonsterViewModel extends ViewModel { monster.truesightRange = mTruesightRange.getValue(); monster.telepathyRange = mTelepathyRange.getValue(); monster.understandsButDescription = mUnderstandsButDescription.getValue(); - monster.skills = mSkills.getValue(); + monster.skills = new HashSet<>(mSkills.getValue()); monster.damageImmunities = mDamageImmunities.getValue(); monster.damageResistances = mDamageResistances.getValue(); monster.damageVulnerabilities = mDamageVulnerabilities.getValue(); @@ -877,4 +892,8 @@ public class EditMonsterViewModel extends ViewModel { return monster; } + + public List getSkillsArray() { + return mSkills.getValue(); + } } 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 new file mode 100644 index 0000000..30848d1 --- /dev/null +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java @@ -0,0 +1,45 @@ +package com.majinnaibu.monstercards.ui.editmonster; + +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; +import androidx.navigation.NavBackStackEntry; +import androidx.navigation.NavController; +import androidx.navigation.Navigation; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.majinnaibu.monstercards.R; + +/** + * A fragment representing a list of Items. + */ +public class EditSkillsFragment extends Fragment { + private EditMonsterViewModel mViewModel; +// private ViewHolder mHolder; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_edit_skills_list, container, false); + + NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment); + NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation); + mViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class); + + // Set the adapter + if (view instanceof RecyclerView) { + Context context = view.getContext(); + RecyclerView recyclerView = (RecyclerView) view; + recyclerView.setLayoutManager(new LinearLayoutManager(context)); + mViewModel.getSkills().observe(getViewLifecycleOwner(), skills -> recyclerView.setAdapter(new EditSkillsRecyclerViewAdapter(mViewModel.getSkillsArray()))); + } + + return view; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java new file mode 100644 index 0000000..f443466 --- /dev/null +++ b/app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsRecyclerViewAdapter.java @@ -0,0 +1,56 @@ +package com.majinnaibu.monstercards.ui.editmonster; + +import android.view.LayoutInflater; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + +import com.majinnaibu.monstercards.databinding.FragmentEditSkillsListItemBinding; +import com.majinnaibu.monstercards.models.Skill; + +import java.util.List; + +/** + * {@link RecyclerView.Adapter} that can display a {@link Skill}. + * TODO: Replace the implementation with code for your data type. + */ +public class EditSkillsRecyclerViewAdapter extends RecyclerView.Adapter { + + private final List mValues; + + public EditSkillsRecyclerViewAdapter(List items) { + mValues = items; + } + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + return new ViewHolder(FragmentEditSkillsListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); + } + + @Override + public void onBindViewHolder(final ViewHolder holder, int position) { + holder.mItem = mValues.get(position); + holder.mContentView.setText(mValues.get(position).name); + } + + @Override + public int getItemCount() { + return mValues.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + public final TextView mContentView; + public Skill mItem; + + public ViewHolder(FragmentEditSkillsListItemBinding binding) { + super(binding.getRoot()); + mContentView = binding.content; + } + + @Override + public String toString() { + return super.toString() + " '" + mContentView.getText() + "'"; + } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit_skills_list.xml b/app/src/main/res/layout/fragment_edit_skills_list.xml new file mode 100644 index 0000000..62ca823 --- /dev/null +++ b/app/src/main/res/layout/fragment_edit_skills_list.xml @@ -0,0 +1,13 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit_skills_list_item.xml b/app/src/main/res/layout/fragment_edit_skills_list_item.xml new file mode 100644 index 0000000..5ac69b4 --- /dev/null +++ b/app/src/main/res/layout/fragment_edit_skills_list_item.xml @@ -0,0 +1,7 @@ + + diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 56c5290..15ab555 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -90,6 +90,9 @@ + + \ No newline at end of file