Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,8 @@ protected void addAdditionalRows(MutableObjectAdapter<Row> adapter) {

break;
case SERIES:
ItemRowAdapter nextUpAdapter = new ItemRowAdapter(requireContext(), BrowsingUtils.createSeriesGetNextUpRequest(mBaseItem.getId()), false, new CardPresenter(true, 130), adapter);
boolean preferParentThumb = userPreferences.getValue().get(UserPreferences.Companion.getSeriesThumbnailsEnabled());
ItemRowAdapter nextUpAdapter = new ItemRowAdapter(requireContext(), BrowsingUtils.createSeriesGetNextUpRequest(mBaseItem.getId()), preferParentThumb, new CardPresenter(true, 130), adapter);
addItemRow(adapter, nextUpAdapter, 0, getString(R.string.lbl_next_up));

ItemRowAdapter seasonsAdapter = new ItemRowAdapter(requireContext(), BrowsingUtils.createSeasonsRequest(mBaseItem.getId()), new CardPresenter(), adapter);
Expand Down Expand Up @@ -620,7 +621,8 @@ protected void addAdditionalRows(MutableObjectAdapter<Row> adapter) {

if (mBaseItem.getSeasonId() != null && mBaseItem.getIndexNumber() != null) {
// query index is zero-based but episode no is not
ItemRowAdapter nextAdapter = new ItemRowAdapter(requireContext(), BrowsingUtils.createNextEpisodesRequest(mBaseItem.getSeasonId(), mBaseItem.getIndexNumber()), 0, false, true, new CardPresenter(true, 120), adapter);
boolean preferSeriesThumb = userPreferences.getValue().get(UserPreferences.Companion.getSeriesThumbnailsEnabled());
ItemRowAdapter nextAdapter = new ItemRowAdapter(requireContext(), BrowsingUtils.createNextEpisodesRequest(mBaseItem.getSeasonId(), mBaseItem.getIndexNumber()), 0, preferSeriesThumb, true, new CardPresenter(true, 120), adapter);
addItemRow(adapter, nextAdapter, 5, getString(R.string.lbl_next_episode));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.content.Context
import org.jellyfin.androidtv.util.apiclient.JellyfinImage
import org.jellyfin.androidtv.util.apiclient.albumPrimaryImage
import org.jellyfin.androidtv.util.apiclient.itemImages
import org.jellyfin.androidtv.util.apiclient.parentBackdropImages
import org.jellyfin.androidtv.util.apiclient.parentImages
import org.jellyfin.androidtv.util.apiclient.seriesPrimaryImage
import org.jellyfin.androidtv.util.apiclient.seriesThumbImage
Expand Down Expand Up @@ -106,7 +107,8 @@ open class BaseItemDtoBaseRowItem @JvmOverloads constructor(
preferSeriesPoster && baseItem?.type == BaseItemKind.EPISODE -> baseItem.parentImages[ImageType.PRIMARY]
?: baseItem.seriesPrimaryImage

preferParentThumb && baseItem?.type == BaseItemKind.EPISODE -> baseItem.parentImages[ImageType.THUMB]
preferParentThumb && baseItem?.type == BaseItemKind.EPISODE -> baseItem.parentBackdropImages.firstOrNull()
?: baseItem.parentImages[ImageType.THUMB]
?: baseItem.seriesThumbImage

baseItem?.type == BaseItemKind.SEASON -> baseItem.seriesPrimaryImage
Expand Down