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

Adds ability editor.

Browse Source
This commit is contained in:
Tom Hicks
2021-06-25 14:33:40 -07:00
parent 0b881a50da
commit 3a918fea6f
10 changed files with 410 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilitiesFragment.java Normal file
View File

@@ -0,0 +1,89 @@
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.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavBackStackEntry;
import androidx.navigation.NavController;
import androidx.navigation.NavDirections;
import androidx.navigation.Navigation;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.majinnaibu.monstercards.R;
import com.majinnaibu.monstercards.models.Trait;
import com.majinnaibu.monstercards.ui.shared.MCFragment;
import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback;
import com.majinnaibu.monstercards.utils.Logger;
public class EditAbilitiesFragment extends MCFragment {
private EditMonsterViewModel mViewModel;
private ViewHolder mHolder;
private void navigateToEditAbility(Trait trait) {
NavDirections action = EditAbilitiesFragmentDirections.actionEditAbilitiesFragmentToEditAbilityFragment(trait.description, trait.name);
Navigation.findNavController(requireView()).navigate(action);
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
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);
View root = inflater.inflate(R.layout.fragment_edit_abilities_list, container, false);
mHolder = new ViewHolder(root);
setupRecyclerView(mHolder.list);
setupAddAbilityButton(mHolder.addAbility);
return root;
}
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
Context context = requireContext();
LinearLayoutManager layoutManager = new LinearLayoutManager(context);
recyclerView.setLayoutManager(layoutManager);
mViewModel.getAbilities().observe(getViewLifecycleOwner(), abilities -> {
EditAbilitiesRecyclerViewAdapter adapter = new EditAbilitiesRecyclerViewAdapter(abilities, ability -> {
if (ability != null) {
navigateToEditAbility(ability);
} else {
Logger.logError("Can't navigate to EditAbilityFragment with a null ability");
}
});
recyclerView.setAdapter(adapter);
});
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, layoutManager.getOrientation());
recyclerView.addItemDecoration(dividerItemDecoration);
ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new SwipeToDeleteCallback(context, mViewModel::removeAbility));
itemTouchHelper.attachToRecyclerView(recyclerView);
}
private void setupAddAbilityButton(@NonNull FloatingActionButton fab) {
fab.setOnClickListener(view -> {
Trait ability = mViewModel.addNewAbility();
navigateToEditAbility(ability);
});
}
private static class ViewHolder {
RecyclerView list;
FloatingActionButton addAbility;
ViewHolder(View root) {
list = root.findViewById(R.id.list);
addAbility = root.findViewById(R.id.add_ability);
}
}
}

67
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilitiesRecyclerViewAdapter.java Normal file
View File

@@ -0,0 +1,67 @@
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.FragmentEditAbilitiesListItemBinding;
import com.majinnaibu.monstercards.models.Trait;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class EditAbilitiesRecyclerViewAdapter extends RecyclerView.Adapter<EditAbilitiesRecyclerViewAdapter.ViewHolder> {
private final List<Trait> mValues;
private final ItemCallback mOnClick;
public EditAbilitiesRecyclerViewAdapter(List<Trait> items, ItemCallback onClick) {
mValues = items;
mOnClick = onClick;
}
@NotNull
@Override
public ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
return new ViewHolder(FragmentEditAbilitiesListItemBinding.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);
holder.itemView.setOnClickListener(v -> {
if (mOnClick != null) {
mOnClick.onItemCallback(holder.mItem);
}
});
}
@Override
public int getItemCount() {
return mValues.size();
}
public interface ItemCallback {
void onItemCallback(Trait trait);
}
public static class ViewHolder extends RecyclerView.ViewHolder {
public final TextView mContentView;
public Trait mItem;
public ViewHolder(FragmentEditAbilitiesListItemBinding binding) {
super(binding.getRoot());
mContentView = binding.content;
}
@NotNull
@Override
public String toString() {
return super.toString() + " '" + mContentView.getText() + "'";
}
}
}

82
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditAbilityFragment.java Normal file
View File

@@ -0,0 +1,82 @@
package com.majinnaibu.monstercards.ui.editmonster;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import androidx.activity.OnBackPressedCallback;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavBackStackEntry;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import com.majinnaibu.monstercards.R;
import com.majinnaibu.monstercards.models.Trait;
import com.majinnaibu.monstercards.ui.shared.MCFragment;
import com.majinnaibu.monstercards.utils.Logger;
import com.majinnaibu.monstercards.utils.TextChangedListener;
public class EditAbilityFragment extends MCFragment {
private EditMonsterViewModel mEditMonsterViewModel;
private EditTraitViewModel mViewModel;
private ViewHolder mHolder;
private Trait mOldValue;
@Override
public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
mViewModel = new ViewModelProvider(this).get(EditTraitViewModel.class);
if (getArguments() != null) {
EditAbilityFragmentArgs args = EditAbilityFragmentArgs.fromBundle(getArguments());
mOldValue = new Trait(args.getName(), args.getDescription());
mViewModel.copyFromTrait(mOldValue);
} else {
Logger.logWTF("EditAbilityFragment needs arguments");
mOldValue = null;
}
super.onCreate(savedInstanceState);
}
@Nullable
@org.jetbrains.annotations.Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
NavController navController = Navigation.findNavController(requireActivity(), R.id.nav_host_fragment);
NavBackStackEntry backStackEntry = navController.getBackStackEntry(R.id.edit_monster_navigation);
mEditMonsterViewModel = new ViewModelProvider(backStackEntry).get(EditMonsterViewModel.class);
View root = inflater.inflate(R.layout.fragment_edit_trait, container, false);
mHolder = new ViewHolder(root);
mHolder.name.setText(mViewModel.getNameAsString());
mHolder.name.addTextChangedListener(new TextChangedListener((TextChangedListener.OnTextChangedCallback) (s, start, before, count) -> mViewModel.setName(s.toString())));
mHolder.description.setText(mViewModel.getDescriptionAsString());
mHolder.description.addTextChangedListener(new TextChangedListener((TextChangedListener.OnTextChangedCallback) (s, start, before, count) -> mViewModel.setDescription(s.toString())));
requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {
if (mViewModel.hasChanges()) {
mEditMonsterViewModel.replaceAbility(mOldValue, mViewModel.getAbilityValue());
}
Navigation.findNavController(requireView()).navigateUp();
}
});
return root;
}
private static class ViewHolder {
EditText description;
EditText name;
ViewHolder(View root) {
description = root.findViewById(R.id.description);
name = root.findViewById(R.id.name);
}
}
}

