Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-27 04:37:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

disable stuff I broke in Leanback

Browse source
This commit is contained in:
Felix 2017-10-12 22:43:16 +02:00
parent 139ac99701
commit 084fb3016b
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
leanback/src/main/java/de/nicidienase/chaosflix/leanback/fragments/ConferencesBrowseFragment.java
View file

@ -137,7 +137,6 @@ public class ConferencesBrowseFragment extends BrowseFragment {
}
}
// mRowsAdapter.add(i + 1, new DividerRow());
}
}
}
@ -145,10 +144,10 @@ public class ConferencesBrowseFragment extends BrowseFragment {
@Override
public void onResume() {
super.onResume();
List<WatchlistItem> watchlistItems
= Lists.newArrayList(WatchlistItem.findAll(WatchlistItem.class));
// List<WatchlistItem> watchlistItems
// = Lists.newArrayList(WatchlistItem.findAll(WatchlistItem.class));
// setup and list items
updateWatchlist(watchlistItems);
// updateWatchlist(watchlistItems);
}
private void showWatchlist() {

6
leanback/src/main/java/de/nicidienase/chaosflix/leanback/fragments/EventsDetailsFragment.java
View file

@ -89,7 +89,7 @@ public class EventsDetailsFragment extends DetailsFragment {
public void onActionClicked(Action action) {
Log.d(TAG, "OnActionClicked");
if (action.getId() == ADD_WATCHLIST_ACTION) {
new WatchlistItem(mSelectedEvent.getApiID()).save();
// new WatchlistItem(mSelectedEvent.getApiID()).save();
mRecordingActionsAdapter.replace(0, new Action(REMOVE_WATCHLIST_ACTION, EventsDetailsFragment.this.getString(R.string.remove_from_watchlist)));
SharedPreferences preferences = getActivity().getSharedPreferences(getString(R.string.watchlist_preferences_key), Context.MODE_PRIVATE);
if(preferences.getBoolean(getString(R.string.watchlist_dialog_needed), true)) { // new item
@ -110,7 +110,7 @@ public class EventsDetailsFragment extends DetailsFragment {
}
} else if (action.getId() == REMOVE_WATCHLIST_ACTION) {
if (mWatchlistItem != null) {
mWatchlistItem.delete();
// mWatchlistItem.delete();
}
mRecordingActionsAdapter.replace(0, new Action(ADD_WATCHLIST_ACTION, EventsDetailsFragment.this.getString(R.string.add_to_watchlist)));
} else {
@ -161,7 +161,7 @@ public class EventsDetailsFragment extends DetailsFragment {
if (eventType == DetailsActivity.TYPE_RECORDING) {
mSelectedEvent = getActivity().getIntent()
.getParcelableExtra(DetailsActivity.EVENT);
mWatchlistItem = WatchlistItem.findById(WatchlistItem.class, mSelectedEvent.getApiID());
// mWatchlistItem = WatchlistItem.findById(WatchlistItem.class, mSelectedEvent.getApiID());
} else if (eventType == DetailsActivity.TYPE_STREAM) {
mRoom = getActivity().getIntent()
.getParcelableExtra(DetailsActivity.ROOM);

32
leanback/src/main/java/de/nicidienase/chaosflix/leanback/fragments/OverlayFragment.java
View file

@ -141,10 +141,10 @@ public class OverlayFragment extends PlaybackFragment {
mSelectedRecording = intent.getParcelableExtra(DetailsActivity.RECORDING);
mHelper = new PlaybackHelper(getActivity(), this, mSelectedEvent, mSelectedRecording);
List<PlaybackProgress> progressList = PlaybackProgress.find(PlaybackProgress.class, "event_id = ?", String.valueOf(mSelectedEvent.getApiID()));
if (progressList.size() > 0) {
mPlaybackProgress = progressList.get(0);
}
// List<PlaybackProgress> progressList = PlaybackProgress.find(PlaybackProgress.class, "event_id = ?", String.valueOf(mSelectedEvent.getApiID()));
// if (progressList.size() > 0) {
// mPlaybackProgress = progressList.get(0);
// }
} else if (eventType == DetailsActivity.TYPE_STREAM) {
mSelectedRoom = intent.getParcelableExtra(DetailsActivity.ROOM);
mSelectedStream = intent.getParcelableExtra(DetailsActivity.STREAM_URL);
@ -292,18 +292,18 @@ public class OverlayFragment extends PlaybackFragment {
public void onPause() {
super.onPause();
if (mSelectedEvent != null) {
if (mPlaybackProgress != null) {
if ((mSelectedEvent.getLength() - mCallback.getCurrentPosition() / 1000) > MAX_REMAINING) {
mPlaybackProgress.setProgress(mCallback.getCurrentPosition());
mPlaybackProgress.save();
} else {
mPlaybackProgress.delete();
}
} else if ((mSelectedEvent.getLength() - mCallback.getCurrentPosition() / 1000) > MAX_REMAINING) {
mPlaybackProgress = new PlaybackProgress(mSelectedEvent.getApiID(),
mCallback.getCurrentPosition(), mSelectedRecording.getApiID());
mPlaybackProgress.save();
}
// if (mPlaybackProgress != null) {
// if ((mSelectedEvent.getLength() - mCallback.getCurrentPosition() / 1000) > MAX_REMAINING) {
// mPlaybackProgress.setProgress(mCallback.getCurrentPosition());
// mPlaybackProgress.save();
// } else {
// mPlaybackProgress.delete();
// }
// } else if ((mSelectedEvent.getLength() - mCallback.getCurrentPosition() / 1000) > MAX_REMAINING) {
// mPlaybackProgress = new PlaybackProgress(mSelectedEvent.getApiID(),
// mCallback.getCurrentPosition(), mSelectedRecording.getApiID());
// mPlaybackProgress.save();
// }
}
}