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

Replace BaseItemType usages with BaseItemKind (SDK) #2032

Merged
merged 1 commit into from
Sep 6, 2022
Merged

Replace BaseItemType usages with BaseItemKind (SDK) #2032

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
5 changes: 2 additions & 3 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 @@ -62,7 +62,6 @@
import org.jellyfin.androidtv.util.KeyProcessor;
import org.jellyfin.androidtv.util.Utils;
import org.jellyfin.apiclient.interaction.EmptyResponse;
import org.jellyfin.apiclient.model.dto.BaseItemType;
import org.jellyfin.apiclient.model.querying.ArtistsQuery;
import org.jellyfin.apiclient.model.querying.ItemFields;
import org.jellyfin.sdk.model.api.BaseItemDto;
Expand Down Expand Up @@ -950,8 +949,8 @@ private void refreshCurrentItem() {

mediaManager.getValue().setCurrentMediaPosition(-1); // re-set so it doesn't mess with parent views
}
if (mCurrentItem != null && mCurrentItem.getBaseItemType() != BaseItemType.Photo && mCurrentItem.getBaseItemType() != BaseItemType.PhotoAlbum
&& mCurrentItem.getBaseItemType() != BaseItemType.MusicArtist && mCurrentItem.getBaseItemType() != BaseItemType.MusicAlbum) {
if (mCurrentItem != null && mCurrentItem.getBaseItemType() != BaseItemKind.PHOTO && mCurrentItem.getBaseItemType() != BaseItemKind.PHOTO_ALBUM
&& mCurrentItem.getBaseItemType() != BaseItemKind.MUSIC_ARTIST && mCurrentItem.getBaseItemType() != BaseItemKind.MUSIC_ALBUM) {
Timber.d("Refresh item \"%s\"", mCurrentItem.getFullName(requireContext()));
mCurrentItem.refresh(new EmptyResponse() {
@Override
Expand Down
11 changes: 6 additions & 5 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 @@ -57,6 +57,7 @@
import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.dto.BaseItemType;
import org.jellyfin.apiclient.serialization.GsonJsonSerializer;
import org.jellyfin.sdk.model.api.BaseItemKind;
import org.jellyfin.sdk.model.constant.CollectionType;
import org.koin.java.KoinJavaComponent;

Expand Down Expand Up @@ -351,15 +352,15 @@ public void onMessageReceived(CustomMessage message) {

private void refreshCurrentItem() {
if (mCurrentItem != null &&
mCurrentItem.getBaseItemType() != BaseItemType.Photo &&
mCurrentItem.getBaseItemType() != BaseItemType.MusicArtist &&
mCurrentItem.getBaseItemType() != BaseItemType.MusicAlbum &&
mCurrentItem.getBaseItemType() != BaseItemType.Playlist
mCurrentItem.getBaseItemType() != BaseItemKind.PHOTO &&
mCurrentItem.getBaseItemType() != BaseItemKind.MUSIC_ARTIST &&
mCurrentItem.getBaseItemType() != BaseItemKind.MUSIC_ALBUM &&
mCurrentItem.getBaseItemType() != BaseItemKind.PLAYLIST
) {
mCurrentItem.refresh(new EmptyResponse() {
@Override
public void onResponse() {
ItemRowAdapter adapter = (ItemRowAdapter) ((ListRow) mCurrentRow).getAdapter();
ItemRowAdapter adapter = (ItemRowAdapter) mCurrentRow.getAdapter();
adapter.notifyArrayItemRangeChanged(adapter.indexOf(mCurrentItem), 1);
}
});
Expand Down
35 changes: 22 additions & 13 deletions app/src/main/java/org/jellyfin/androidtv/ui/browsing/GenericFolderFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
import org.jellyfin.androidtv.R;
import org.jellyfin.androidtv.data.querying.StdItemQuery;
import org.jellyfin.androidtv.util.Utils;
import org.jellyfin.apiclient.model.dto.BaseItemType;
import org.jellyfin.androidtv.util.sdk.compat.ModelCompat;
import org.jellyfin.apiclient.model.entities.SortOrder;
import org.jellyfin.apiclient.model.querying.ItemFilter;
import org.jellyfin.sdk.model.api.BaseItemDto;
import org.jellyfin.sdk.model.api.BaseItemKind;
import org.jellyfin.sdk.model.constant.ItemSortBy;

import java.util.Arrays;
Expand All @@ -18,21 +20,28 @@ public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
}

private static BaseItemType[] showSpecialViewTypes = new BaseItemType[]{BaseItemType.CollectionFolder, BaseItemType.Folder, BaseItemType.UserView, BaseItemType.ChannelFolderItem};
private static BaseItemKind[] showSpecialViewTypes = new BaseItemKind[]{
BaseItemKind.COLLECTION_FOLDER,
BaseItemKind.FOLDER,
BaseItemKind.USER_VIEW,
BaseItemKind.CHANNEL_FOLDER_ITEM
};

@Override
protected void setupQueries(RowLoader rowLoader) {
if (Utils.getSafeValue(mFolder.getChildCount(), 0) > 0 ||
mFolder.getBaseItemType() == BaseItemType.Channel ||
mFolder.getBaseItemType() == BaseItemType.ChannelFolderItem ||
mFolder.getBaseItemType() == BaseItemType.UserView ||
mFolder.getBaseItemType() == BaseItemType.CollectionFolder) {
boolean showSpecialViews = Arrays.asList(showSpecialViewTypes).contains(mFolder.getBaseItemType()) && !"channels".equals(mFolder.getCollectionType());
BaseItemDto folder = ModelCompat.asSdk(mFolder);

if (Utils.getSafeValue(folder.getChildCount(), 0) > 0 ||
folder.getType() == BaseItemKind.CHANNEL ||
folder.getType() == BaseItemKind.CHANNEL_FOLDER_ITEM ||
folder.getType() == BaseItemKind.USER_VIEW ||
folder.getType() == BaseItemKind.COLLECTION_FOLDER) {
boolean showSpecialViews = Arrays.asList(showSpecialViewTypes).contains(folder.getType());

if (showSpecialViews) {
if (mFolder.getBaseItemType() != BaseItemType.ChannelFolderItem) {
if (folder.getType() != BaseItemKind.CHANNEL_FOLDER_ITEM) {
StdItemQuery resume = new StdItemQuery();
resume.setParentId(mFolder.getId());
resume.setParentId(folder.getId().toString());
resume.setLimit(50);
resume.setFilters(new ItemFilter[]{ItemFilter.IsResumable});
resume.setSortBy(new String[]{ItemSortBy.DatePlayed});
Expand All @@ -41,7 +50,7 @@ protected void setupQueries(RowLoader rowLoader) {
}

StdItemQuery latest = new StdItemQuery();
latest.setParentId(mFolder.getId());
latest.setParentId(folder.getId().toString());
latest.setLimit(50);
latest.setFilters(new ItemFilter[]{ItemFilter.IsUnplayed});
latest.setSortBy(new String[]{ItemSortBy.DateCreated});
Expand All @@ -51,8 +60,8 @@ protected void setupQueries(RowLoader rowLoader) {
}

StdItemQuery byName = new StdItemQuery();
byName.setParentId(mFolder.getId());
String header = (mFolder.getBaseItemType() == BaseItemType.Season) ? mFolder.getName() : getString(R.string.lbl_by_name);
byName.setParentId(folder.getId().toString());
String header = (folder.getType() == BaseItemKind.SEASON) ? folder.getName() : getString(R.string.lbl_by_name);
mRows.add(new BrowseRowDef(header, byName, 100));

rowLoader.loadRows(mRows);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/browsing/StdBrowseFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.jellyfin.androidtv.ui.presentation.PositionableListRowPresenter;
import org.jellyfin.androidtv.util.Utils;
import org.jellyfin.apiclient.interaction.EmptyResponse;
import org.jellyfin.apiclient.model.dto.BaseItemType;
import org.jellyfin.sdk.model.api.BaseItemKind;
import org.koin.java.KoinJavaComponent;

import java.util.ArrayList;
Expand Down Expand Up @@ -219,7 +219,7 @@ protected void setupEventListeners() {
}

private void refreshCurrentItem() {
if (mCurrentItem != null && mCurrentItem.getBaseItemType() != BaseItemType.UserView && mCurrentItem.getBaseItemType() != BaseItemType.CollectionFolder) {
if (mCurrentItem != null && mCurrentItem.getBaseItemType() != BaseItemKind.USER_VIEW && mCurrentItem.getBaseItemType() != BaseItemKind.COLLECTION_FOLDER) {
Timber.d("Refresh item \"%s\"", mCurrentItem.getFullName(requireContext()));
mCurrentItem.refresh(new EmptyResponse() {
@Override
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/browsing/StdRowsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.jellyfin.androidtv.ui.shared.MessageListener;
import org.jellyfin.androidtv.util.KeyProcessor;
import org.jellyfin.apiclient.interaction.EmptyResponse;
import org.jellyfin.apiclient.model.dto.BaseItemType;
import org.jellyfin.sdk.model.api.BaseItemKind;
import org.koin.java.KoinJavaComponent;

import java.util.ArrayList;
Expand Down Expand Up @@ -208,7 +208,7 @@ public void onMessageReceived(CustomMessage message) {
}

private void refreshCurrentItem() {
if (mCurrentItem != null && mCurrentItem.getBaseItemType() != BaseItemType.UserView && mCurrentItem.getBaseItemType() != BaseItemType.CollectionFolder) {
if (mCurrentItem != null && mCurrentItem.getBaseItemType() != BaseItemKind.USER_VIEW && mCurrentItem.getBaseItemType() != BaseItemKind.COLLECTION_FOLDER) {
Timber.d("Refresh item \"%s\"", mCurrentItem.getFullName(requireContext()));
mCurrentItem.refresh(new EmptyResponse() {
@Override
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/org/jellyfin/androidtv/ui/card/LegacyImageCardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,21 +116,21 @@ public void setOverlayInfo(BaseRowItem item) {

if (getCardType() == BaseCardView.CARD_TYPE_MAIN_ONLY && item.showCardInfoOverlay()) {
switch (item.getBaseItemType()) {
case Photo:
case PHOTO:
binding.overlayText.setText(item.getBaseItem().getPremiereDate() != null ? android.text.format.DateFormat.getDateFormat(getContext()).format(TimeUtils.convertToLocalDate(item.getBaseItem().getPremiereDate())) : item.getFullName(getContext()));
binding.icon.setImageResource(R.drawable.ic_camera);
break;
case PhotoAlbum:
case PHOTO_ALBUM:
binding.overlayText.setText(item.getFullName(getContext()));
binding.icon.setImageResource(R.drawable.ic_photos);
break;
case Video:
case VIDEO:
binding.overlayText.setText(item.getFullName(getContext()));
binding.icon.setImageResource(R.drawable.ic_movie);
break;
case Playlist:
case MusicArtist:
case Person:
case PLAYLIST:
case MUSIC_ARTIST:
case PERSON:
binding.overlayText.setText(item.getFullName(getContext()));
hideIcon();
break;
Expand Down
Loading