5
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterFragment.java
View File

@@ -145,6 +145,11 @@ public class EditMonsterFragment extends MCFragment {
Navigation.findNavController(requireView()).navigate(action);
});
mHolder.abilities.setOnClickListener(v -> {
NavDirections action = EditMonsterFragmentDirections.actionEditMonsterFragmentToEditAbilitiesFragment();
Navigation.findNavController(requireView()).navigate(action);
});
requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {

61
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditTraitViewModel.java Normal file
View File

@@ -0,0 +1,61 @@
package com.majinnaibu.monstercards.ui.editmonster;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.majinnaibu.monstercards.models.Trait;
import com.majinnaibu.monstercards.ui.shared.ChangeTrackedViewModel;
import com.majinnaibu.monstercards.utils.ChangeTrackedLiveData;
public class EditTraitViewModel extends ChangeTrackedViewModel {
private final ChangeTrackedLiveData<String> mName;
private final ChangeTrackedLiveData<String> mDescription;
private final MutableLiveData<Trait> mAbility;
public EditTraitViewModel() {
super();
mName = new ChangeTrackedLiveData<>("", this::makeDirty);
mDescription = new ChangeTrackedLiveData<>("", this::makeDirty);
mAbility = new MutableLiveData<>(makeAbility());
}
public LiveData<String> getName() {
return mName;
}
public void setName(String name) {
mName.setValue(name);
mAbility.setValue(makeAbility());
}
public String getNameAsString() {
return mName.getValue();
}
public LiveData<String> getDescription() {
return mDescription;
}
public void setDescription(String description) {
mDescription.setValue(description);
mAbility.setValue(makeAbility());
}
public String getDescriptionAsString() {
return mDescription.getValue();
}
public Trait getAbilityValue() {
return mAbility.getValue();
}
public void copyFromTrait(Trait trait) {
makeClean();
mName.resetValue(trait.name);
mDescription.resetValue(trait.description);
}
private Trait makeAbility() {
return new Trait(mName.getValue(), mDescription.getValue());
}
}

33
app/src/main/res/layout/fragment_edit_abilities_list.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.editmonster.EditAbilitiesFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="?android:attr/dividerVertical"
android:dividerPadding="@dimen/text_margin"
app:layoutManager="LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:listitem="@layout/fragment_edit_abilities_list_item" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_ability"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:contentDescription="@string/action_add_ability"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@android:drawable/ic_input_add"
app:tint="@android:color/white" />
</androidx.constraintlayout.widget.ConstraintLayout>

13
app/src/main/res/layout/fragment_edit_abilities_list_item.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin"
android:textAppearance="?attr/textAppearanceListItem" />
</LinearLayout>

37
app/src/main/res/layout/fragment_edit_trait.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/label_name"
android:importantForAutofill="no"
android:inputType="text"
tools:text="John Doe" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/label_description"
android:importantForAutofill="no"
android:inputType="text"
tools:text="John Doe" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>

22
app/src/main/res/navigation/mobile_navigation.xml
View File

@@ -111,6 +111,9 @@
<action
android:id="@+id/action_editMonsterFragment_to_editLanguagesFragment"
app:destination="@id/editLanguagesFragment" />
<action
android:id="@+id/action_editMonsterFragment_to_editAbilitiesFragment"
app:destination="@id/editAbilitiesFragment" />
</fragment>
<fragment
android:id="@+id/editBasicInfoFragment"
@@ -275,5 +278,24 @@
android:name="canSpeak"
app:argType="boolean" />
</fragment>
<fragment
android:id="@+id/editAbilitiesFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditAbilitiesFragment"
android:label="EditAbilitiesFragment" >
<action
android:id="@+id/action_editAbilitiesFragment_to_editAbilityFragment"
app:destination="@id/editAbilityFragment" />
</fragment>
<fragment
android:id="@+id/editAbilityFragment"
android:name="com.majinnaibu.monstercards.ui.editmonster.EditAbilityFragment"
android:label="EditAbilityFragment" >
<argument
android:name="description"
app:argType="string" />
<argument
android:name="name"
app:argType="string" />
</fragment>
</navigation>
</navigation>

1
app/src/main/res/values/strings.xml
View File

@@ -1,4 +1,5 @@
<resources>
<string name="action_add_ability">Add Ability</string>
<string name="action_add_condition_immunity">Add Condition</string>
<string name="action_add_damage_type">Add Damage Type</string>
<string name="action_add_language">Add Language</string>