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

Adds item dividers to the Library and Edit Skills screens.

Browse Source 
Makes the two layouts consistent with each other.
This commit is contained in:
Tom Hicks
2021-06-12 21:43:17 -07:00
parent b51318220b
commit afba6e8490
4 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/majinnaibu/monstercards/ui/editmonster/EditSkillsFragment.java
View File

@@ -1,5 +1,6 @@
package com.majinnaibu.monstercards.ui.editmonster;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -11,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavBackStackEntry;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -41,8 +43,15 @@ public class EditSkillsFragment extends Fragment {
}
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
mViewModel.getSkills().observe(getViewLifecycleOwner(), skills -> recyclerView.setAdapter(new EditSkillsRecyclerViewAdapter(mViewModel.getSkillsArray())));
Context context = requireContext();
LinearLayoutManager layoutManager = new LinearLayoutManager(context);
recyclerView.setLayoutManager(layoutManager);
EditSkillsRecyclerViewAdapter adapter = new EditSkillsRecyclerViewAdapter(mViewModel.getSkillsArray());
mViewModel.getSkills().observe(getViewLifecycleOwner(), skills -> recyclerView.setAdapter(adapter));
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, layoutManager.getOrientation());
recyclerView.addItemDecoration(dividerItemDecoration);
}
private void setupAddSkillButton(@NonNull FloatingActionButton fab) {

14
app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java
View File

@@ -1,5 +1,6 @@
package com.majinnaibu.monstercards.ui.library;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -8,6 +9,7 @@ import android.view.ViewGroup;
import androidx.annotation.NonNull;
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;
@@ -45,9 +47,11 @@ public class LibraryFragment extends MCFragment {
}
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
Context context = requireContext();
MonsterRepository repository = this.getMonsterRepository();
MonsterListRecyclerViewAdapter adapter = new MonsterListRecyclerViewAdapter(
getContext(),
context,
repository.getMonsters(),
(monster) -> navigateToMonsterDetail(monster.id),
(monster) -> repository
@@ -66,7 +70,13 @@ public class LibraryFragment extends MCFragment {
}
}));
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
LinearLayoutManager layoutManager = new LinearLayoutManager(context);
recyclerView.setLayoutManager(layoutManager);
DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, layoutManager.getOrientation());
recyclerView.addItemDecoration(dividerItemDecoration);
ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new SwipeToDeleteCallback(requireContext(), adapter::deleteItem));
itemTouchHelper.attachToRecyclerView(recyclerView);
}