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

Remove some unused code related to ItemRowAdapter #3637

Merged
merged 1 commit into from
Jun 2, 2024
Merged

Remove some unused code related to ItemRowAdapter #3637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/constant/QueryType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ enum class QueryType {
LiveTvProgram,
LiveTvRecording,
StaticItems,
Persons,
StaticAudioQueueItems,
Artists,
AlbumArtists,
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseGridFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,12 +673,6 @@ private void buildAdapter() {
case NextUp:
mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getNextUpQuery(), true, mCardPresenter, null);
break;
case Season:
mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getSeasonQuery(), mCardPresenter, null);
break;
case Upcoming:
mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getUpcomingQuery(), mCardPresenter, null);
break;
case Views:
mAdapter = new ItemRowAdapter(requireContext(), ViewQuery.INSTANCE, mCardPresenter, null);
break;
Expand All @@ -688,9 +682,6 @@ private void buildAdapter() {
case SimilarMovies:
mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getSimilarQuery(), QueryType.SimilarMovies, mCardPresenter, null);
break;
case Persons:
mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getPersonsQuery(), chunkSize, mCardPresenter, null);
break;
case LiveTvChannel:
mAdapter = new ItemRowAdapter(requireContext(), mRowDef.getTvChannelQuery(), 40, mCardPresenter, null);
break;
Expand Down
58 changes: 1 addition & 57 deletions app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseRowDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,23 @@
import org.jellyfin.apiclient.model.querying.ArtistsQuery;
import org.jellyfin.apiclient.model.querying.ItemQuery;
import org.jellyfin.apiclient.model.querying.LatestItemsQuery;
import org.jellyfin.apiclient.model.querying.PersonsQuery;
import org.jellyfin.apiclient.model.querying.SeasonQuery;
import org.jellyfin.apiclient.model.querying.SimilarItemsQuery;
import org.jellyfin.apiclient.model.querying.UpcomingEpisodesQuery;
import org.jellyfin.sdk.model.api.request.GetNextUpRequest;
import org.jellyfin.sdk.model.api.request.GetResumeItemsRequest;

