Adds item dividers to the Library and Edit Skills screens.
Makes the two layouts consistent with each other.
This commit is contained in:
		| @@ -1,5 +1,6 @@ | |||||||
| package com.majinnaibu.monstercards.ui.editmonster; | package com.majinnaibu.monstercards.ui.editmonster; | ||||||
|  |  | ||||||
|  | import android.content.Context; | ||||||
| import android.os.Bundle; | import android.os.Bundle; | ||||||
| import android.view.LayoutInflater; | import android.view.LayoutInflater; | ||||||
| import android.view.View; | import android.view.View; | ||||||
| @@ -11,6 +12,7 @@ import androidx.lifecycle.ViewModelProvider; | |||||||
| import androidx.navigation.NavBackStackEntry; | import androidx.navigation.NavBackStackEntry; | ||||||
| import androidx.navigation.NavController; | import androidx.navigation.NavController; | ||||||
| import androidx.navigation.Navigation; | import androidx.navigation.Navigation; | ||||||
|  | import androidx.recyclerview.widget.DividerItemDecoration; | ||||||
| import androidx.recyclerview.widget.LinearLayoutManager; | import androidx.recyclerview.widget.LinearLayoutManager; | ||||||
| import androidx.recyclerview.widget.RecyclerView; | import androidx.recyclerview.widget.RecyclerView; | ||||||
|  |  | ||||||
| @@ -41,8 +43,15 @@ public class EditSkillsFragment extends Fragment { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void setupRecyclerView(@NonNull RecyclerView recyclerView) { |     private void setupRecyclerView(@NonNull RecyclerView recyclerView) { | ||||||
|         recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); |         Context context = requireContext(); | ||||||
|         mViewModel.getSkills().observe(getViewLifecycleOwner(), skills -> recyclerView.setAdapter(new EditSkillsRecyclerViewAdapter(mViewModel.getSkillsArray()))); |         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) { |     private void setupAddSkillButton(@NonNull FloatingActionButton fab) { | ||||||
|   | |||||||
| @@ -1,5 +1,6 @@ | |||||||
| package com.majinnaibu.monstercards.ui.library; | package com.majinnaibu.monstercards.ui.library; | ||||||
|  |  | ||||||
|  | import android.content.Context; | ||||||
| import android.os.Bundle; | import android.os.Bundle; | ||||||
| import android.view.LayoutInflater; | import android.view.LayoutInflater; | ||||||
| import android.view.View; | import android.view.View; | ||||||
| @@ -8,6 +9,7 @@ import android.view.ViewGroup; | |||||||
| import androidx.annotation.NonNull; | import androidx.annotation.NonNull; | ||||||
| import androidx.navigation.NavDirections; | import androidx.navigation.NavDirections; | ||||||
| import androidx.navigation.Navigation; | import androidx.navigation.Navigation; | ||||||
|  | import androidx.recyclerview.widget.DividerItemDecoration; | ||||||
| import androidx.recyclerview.widget.ItemTouchHelper; | import androidx.recyclerview.widget.ItemTouchHelper; | ||||||
| import androidx.recyclerview.widget.LinearLayoutManager; | import androidx.recyclerview.widget.LinearLayoutManager; | ||||||
| import androidx.recyclerview.widget.RecyclerView; | import androidx.recyclerview.widget.RecyclerView; | ||||||
| @@ -45,9 +47,11 @@ public class LibraryFragment extends MCFragment { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     private void setupRecyclerView(@NonNull RecyclerView recyclerView) { |     private void setupRecyclerView(@NonNull RecyclerView recyclerView) { | ||||||
|  |         Context context = requireContext(); | ||||||
|         MonsterRepository repository = this.getMonsterRepository(); |         MonsterRepository repository = this.getMonsterRepository(); | ||||||
|  |  | ||||||
|         MonsterListRecyclerViewAdapter adapter = new MonsterListRecyclerViewAdapter( |         MonsterListRecyclerViewAdapter adapter = new MonsterListRecyclerViewAdapter( | ||||||
|                 getContext(), |                 context, | ||||||
|                 repository.getMonsters(), |                 repository.getMonsters(), | ||||||
|                 (monster) -> navigateToMonsterDetail(monster.id), |                 (monster) -> navigateToMonsterDetail(monster.id), | ||||||
|                 (monster) -> repository |                 (monster) -> repository | ||||||
| @@ -66,7 +70,13 @@ public class LibraryFragment extends MCFragment { | |||||||
|                             } |                             } | ||||||
|                         })); |                         })); | ||||||
|         recyclerView.setAdapter(adapter); |         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 itemTouchHelper = new ItemTouchHelper(new SwipeToDeleteCallback(requireContext(), adapter::deleteItem)); | ||||||
|         itemTouchHelper.attachToRecyclerView(recyclerView); |         itemTouchHelper.attachToRecyclerView(recyclerView); | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -2,17 +2,16 @@ | |||||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" |     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||||
|     xmlns:tools="http://schemas.android.com/tools" |     xmlns:tools="http://schemas.android.com/tools" | ||||||
|     android:name="com.majinnaibu.monstercards.ui.editmonster.EditSkillsFragment" |  | ||||||
|     android:layout_width="match_parent" |     android:layout_width="match_parent" | ||||||
|     android:layout_height="match_parent" |     android:layout_height="match_parent" | ||||||
|     tools:context=".ui.library.LibraryFragment"> |     tools:context=".ui.editmonster.EditSkillsFragment"> | ||||||
|  |  | ||||||
|     <androidx.recyclerview.widget.RecyclerView |     <androidx.recyclerview.widget.RecyclerView | ||||||
|         android:id="@+id/list" |         android:id="@+id/list" | ||||||
|         android:layout_width="match_parent" |         android:layout_width="match_parent" | ||||||
|         android:layout_height="match_parent" |         android:layout_height="match_parent" | ||||||
|         android:layout_marginLeft="16dp" |         android:divider="?android:attr/dividerVertical" | ||||||
|         android:layout_marginRight="16dp" |         android:dividerPadding="@dimen/text_margin" | ||||||
|         app:layoutManager="LinearLayoutManager" |         app:layoutManager="LinearLayoutManager" | ||||||
|         app:layout_constraintBottom_toBottomOf="parent" |         app:layout_constraintBottom_toBottomOf="parent" | ||||||
|         app:layout_constraintEnd_toEndOf="parent" |         app:layout_constraintEnd_toEndOf="parent" | ||||||
|   | |||||||
| @@ -1,7 +1,13 @@ | |||||||
| <?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||||
| <TextView xmlns:android="http://schemas.android.com/apk/res/android" | <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:id="@+id/content" | ||||||
|         android:layout_width="wrap_content" |         android:layout_width="wrap_content" | ||||||
|         android:layout_height="wrap_content" |         android:layout_height="wrap_content" | ||||||
|         android:layout_margin="@dimen/text_margin" |         android:layout_margin="@dimen/text_margin" | ||||||
|         android:textAppearance="?attr/textAppearanceListItem" /> |         android:textAppearance="?attr/textAppearanceListItem" /> | ||||||
|  | </LinearLayout> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user