Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-25 11:47:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

update libs, some refactoring

Browse source
This commit is contained in:
Felix 2017-04-19 23:23:30 +02:00
parent 3e076fd383
commit 3f60a01c21
5 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -46,8 +46,8 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:leanback-v17:25.3.0' compile 'com.android.support:leanback-v17:25.3.1'
compile 'com.android.support:appcompat-v7:25.3.0' compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.github.bumptech.glide:glide:3.7.0' compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1' compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
@ -55,7 +55,7 @@ dependencies {
compile 'com.squareup.retrofit2:retrofit:2.2.0' compile 'com.squareup.retrofit2:retrofit:2.2.0'
compile 'com.squareup.retrofit2:converter-gson:2.2.0' compile 'com.squareup.retrofit2:converter-gson:2.2.0'
compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0' compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
compile 'com.android.support:multidex:1.0.0' compile 'com.android.support:multidex:1.0.1'
compile 'com.google.android.exoplayer:exoplayer:r2.3.1' compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
compile 'com.github.satyan:sugar:1.4' compile 'com.github.satyan:sugar:1.4'

3
app/src/main/java/de/nicidienase/chaosflix/ItemViewClickedListener.java
View file

@ -9,6 +9,7 @@ import android.support.v17.leanback.widget.Presenter;
import android.support.v17.leanback.widget.Row; import android.support.v17.leanback.widget.Row;
import android.support.v17.leanback.widget.RowPresenter; import android.support.v17.leanback.widget.RowPresenter;
import android.support.v4.app.ActivityOptionsCompat; import android.support.v4.app.ActivityOptionsCompat;
import android.util.Log;
import de.nicidienase.chaosflix.activities.DetailsActivity; import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.activities.EventDetailsActivity; import de.nicidienase.chaosflix.activities.EventDetailsActivity;
@ -22,6 +23,7 @@ import de.nicidienase.chaosflix.entities.streaming.Room;
*/ */
public class ItemViewClickedListener implements OnItemViewClickedListener { public class ItemViewClickedListener implements OnItemViewClickedListener {
private static final String TAG = ItemViewClickedListener.class.getSimpleName();
private Fragment fragment; private Fragment fragment;
public ItemViewClickedListener(Fragment fragment) { public ItemViewClickedListener(Fragment fragment) {
@ -31,6 +33,7 @@ public class ItemViewClickedListener implements OnItemViewClickedListener {
@Override @Override
public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item, public void onItemClicked(Presenter.ViewHolder itemViewHolder, Object item,
RowPresenter.ViewHolder rowViewHolder, Row row) { RowPresenter.ViewHolder rowViewHolder, Row row) {
Log.d(TAG, "onItemClicked");
if (item instanceof Conference) { if (item instanceof Conference) {
Conference conference = (Conference) item; Conference conference = (Conference) item;
// Start EventsActivity for this conference // Start EventsActivity for this conference

2
app/src/main/java/de/nicidienase/chaosflix/entities/WatchlistItem.java
View file

@ -7,4 +7,6 @@ import com.orm.SugarRecord;
*/ */
public class WatchlistItem extends SugarRecord { public class WatchlistItem extends SugarRecord {
int eventId;
} }

12
app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java
View file

@ -55,11 +55,9 @@ import de.nicidienase.chaosflix.entities.recording.Event;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
public class EventsBrowseFragment extends BrowseFragment { public class EventsBrowseFragment extends BrowseFragment {
private static final String TAG = "MainFragment"; private static final String TAG = EventsBrowseFragment.class.getSimpleName();
private static final int BACKGROUND_UPDATE_DELAY = 300; private static final int BACKGROUND_UPDATE_DELAY = 300;
private static final int GRID_ITEM_WIDTH = 200;
private static final int GRID_ITEM_HEIGHT = 200;
private static final int FRAGMENT = R.id.browse_fragment; private static final int FRAGMENT = R.id.browse_fragment;
private final Handler mHandler = new Handler(); private final Handler mHandler = new Handler();
@ -95,7 +93,8 @@ public class EventsBrowseFragment extends BrowseFragment {
}); });
prepareBackgroundManager(); prepareBackgroundManager();
setupEventListeners(); setOnItemViewClickedListener(new ItemViewClickedListener(this));
setOnItemViewSelectedListener(new ItemViewSelectedListener());
} }
@Override @Override
@ -170,11 +169,6 @@ public class EventsBrowseFragment extends BrowseFragment {
} }
private void setupEventListeners() {
setOnItemViewClickedListener(new ItemViewClickedListener(this));
setOnItemViewSelectedListener(new ItemViewSelectedListener());
}
protected void updateBackground(String uri) { protected void updateBackground(String uri) {
int width = mMetrics.widthPixels; int width = mMetrics.widthPixels;
int height = mMetrics.heightPixels; int height = mMetrics.heightPixels;

24
app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
View file

@ -96,7 +96,12 @@ public class EventsDetailsFragment extends DetailsFragment {
.getParcelableExtra(DetailsActivity.ROOM); .getParcelableExtra(DetailsActivity.ROOM);
} }
final ArrayObjectAdapter adapter = setupDetailsOverviewRowPresenter(); FullWidthDetailsOverviewRowPresenter mDetailsPresenter
= setupDetailsOverviewRowPresenter();
ClassPresenterSelector mPresenterSelector = new ClassPresenterSelector();
mPresenterSelector.addClassPresenter(DetailsOverviewRow.class, mDetailsPresenter);
mPresenterSelector.addClassPresenter(ListRow.class, new ListRowPresenter());
final ArrayObjectAdapter adapter = new ArrayObjectAdapter(mPresenterSelector);
((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable() ((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
.doOnError(t -> browseErrorFragment.setErrorContent(t.getMessage())) .doOnError(t -> browseErrorFragment.setErrorContent(t.getMessage()))
@ -142,8 +147,8 @@ public class EventsDetailsFragment extends DetailsFragment {
} }
setAdapter(adapter); setAdapter(adapter);
setOnItemViewClickedListener( ItemViewClickedListener listener = new ItemViewClickedListener(EventsDetailsFragment.this);
new ItemViewClickedListener(EventsDetailsFragment.this)); setOnItemViewClickedListener(listener);
browseErrorFragment.dismiss(); browseErrorFragment.dismiss();
}); });
}); });
@ -158,8 +163,7 @@ public class EventsDetailsFragment extends DetailsFragment {
detailsOverviewRow.setActionsAdapter(actionsAdapter); detailsOverviewRow.setActionsAdapter(actionsAdapter);
adapter.add(detailsOverviewRow); adapter.add(detailsOverviewRow);
setAdapter(adapter); setAdapter(adapter);
setOnItemViewClickedListener( setOnItemViewClickedListener(new ItemViewClickedListener(EventsDetailsFragment.this));
new ItemViewClickedListener(EventsDetailsFragment.this));
browseErrorFragment.dismiss(); browseErrorFragment.dismiss();
} }
// TODO add other streams // TODO add other streams
@ -234,7 +238,7 @@ public class EventsDetailsFragment extends DetailsFragment {
return selectedEvents; return selectedEvents;
} }
private ArrayObjectAdapter setupDetailsOverviewRowPresenter() { private FullWidthDetailsOverviewRowPresenter setupDetailsOverviewRowPresenter() {
FullWidthDetailsOverviewRowPresenter mDetailsPresenter = new FullWidthDetailsOverviewRowPresenter( FullWidthDetailsOverviewRowPresenter mDetailsPresenter = new FullWidthDetailsOverviewRowPresenter(
new EventDetailsDescriptionPresenter(getActivity()), new EventDetailsDescriptionPresenter(getActivity()),
new EventDetailsOverviewLogoPresenter()); new EventDetailsOverviewLogoPresenter());
@ -250,6 +254,7 @@ public class EventsDetailsFragment extends DetailsFragment {
prepareEntranceTransition(); prepareEntranceTransition();
mDetailsPresenter.setOnActionClickedListener(action -> { mDetailsPresenter.setOnActionClickedListener(action -> {
Log.d(TAG,"OnActionClicked");
Intent i = new Intent(getActivity(), PlayerActivity.class); Intent i = new Intent(getActivity(), PlayerActivity.class);
i.putExtra(DetailsActivity.TYPE, eventType); i.putExtra(DetailsActivity.TYPE, eventType);
if (eventType == DetailsActivity.TYPE_RECORDING) { if (eventType == DetailsActivity.TYPE_RECORDING) {
@ -276,15 +281,12 @@ public class EventsDetailsFragment extends DetailsFragment {
i.putExtra(DetailsActivity.STREAM_URL, streamUrl); i.putExtra(DetailsActivity.STREAM_URL, streamUrl);
} else { } else {
// TODO handle missing Stream // TODO handle missing Stream
return;
} }
} }
getActivity().startActivity(i); getActivity().startActivity(i);
}); });
return mDetailsPresenter;
ClassPresenterSelector mPresenterSelector = new ClassPresenterSelector();
mPresenterSelector.addClassPresenter(DetailsOverviewRow.class, mDetailsPresenter);
mPresenterSelector.addClassPresenter(ListRow.class, new ListRowPresenter());
return new ArrayObjectAdapter(mPresenterSelector);
} }
private DetailsOverviewRow setupDetailsOverviewRow(Object event) { private DetailsOverviewRow setupDetailsOverviewRow(Object event) {