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

Adds ability to edit languages.

Browse Source
This commit is contained in:
Tom Hicks
2021-06-25 10:57:25 -07:00
parent 47d67861e2
commit b14fe3ad69
12 changed files with 524 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageFragment.java Normal file
View File

@@ -0,0 +1,85 @@
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.CheckBox;
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.Language;
import com.majinnaibu.monstercards.ui.shared.MCFragment;
import com.majinnaibu.monstercards.utils.Logger;
import com.majinnaibu.monstercards.utils.TextChangedListener;
public class EditLanguageFragment extends MCFragment {
private EditMonsterViewModel mEditMonsterViewModel;
private EditLanguageViewModel mViewModel;
private ViewHolder mHolder;
private Language mOldLanguage;
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
mViewModel = new ViewModelProvider(this).get(EditLanguageViewModel.class);
Bundle arguments = getArguments();
if (arguments != null) {
EditLanguageFragmentArgs args = EditLanguageFragmentArgs.fromBundle(arguments);
mOldLanguage = new Language(args.getName(), args.getCanSpeak());
mViewModel.copyFromLanguage(mOldLanguage);
} else {
Logger.logWTF("EditLanguageFragment needs arguments");
mOldLanguage = null;
}
super.onCreate(savedInstanceState);
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.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_language, container, false);
mHolder = new ViewHolder(root);
mHolder.name.setText(mViewModel.getName().getValue());
mHolder.name.addTextChangedListener(new TextChangedListener((TextChangedListener.OnTextChangedCallback) (s, start, before, count) -> mViewModel.setName(s.toString())));
mHolder.canSpeak.setChecked(mViewModel.getCanSpeakValue());
mHolder.canSpeak.setOnCheckedChangeListener((buttonView, isChecked) -> mViewModel.setCanSpeak(isChecked));
requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), new OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {
if (mViewModel.hasChanges()) {
mEditMonsterViewModel.replaceLanguage(mOldLanguage, mViewModel.getLanguage().getValue());
}
Navigation.findNavController(requireView()).navigateUp();
}
});
return root;
}
private static class ViewHolder {
EditText name;
CheckBox canSpeak;
ViewHolder(View root) {
name = root.findViewById(R.id.name);
canSpeak = root.findViewById(R.id.canSpeak);
}
}
}

66
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguageViewModel.java Normal file
View File

@@ -0,0 +1,66 @@
package com.majinnaibu.monstercards.ui.editmonster;
import androidx.lifecycle.LiveData;
import com.majinnaibu.monstercards.models.Language;
import com.majinnaibu.monstercards.ui.shared.ChangeTrackedViewModel;
import com.majinnaibu.monstercards.utils.ChangeTrackedLiveData;
public class EditLanguageViewModel extends ChangeTrackedViewModel {
private final ChangeTrackedLiveData<String> mName;
private final ChangeTrackedLiveData<Boolean> mCanSpeak;
private final ChangeTrackedLiveData<Language> mLanguage;
public EditLanguageViewModel() {
super();
mName = new ChangeTrackedLiveData<>("New Language", this::makeDirty);
mCanSpeak = new ChangeTrackedLiveData<>(true, this::makeDirty);
mLanguage = new ChangeTrackedLiveData<>(makeLanguage(), this::makeDirty);
}
public void copyFromLanguage(Language language) {
mName.resetValue(language.getName());
mCanSpeak.resetValue(language.getSpeaks());
makeClean();
}
public LiveData<Language> getLanguage() {
return mLanguage;
}
public LiveData<String> getName() {
return mName;
}
public void setName(String name) {
mName.setValue(name);
mLanguage.setValue(makeLanguage());
}
public LiveData<Boolean> getCanSpeak() {
return mCanSpeak;
}
public void setCanSpeak(boolean canSpeak) {
mCanSpeak.setValue(canSpeak);
mLanguage.setValue(makeLanguage());
}
public boolean getCanSpeakValue(boolean defaultIfNull) {
Boolean boxedValue = mCanSpeak.getValue();
if (boxedValue == null) {
return defaultIfNull;
}
return boxedValue;
}
public boolean getCanSpeakValue() {
return getCanSpeakValue(false);
}
private Language makeLanguage() {
Boolean boxedValue = mCanSpeak.getValue();
boolean canSpeak = boxedValue != null && boxedValue;
return new Language(mName.getValue(), canSpeak);
}
}

