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

Fixes lists to use similar sized items.

Browse Source
This commit is contained in:
Tom Hicks
2021-07-01 00:02:48 -07:00
parent 64216d3aba
commit fb40e75199
7 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public class LibraryFragment extends MCFragment {
Context context = requireContext(); Context context = requireContext();
MonsterRepository repository = this.getMonsterRepository(); MonsterRepository repository = this.getMonsterRepository();
MonsterListRecyclerViewAdapter adapter = new MonsterListRecyclerViewAdapter( LibraryRecyclerViewAdapter adapter = new LibraryRecyclerViewAdapter(
context, context,
repository.getMonsters(), repository.getMonsters(),
(monster) -> navigateToMonsterDetail(monster.id), (monster) -> navigateToMonsterDetail(monster.id),

10
app/src/main/java/com/majinnaibu/monstercards/ui/library/MonsterListRecyclerViewAdapter.java → app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryRecyclerViewAdapter.java
View File

@@ -20,7 +20,7 @@ import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Schedulers;
public class MonsterListRecyclerViewAdapter extends RecyclerView.Adapter<MonsterListRecyclerViewAdapter.ViewHolder> { public class LibraryRecyclerViewAdapter extends RecyclerView.Adapter<LibraryRecyclerViewAdapter.ViewHolder> {
private final Context mContext; private final Context mContext;
private final ItemCallback mOnDelete; private final ItemCallback mOnDelete;
private final ItemCallback mOnClick; private final ItemCallback mOnClick;
@@ -37,10 +37,10 @@ public class MonsterListRecyclerViewAdapter extends RecyclerView.Adapter<Monster
private List<Monster> mValues; private List<Monster> mValues;
private Disposable mDisposable; private Disposable mDisposable;
public MonsterListRecyclerViewAdapter(Context context, public LibraryRecyclerViewAdapter(Context context,
Flowable<List<Monster>> itemsObservable, Flowable<List<Monster>> itemsObservable,
ItemCallback onClick, ItemCallback onClick,
ItemCallback onDelete) { ItemCallback onDelete) {
mItemsObservable = itemsObservable; mItemsObservable = itemsObservable;
mValues = new ArrayList<>(); mValues = new ArrayList<>();
mContext = context; mContext = context;

2
app/src/main/res/layout/fragment_edit_languages_list_item.xml
View File

@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/content" android:id="@+id/content"
android:layout_width="wrap_content" android:layout_width="match_parent"
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" />

2
app/src/main/res/layout/fragment_edit_skills_list_item.xml
View File

@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/content" android:id="@+id/content"
android:layout_width="wrap_content" android:layout_width="match_parent"
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" />

2
app/src/main/res/layout/fragment_edit_strings_list_item.xml
View File

@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/content" android:id="@+id/content"
android:layout_width="wrap_content" android:layout_width="match_parent"
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" />

2
app/src/main/res/layout/fragment_edit_traits_list_item.xml
View File

@@ -6,7 +6,7 @@
<TextView <TextView
android:id="@+id/content" android:id="@+id/content"
android:layout_width="wrap_content" android:layout_width="match_parent"
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" />

15
app/src/main/res/layout/monster_list_content.xml
View File

@@ -1,7 +1,14 @@
<?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:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin" android:orientation="horizontal">
android:textAppearance="?attr/textAppearanceListItem" /> <!-- // TODO: combine all of these similar list layouts into a single one -->
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin"
android:textAppearance="?attr/textAppearanceListItem" />
</LinearLayout>