Skip to content

Commit

Permalink
Add constants for Extras
Browse files Browse the repository at this point in the history
  • Loading branch information
@thornbill
thornbill committed Apr 30, 2020
1 parent fbf6364 commit 4bad5ed
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 43 deletions.
19 changes: 10 additions & 9 deletions app/src/main/java/org/jellyfin/androidtv/browsing/BrowseFolderFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import androidx.leanback.widget.RowPresenter;

import org.jellyfin.androidtv.R;
import org.jellyfin.androidtv.constants.Extras;
import org.jellyfin.androidtv.model.repository.SerializerRepository;
import org.jellyfin.androidtv.presentation.GridButtonPresenter;
import org.jellyfin.androidtv.ui.GridButton;
Expand All @@ -31,7 +32,7 @@ public class BrowseFolderFragment extends StdBrowseFragment {

@Override
public void onActivityCreated(Bundle savedInstanceState) {
mFolder = SerializerRepository.INSTANCE.getSerializer().DeserializeFromString(getActivity().getIntent().getStringExtra("Folder"),BaseItemDto.class);
mFolder = SerializerRepository.INSTANCE.getSerializer().DeserializeFromString(getActivity().getIntent().getStringExtra(Extras.Folder), BaseItemDto.class);
if (MainTitle == null) MainTitle = mFolder.getName();
ShowBadge = false;
if (mFolder.getCollectionType() != null) {
Expand Down Expand Up @@ -86,29 +87,29 @@ public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item,
switch (((GridButton) item).getId()) {
case BY_LETTER:
Intent intent = new Intent(getActivity(), ByLetterActivity.class);
intent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
intent.putExtra("IncludeType", itemTypeString);
intent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
intent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(intent);
break;
case GENRES:
Intent genreIntent = new Intent(getActivity(), ByGenreActivity.class);
genreIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
genreIntent.putExtra("IncludeType", itemTypeString);
genreIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
genreIntent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(genreIntent);
break;
case SUGGESTED:
Intent suggIntent = new Intent(getActivity(), SuggestedMoviesActivity.class);
suggIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
suggIntent.putExtra("IncludeType", itemTypeString);
suggIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
suggIntent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(suggIntent);
break;
case PERSONS:
Intent personIntent = new Intent(getActivity(), BrowsePersonsActivity.class);
personIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
personIntent.putExtra("IncludeType", itemTypeString);
personIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
personIntent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(personIntent);
break;
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/browsing/BrowseGridFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.os.Bundle;

import org.jellyfin.androidtv.TvApp;
import org.jellyfin.androidtv.constants.Extras;
import org.jellyfin.androidtv.model.ChangeTriggerType;
import org.jellyfin.androidtv.querying.StdItemQuery;

Expand Down Expand Up @@ -47,7 +48,7 @@ protected void setupQueries(IGridLoader gridLoader) {
case "music":
mAllowViewSelection = false;
//Special queries needed for album artists
String includeType = getActivity().getIntent().getStringExtra("IncludeType");
String includeType = getActivity().getIntent().getStringExtra(Extras.IncludeType);
if ("AlbumArtist".equals(includeType)) {
ArtistsQuery albumArtists = new ArtistsQuery();
albumArtists.setUserId(TvApp.getApplication().getCurrentUser().getId());
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/org/jellyfin/androidtv/browsing/CustomViewFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
import android.os.Bundle;

import org.jellyfin.androidtv.TvApp;
import org.jellyfin.androidtv.constants.Extras;

/**
* Created by Eric on 1/18/2015.
*/
public class CustomViewFragment extends BrowseFolderFragment {
protected String includeType;

@Override
public void onActivityCreated(Bundle savedInstanceState) {
includeType = getActivity().getIntent().getStringExtra("IncludeType");
includeType = getActivity().getIntent().getStringExtra(Extras.IncludeType);
TvApp.getApplication().getLogger().Debug("Item type: %s", includeType);
showViews = false;

Expand Down
33 changes: 17 additions & 16 deletions app/src/main/java/org/jellyfin/androidtv/browsing/EnhancedBrowseFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.jellyfin.androidtv.base.CustomMessage;
import org.jellyfin.androidtv.base.IKeyListener;
import org.jellyfin.androidtv.base.IMessageListener;
import org.jellyfin.androidtv.constants.Extras;
import org.jellyfin.androidtv.details.ItemListActivity;
import org.jellyfin.androidtv.itemhandling.BaseRowItem;
import org.jellyfin.androidtv.itemhandling.ItemLauncher;
Expand Down Expand Up @@ -172,7 +173,7 @@ protected void setupQueries(IRowLoader rowLoader) {
}

protected void setupViews() {
mFolder = SerializerRepository.INSTANCE.getSerializer().DeserializeFromString(getActivity().getIntent().getStringExtra("Folder"), BaseItemDto.class);
mFolder = SerializerRepository.INSTANCE.getSerializer().DeserializeFromString(getActivity().getIntent().getStringExtra(Extras.Folder), BaseItemDto.class);
if (mFolder == null) return;

if (mFolder.getCollectionType() != null) {
Expand Down Expand Up @@ -412,7 +413,7 @@ public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item,
@Override
public void onResponse(DisplayPreferences response) {
Intent folderIntent = new Intent(getActivity(), GenericGridActivity.class);
folderIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
folderIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
getActivity().startActivity(folderIntent);
}
});
Expand All @@ -424,8 +425,8 @@ public void onResponse(DisplayPreferences response) {
@Override
public void onResponse(DisplayPreferences response) {
Intent folderIntent = new Intent(getActivity(), GenericGridActivity.class);
folderIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
folderIntent.putExtra("IncludeType", "MusicAlbum");
folderIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
folderIntent.putExtra(Extras.IncludeType, "MusicAlbum");
getActivity().startActivity(folderIntent);
}
});
Expand All @@ -437,41 +438,41 @@ public void onResponse(DisplayPreferences response) {
@Override
public void onResponse(DisplayPreferences response) {
Intent folderIntent = new Intent(getActivity(), GenericGridActivity.class);
folderIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
folderIntent.putExtra("IncludeType", "AlbumArtist");
folderIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
folderIntent.putExtra(Extras.IncludeType, "AlbumArtist");
getActivity().startActivity(folderIntent);
}
});
break;

case BY_LETTER:
Intent intent = new Intent(getActivity(), ByLetterActivity.class);
intent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
intent.putExtra("IncludeType", itemTypeString);
intent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
intent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(intent);
break;

case GENRES:
Intent genreIntent = new Intent(getActivity(), ByGenreActivity.class);
genreIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
genreIntent.putExtra("IncludeType", itemTypeString);
genreIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
genreIntent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(genreIntent);
break;

case SUGGESTED:
Intent suggIntent = new Intent(getActivity(), SuggestedMoviesActivity.class);
suggIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
suggIntent.putExtra("IncludeType", itemTypeString);
suggIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
suggIntent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(suggIntent);
break;

case PERSONS:
Intent personIntent = new Intent(getActivity(), BrowsePersonsActivity.class);
personIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
personIntent.putExtra("IncludeType", itemTypeString);
personIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(mFolder));
personIntent.putExtra(Extras.IncludeType, itemTypeString);

getActivity().startActivity(personIntent);
break;
Expand All @@ -495,7 +496,7 @@ public void onResponse(DisplayPreferences response) {
seriesTimers.setId("SERIESTIMERS");
seriesTimers.setCollectionType("SeriesTimers");
seriesTimers.setName(mActivity.getString(R.string.lbl_series_recordings));
seriesIntent.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(seriesTimers));
seriesIntent.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(seriesTimers));

getActivity().startActivity(seriesIntent);
break;
Expand All @@ -511,7 +512,7 @@ public void onResponse(DisplayPreferences response) {
BaseItemDto folder = new BaseItemDto();
folder.setId("");
folder.setName(TvApp.getApplication().getResources().getString(R.string.lbl_recorded_tv));
recordings.putExtra("Folder", SerializerRepository.INSTANCE.getSerializer().SerializeToString(folder));
recordings.putExtra(Extras.Folder, SerializerRepository.INSTANCE.getSerializer().SerializeToString(folder));
mActivity.startActivity(recordings);
break;

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/browsing/StdGridFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.jellyfin.androidtv.base.CustomMessage;
import org.jellyfin.androidtv.base.IKeyListener;
import org.jellyfin.androidtv.base.IMessageListener;
import org.jellyfin.androidtv.constants.Extras;
import org.jellyfin.androidtv.itemhandling.BaseRowItem;
import org.jellyfin.androidtv.itemhandling.ItemLauncher;
import org.jellyfin.androidtv.itemhandling.ItemRowAdapter;
Expand Down Expand Up @@ -116,7 +117,7 @@ public class StdGridFragment extends HorizontalGridFragment implements IGridLoad
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

mFolder = SerializerRepository.INSTANCE.getSerializer().DeserializeFromString(getActivity().getIntent().getStringExtra("Folder"), BaseItemDto.class);
mFolder = SerializerRepository.INSTANCE.getSerializer().DeserializeFromString(getActivity().getIntent().getStringExtra(Extras.Folder), BaseItemDto.class);
mParentId = mFolder.getId();
MainTitle = mFolder.getName();
mDisplayPrefs = TvApp.getApplication().getCachedDisplayPrefs(mFolder.getDisplayPreferencesId()); //These should have already been loaded
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/org/jellyfin/androidtv/constants/Extras.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.jellyfin.androidtv.constants

object Extras {
const val Folder = "Folder"
const val IncludeType = "IncludeType"
}

0 comments on commit 4bad5ed

Please sign in to comment.