public class BrowseRowDef {
private String headerText;
private ItemQuery query;
private GetNextUpRequest nextUpQuery;
private UpcomingEpisodesQuery upcomingQuery;
private SimilarItemsQuery similarQuery;
private LatestItemsQuery latestItemsQuery;

private PersonsQuery personsQuery;

private LiveTvChannelQuery tvChannelQuery;
private RecommendedProgramQuery programQuery;
private RecordingQuery recordingQuery;
private SeriesTimerQuery seriesTimerQuery;

private ArtistsQuery artistsQuery;
private AlbumArtistsQuery albumArtistsQuery;
private SeasonQuery seasonQuery;
private GetResumeItemsRequest resumeQuery;
private SpecialsQuery specialsQuery;
private QueryType queryType;
Expand All @@ -48,10 +40,7 @@ public class BrowseRowDef {
private ChangeTriggerType[] changeTriggers;

public BrowseRowDef(String header, ItemQuery query, int chunkSize) {
this(header, query, chunkSize, false);
}
public BrowseRowDef(String header, ItemQuery query, int chunkSize, boolean preferParentThumb) {
this(header, query, chunkSize, preferParentThumb, false);
this(header, query, chunkSize, false, false);
}

public BrowseRowDef(String header, ItemQuery query, int chunkSize, boolean preferParentThumb, boolean staticHeight) {
Expand Down Expand Up @@ -97,12 +86,6 @@ public BrowseRowDef(String header, AlbumArtistsQuery query, int chunkSize, Chang
this.changeTriggers = changeTriggers;
}

public BrowseRowDef(String header, GetNextUpRequest query) {
headerText = header;
this.nextUpQuery = query;
this.queryType = QueryType.NextUp;
}

public BrowseRowDef(String header, SeriesTimerQuery query) {
headerText = header;
this.seriesTimerQuery = query;
Expand All @@ -126,12 +109,6 @@ public BrowseRowDef(String header, LatestItemsQuery query, ChangeTriggerType[] c
this.changeTriggers = changeTriggers;
}

public BrowseRowDef(String header, SimilarItemsQuery query) {
headerText = header;
this.similarQuery = query;
this.queryType = QueryType.SimilarSeries;
}

public BrowseRowDef(String header, LiveTvChannelQuery query) {
headerText = header;
this.tvChannelQuery = query;
Expand All @@ -156,31 +133,12 @@ public BrowseRowDef(String header, RecordingQuery query, int chunkSize) {
this.queryType = QueryType.LiveTvRecording;
}

public BrowseRowDef(String header, PersonsQuery query, int chunkSize) {
headerText = header;
this.personsQuery = query;
this.queryType = QueryType.Persons;
this.chunkSize = chunkSize;
}

public BrowseRowDef(String header, SimilarItemsQuery query, QueryType type) {
headerText = header;
this.similarQuery = query;
this.queryType = type;
}

public BrowseRowDef(String header, SeasonQuery query) {
headerText = header;
this.seasonQuery = query;
this.queryType = QueryType.Season;
}

public BrowseRowDef(String header, UpcomingEpisodesQuery query) {
headerText = header;
this.upcomingQuery = query;
this.queryType = QueryType.Upcoming;
}

public BrowseRowDef(String header, ViewQuery query) {
headerText = header;
this.staticHeight = true;
Expand Down Expand Up @@ -213,10 +171,6 @@ public String getHeaderText() {
return headerText;
}

public void setHeaderText(String headerText) {
this.headerText = headerText;
}

public ItemQuery getQuery() {
return query;
}
Expand All @@ -233,12 +187,6 @@ public QueryType getQueryType() {
return queryType;
}

public SeasonQuery getSeasonQuery() { return seasonQuery; }

public UpcomingEpisodesQuery getUpcomingQuery() {
return upcomingQuery;
}

public LiveTvChannelQuery getTvChannelQuery() {
return tvChannelQuery;
}
Expand All @@ -251,10 +199,6 @@ public RecommendedProgramQuery getProgramQuery() {

public boolean getPreferParentThumb() { return preferParentThumb; }

public PersonsQuery getPersonsQuery() {
return personsQuery;
}

public ArtistsQuery getArtistsQuery() { return artistsQuery; }
public AlbumArtistsQuery getAlbumArtistsQuery() { return albumArtistsQuery; }

Expand Down
11 changes: 1 addition & 10 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 @@ -236,12 +236,6 @@ public void loadRows(List<BrowseRowDef> rows) {
case LatestItems:
rowAdapter = new ItemRowAdapter(requireContext(), def.getLatestItemsQuery(), true, mCardPresenter, mRowsAdapter);
break;
case Season:
rowAdapter = new ItemRowAdapter(requireContext(), def.getSeasonQuery(), mCardPresenter, mRowsAdapter);
break;
case Upcoming:
rowAdapter = new ItemRowAdapter(requireContext(), def.getUpcomingQuery(), mCardPresenter, mRowsAdapter);
break;
case Views:
rowAdapter = new ItemRowAdapter(requireContext(), ViewQuery.INSTANCE, mCardPresenter, mRowsAdapter);
break;
Expand All @@ -251,9 +245,6 @@ public void loadRows(List<BrowseRowDef> rows) {
case SimilarMovies:
rowAdapter = new ItemRowAdapter(requireContext(), def.getSimilarQuery(), QueryType.SimilarMovies, mCardPresenter, mRowsAdapter);
break;
case Persons:
rowAdapter = new ItemRowAdapter(requireContext(), def.getPersonsQuery(), def.getChunkSize(), mCardPresenter, mRowsAdapter);
break;
case LiveTvChannel:
rowAdapter = new ItemRowAdapter(requireContext(), def.getTvChannelQuery(), 40, mCardPresenter, mRowsAdapter);
break;
Expand All @@ -273,7 +264,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(), ps, mRowsAdapter, def.getQueryType());
rowAdapter = new ItemRowAdapter(requireContext(), def.getQuery(), def.getChunkSize(), def.getPreferParentThumb(), def.isStaticHeight(), mCardPresenter, mRowsAdapter, def.getQueryType());
break;
}

Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/org/jellyfin/androidtv/ui/home/HomeFragmentBrowseRowDefRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,9 @@ class HomeFragmentBrowseRowDefRow(
val rowAdapter = when (browseRowDef.queryType) {
QueryType.NextUp -> ItemRowAdapter(context, browseRowDef.nextUpQuery, preferParentThumb, cardPresenter, rowsAdapter)
QueryType.LatestItems -> ItemRowAdapter(context, browseRowDef.latestItemsQuery, userPreferences[UserPreferences.seriesThumbnailsEnabled], cardPresenter, rowsAdapter)
QueryType.Season -> ItemRowAdapter(context, browseRowDef.seasonQuery, cardPresenter, rowsAdapter)
QueryType.Upcoming -> ItemRowAdapter(context, browseRowDef.upcomingQuery, cardPresenter, rowsAdapter)
QueryType.Views -> ItemRowAdapter(context, ViewQuery, cardPresenter, rowsAdapter)
QueryType.SimilarSeries -> ItemRowAdapter(context, browseRowDef.similarQuery, QueryType.SimilarSeries, cardPresenter, rowsAdapter)
QueryType.SimilarMovies -> ItemRowAdapter(context, browseRowDef.similarQuery, QueryType.SimilarMovies, cardPresenter, rowsAdapter)
QueryType.Persons -> ItemRowAdapter(context, browseRowDef.personsQuery, browseRowDef.chunkSize, cardPresenter, rowsAdapter)
QueryType.LiveTvChannel -> ItemRowAdapter(context, browseRowDef.tvChannelQuery, 40, cardPresenter, rowsAdapter)
QueryType.LiveTvProgram -> ItemRowAdapter(context, browseRowDef.programQuery, cardPresenter, rowsAdapter)
QueryType.LiveTvRecording -> ItemRowAdapter(context, browseRowDef.recordingQuery, browseRowDef.chunkSize, cardPresenter, rowsAdapter)
Expand Down
Loading
Loading