98
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesFragment.java Normal file
View File

@@ -0,0 +1,98 @@
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.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.Language;
import com.majinnaibu.monstercards.ui.shared.MCFragment;
import com.majinnaibu.monstercards.ui.shared.SwipeToDeleteCallback;
import com.majinnaibu.monstercards.utils.Logger;
import com.majinnaibu.monstercards.utils.TextChangedListener;
public class EditLanguagesFragment extends MCFragment {
private EditMonsterViewModel mViewModel;
private ViewHolder mHolder;
private void navigateToEditLanguage(Language language) {
NavDirections action = EditLanguagesFragmentDirections.actionEditLanguagesFragmentToEditLanguageFragment(language.getName(), language.getSpeaks());
Navigation.findNavController(requireView()).navigate(action);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
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_languages_list, container, false);
mHolder = new ViewHolder(root);
setupRecyclerView(mHolder.list);
setupAddLanguageButton(mHolder.addLanguage);
return root;
}
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
Context context = requireContext();
LinearLayoutManager layoutManager = new LinearLayoutManager(context);
recyclerView.setLayoutManager(layoutManager);
mViewModel.getLanguages().observe(getViewLifecycleOwner(), languages -> {
EditLanguagesRecyclerViewAdapter adapter = new EditLanguagesRecyclerViewAdapter(
mViewModel.getLanguagesArray(),
language -> {
if (language != null) {
navigateToEditLanguage(language);
} else {
Logger.logError("Can't navigate to EditSkill with a null skill");
}
},
mViewModel.getTelepathyRangeUnboxed(),
(value, previousValue) -> mViewModel.setTelepathyRange(value),
mViewModel.getUnderstandsButDescription().getValue(),
new TextChangedListener((TextChangedListener.OnTextChangedCallback) (s, start, before, count) -> mViewModel.setUnderstandsButDescription(s.toString())));
recyclerView.setAdapter(adapter);
});
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, layoutManager.getOrientation());
recyclerView.addItemDecoration(dividerItemDecoration);
ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new SwipeToDeleteCallback(context, mViewModel::removeLanguage));
itemTouchHelper.attachToRecyclerView(recyclerView);
}
private void setupAddLanguageButton(@NonNull FloatingActionButton fab) {
fab.setOnClickListener(view -> {
Language newLanguage = mViewModel.addNewLanguage();
navigateToEditLanguage(newLanguage);
});
}
private static class ViewHolder {
RecyclerView list;
FloatingActionButton addLanguage;
ViewHolder(View root) {
this.list = root.findViewById(R.id.list);
this.addLanguage = root.findViewById(R.id.add_language);
}
}
}

114
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditLanguagesRecyclerViewAdapter.java Normal file
View File

