Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix start letter & favorite playlist implementations for item row #3653

Merged
merged 2 commits into from
Jun 8, 2024
Merged

Fix start letter & favorite playlist implementations for item row #3653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
090d56d
Fix ItemRowAdapter.getStartLetter for (album) artists
nielsvanvelzen Jun 7, 2024
fc4d43d
Fix "favorites" playlist not showing
nielsvanvelzen Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/browsing/EnhancedBrowseFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.jellyfin.androidtv.databinding.EnhancedDetailBrowseBinding;
import org.jellyfin.androidtv.ui.GridButton;
import org.jellyfin.androidtv.ui.itemhandling.BaseRowItem;
import org.jellyfin.androidtv.ui.itemhandling.GridButtonBaseRowItem;
import org.jellyfin.androidtv.ui.itemhandling.ItemLauncher;
import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapter;
import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapterHelperKt;
Expand Down Expand Up @@ -223,8 +224,8 @@ public void loadRows(List<BrowseRowDef> rows) {
mRowsAdapter = new MutableObjectAdapter<Row>(new PositionableListRowPresenter());
mCardPresenter = new CardPresenter(false, 140);
ClassPresenterSelector ps = new ClassPresenterSelector();
ps.addClassPresenter(GridButtonBaseRowItem.class, new GridButtonPresenter(155, 140));
ps.addClassPresenter(BaseRowItem.class, mCardPresenter);
ps.addClassPresenter(GridButton.class, new GridButtonPresenter(155, 140));

for (BrowseRowDef def : rows) {
HeaderItem header = new HeaderItem(def.getHeaderText());
Expand Down Expand Up @@ -264,7 +265,7 @@ public void loadRows(List<BrowseRowDef> rows) {
rowAdapter = new ItemRowAdapter(requireContext(), def.getSpecialsQuery(), new CardPresenter(true, ImageType.THUMB, 150), mRowsAdapter);
break;
default:
rowAdapter = new ItemRowAdapter(requireContext(), def.getQuery(), def.getChunkSize(), def.getPreferParentThumb(), def.isStaticHeight(), mCardPresenter, mRowsAdapter, def.getQueryType());
rowAdapter = new ItemRowAdapter(requireContext(), def.getQuery(), def.getChunkSize(), def.getPreferParentThumb(), def.isStaticHeight(), ps, mRowsAdapter, def.getQueryType());
break;
}

Expand Down Expand Up @@ -352,6 +353,7 @@ private void refreshCurrentItem() {
private final class SpecialViewClickedListener implements OnItemViewClickedListener {
@Override
public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item, RowPresenter.ViewHolder rowViewHolder, Row row) {
if (item instanceof GridButtonBaseRowItem) item = ((GridButtonBaseRowItem) item).getGridButton();
if (item instanceof GridButton) {
switch (((GridButton) item).getId()) {
case GRID:
Expand Down
27 changes: 25 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/ItemRowAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import androidx.leanback.widget.HeaderItem;
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.PresenterSelector;
import androidx.leanback.widget.Row;

import org.jellyfin.androidtv.R;
Expand Down Expand Up @@ -165,6 +166,21 @@
this.queryType = queryType;
}

public ItemRowAdapter(Context context, ItemQuery query, int chunkSize, boolean preferParentThumb, boolean staticHeight, PresenterSelector presenter, MutableObjectAdapter<Row> parent, QueryType queryType) {

Check notice

Code scanning / Android Lint

Unknown nullness Note

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations

Check notice

Code scanning / Android Lint

Unknown nullness Note

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations

Check notice

Code scanning / Android Lint

Unknown nullness Note

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations

Check notice

Code scanning / Android Lint

Unknown nullness Note

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations

Check notice

Code scanning / Android Lint

Unknown nullness Note

Unknown nullability; explicitly declare as @Nullable or @NonNull to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations
super(presenter);
this.context = context;
mParent = parent;
mQuery = query;
mQuery.setUserId(KoinJavaComponent.<UserRepository>get(UserRepository.class).getCurrentUser().getValue().getId().toString());
this.chunkSize = chunkSize;
this.preferParentThumb = preferParentThumb;
this.staticHeight = staticHeight;
if (chunkSize > 0) {
mQuery.setLimit(chunkSize);
}
this.queryType = queryType;
}

public ItemRowAdapter(Context context, ItemQuery query, int chunkSize, boolean preferParentThumb, boolean staticHeight, Presenter presenter, MutableObjectAdapter<Row> parent) {
this(context, query, chunkSize, preferParentThumb, staticHeight, presenter, parent, QueryType.Items);
}
Expand Down Expand Up @@ -412,7 +428,14 @@
}

public @Nullable String getStartLetter() {
return mQuery != null ? mQuery.getNameStartsWithOrGreater() : null;
switch (queryType) {
case Artists:
return mArtistsQuery != null ? mArtistsQuery.getNameStartsWith() : null;
case AlbumArtists:
return mAlbumArtistsQuery != null ? mAlbumArtistsQuery.getNameStartsWith() : null;
default:
return mQuery != null ? mQuery.getNameStartsWithOrGreater() : null;
}
}

public void setStartLetter(String value) {
Expand Down Expand Up @@ -737,7 +760,7 @@
private void retrieveAudioPlaylists(final ItemQuery query) {
//Add specialized playlists first
clear();
add(new GridButton(EnhancedBrowseFragment.FAVSONGS, context.getString(R.string.lbl_favorites), R.drawable.favorites));
add(new GridButtonBaseRowItem(new GridButton(EnhancedBrowseFragment.FAVSONGS, context.getString(R.string.lbl_favorites), R.drawable.favorites)));
itemsLoaded = 1;
retrieve(query);
}
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/ui/presentation/GridButtonPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.leanback.widget.Presenter
import androidx.tv.material3.Text
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.ui.GridButton
import org.jellyfin.androidtv.ui.itemhandling.GridButtonBaseRowItem

class GridButtonPresenter @JvmOverloads constructor(
private val width: Int = 110,
Expand Down Expand Up @@ -80,7 +81,12 @@ class GridButtonPresenter @JvmOverloads constructor(
ViewHolder(ComposeView(parent.context))

override fun onBindViewHolder(viewHolder: Presenter.ViewHolder?, item: Any?) {
if (viewHolder is ViewHolder && item is GridButton) viewHolder.bind(item)
if (viewHolder !is ViewHolder) return

when (item) {
is GridButtonBaseRowItem -> viewHolder.bind(item.gridButton)
is GridButton -> viewHolder.bind(item)
}
}

override fun onUnbindViewHolder(viewHolder: Presenter.ViewHolder?) = Unit
Expand Down
Loading