@@ -0,0 +1,114 @@
package com.majinnaibu.monstercards.ui.editmonster;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
import com.majinnaibu.monstercards.databinding.FragmentEditLanguagesListHeaderBinding;
import com.majinnaibu.monstercards.databinding.FragmentEditLanguagesListItemBinding;
import com.majinnaibu.monstercards.models.Language;
import com.majinnaibu.monstercards.ui.components.Stepper;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class EditLanguagesRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private final List<Language> mValues;
private final ItemCallback mOnClick;
private final int mTelepathyRange;
private final String mUnderstandsBut;
private final Stepper.OnValueChangeListener mOnTelepathyRangeChanged;
private final TextWatcher mOnUnderstandsButChanged;
private final int HEADER_VIEW_TYPE = 1;
private final int ITEM_VIEW_TYPE = 2;
private final String DISTANCE_IN_FEET_FORMAT = "%d ft.";
public EditLanguagesRecyclerViewAdapter(List<Language> items, ItemCallback onClick, int telepathyRange, Stepper.OnValueChangeListener telepathyRangeChangedListener, String undderstandsBut, TextWatcher understandsButChangedListener) {
mValues = items;
mOnClick = onClick;
mTelepathyRange = telepathyRange;
mOnTelepathyRangeChanged = telepathyRangeChangedListener;
mUnderstandsBut = undderstandsBut;
mOnUnderstandsButChanged = understandsButChangedListener;
}
@NotNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
if (viewType == HEADER_VIEW_TYPE) {
return new HeaderViewHolder(FragmentEditLanguagesListHeaderBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
}
return new ItemViewHolder(FragmentEditLanguagesListItemBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
}
@Override
public void onBindViewHolder(@NotNull final RecyclerView.ViewHolder holder, int position) {
if (holder instanceof HeaderViewHolder) {
HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
headerViewHolder.telepathy.setOnFormatValueCallback(value -> String.format(DISTANCE_IN_FEET_FORMAT, value));
headerViewHolder.telepathy.setValue(mTelepathyRange);
headerViewHolder.telepathy.setOnValueChangeListener(mOnTelepathyRangeChanged);
headerViewHolder.understandsBut.setText(mUnderstandsBut);
headerViewHolder.understandsBut.addTextChangedListener(mOnUnderstandsButChanged);
} else if(holder instanceof ItemViewHolder) {
ItemViewHolder itemViewHolder = (ItemViewHolder)holder;
itemViewHolder.mItem = mValues.get(position-1);
itemViewHolder.mContentView.setText(itemViewHolder.mItem.getName());
itemViewHolder.itemView.setOnClickListener(view -> {
if (mOnClick != null) {
mOnClick.onItemCallback(itemViewHolder.mItem);
}
});
}
}
@Override
public int getItemCount() {
return mValues.size() +1;
}
@Override
public int getItemViewType(int position) {
if (position == 0) {
return HEADER_VIEW_TYPE;
}
return ITEM_VIEW_TYPE;
}
public interface ItemCallback {
void onItemCallback(Language language);
}
public static class HeaderViewHolder extends RecyclerView.ViewHolder {
public final Stepper telepathy;
public final EditText understandsBut;
public HeaderViewHolder(FragmentEditLanguagesListHeaderBinding binding) {
super(binding.getRoot());
telepathy = binding.telepathy;
understandsBut = binding.understandsBut;
}
}
public static class ItemViewHolder extends RecyclerView.ViewHolder {
public final TextView mContentView;
public Language mItem;
public ItemViewHolder(FragmentEditLanguagesListItemBinding binding) {
super(binding.getRoot());
mContentView = binding.content;
}
@NotNull
@Override
public String toString() {
return super.toString() + " '" + mContentView.getText() + "'";
}
}
}

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

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

11
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditMonsterViewModel.java
View File

@@ -740,6 +740,10 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
return mTelepathyRange;
}
public int getTelepathyRangeUnboxed() {
return Helpers.unboxInteger(mTelepathyRange.getValue(), 0);
}
public void setTelepathyRange(int telepathyRange) {
mTelepathyRange.setValue(telepathyRange);
}
@@ -1189,5 +1193,12 @@ public class EditMonsterViewModel extends ChangeTrackedViewModel {
static <T> void replaceItemInList(MutableLiveData<List<T>> listData, T oldItem, T newItem) {
replaceItemInList(listData, oldItem, newItem, null);
}
static int unboxInteger(Integer value, int defaultIfNull) {
if (value == null) {
return defaultIfNull;
}
return value;
}
}
}