Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2024-11-26 22:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix typo

Browse source
This commit is contained in:
Felix 2017-09-06 20:26:50 +02:00
parent bb010279d7
commit 65ab7bde4c
12 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedAcitivty.java → app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedActivity.java
View file

@ -17,7 +17,7 @@ import io.reactivex.Single;
* Created by felix on 24.03.17.
*/
public class AbstractServiceConnectedAcitivty extends Activity {
public class AbstractServiceConnectedActivity extends Activity {
private MediaApiService mMediaApiService = null;
private ServiceConnection conn;
private boolean mConnected = false;
@ -63,7 +63,7 @@ public class AbstractServiceConnectedAcitivty extends Activity {
mConnected = false;
}
};
AbstractServiceConnectedAcitivty.this.bindService(s, conn, Context.BIND_AUTO_CREATE);
AbstractServiceConnectedActivity.this.bindService(s, conn, Context.BIND_AUTO_CREATE);
}
});
}

2
app/src/main/java/de/nicidienase/chaosflix/activities/ConferencesActivity.java
View file

@ -8,7 +8,7 @@ import de.nicidienase.chaosflix.R;
* Created by felix on 18.03.17.
*/
public class ConferencesActivity extends AbstractServiceConnectedAcitivty {
public class ConferencesActivity extends AbstractServiceConnectedActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

2
app/src/main/java/de/nicidienase/chaosflix/activities/DetailsActivity.java
View file

@ -21,7 +21,7 @@ import de.nicidienase.chaosflix.R;
/*
* Details activity class that loads LeanbackDetailsFragment class
*/
public class DetailsActivity extends AbstractServiceConnectedAcitivty {
public class DetailsActivity extends AbstractServiceConnectedActivity {
public static final String SHARED_ELEMENT_NAME = "hero";
public static final String EVENT = "event";

2
app/src/main/java/de/nicidienase/chaosflix/activities/EventDetailsActivity.java
View file

@ -9,7 +9,7 @@ import de.nicidienase.chaosflix.R;
* Created by felix on 18.03.17.
*/
public class EventDetailsActivity extends AbstractServiceConnectedAcitivty {
public class EventDetailsActivity extends AbstractServiceConnectedActivity {
public static final String EVENT = "event";
public static final String SHARED_ELEMENT_NAME = "transision_element";

2
app/src/main/java/de/nicidienase/chaosflix/activities/EventsActivity.java
View file

@ -4,7 +4,7 @@ import android.os.Bundle;
import de.nicidienase.chaosflix.R;
public class EventsActivity extends AbstractServiceConnectedAcitivty {
public class EventsActivity extends AbstractServiceConnectedActivity {
public static final String CONFERENCE_ID = "conference_id";
public static final String CONFERENCE = "conference";

2
app/src/main/java/de/nicidienase/chaosflix/activities/PlayerActivity.java
View file

@ -48,7 +48,7 @@ import de.nicidienase.chaosflix.fragments.OverlayFragment;
* Created by felix on 26.03.17.
*/
public class PlayerActivity extends AbstractServiceConnectedAcitivty
public class PlayerActivity extends AbstractServiceConnectedActivity
implements OverlayFragment.PlaybackControlListener {
private static final String TAG = PlayerActivity.class.getSimpleName();

6
app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java
View file

@ -20,7 +20,7 @@ import de.nicidienase.chaosflix.BuildConfig;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.entities.WatchlistItem;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.ConferencesWrapper;
@ -68,7 +68,7 @@ public class ConferencesBrowseFragment extends BrowseFragment {
mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
watchListAdapter = new ArrayObjectAdapter(cardPresenter);
Disposable disposable = ((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
Disposable disposable = ((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
.subscribe(mediaApiService -> {
mDisposables.add(Observable.zip(mediaApiService.getStreamingConferences(),
mediaApiService.getConferences(),
@ -165,7 +165,7 @@ public class ConferencesBrowseFragment extends BrowseFragment {
}
private Disposable updateWatchlist(List<WatchlistItem> watchlistItems) {
return ((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
return ((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(mediaApiService -> {
showWatchlist();

4
app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java
View file

@ -11,7 +11,7 @@ import java.util.List;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.entities.recording.Conference;
import io.reactivex.android.schedulers.AndroidSchedulers;
@ -29,7 +29,7 @@ public class ConferencesGridFragment extends VerticalGridFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
.subscribe(mediaApiService -> {
mediaApiService.getConferences()
.observeOn(AndroidSchedulers.mainThread())

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

@ -48,7 +48,7 @@ import java.util.TimerTask;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.activities.EventsActivity;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.Event;
@ -79,7 +79,7 @@ public class EventsBrowseFragment extends BrowseFragment {
conferenceId = this.getActivity().getIntent().getIntExtra(EventsActivity.CONFERENCE_ID, 0);
mConference = this.getActivity().getIntent().getParcelableExtra(EventsActivity.CONFERENCE);
((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
.subscribe(mediaApiService -> {
mediaApiService.getConference(mConference.getApiID())
.observeOn(AndroidSchedulers.mainThread())

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

@ -42,7 +42,7 @@ import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.EventDetailsDescriptionPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.activities.ConferencesActivity;
import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.activities.EventDetailsActivity;
@ -174,7 +174,7 @@ public class EventsDetailsFragment extends DetailsFragment {
mPresenterSelector.addClassPresenter(ListRow.class, new ListRowPresenter());
final ArrayObjectAdapter adapter = new ArrayObjectAdapter(mPresenterSelector);
((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
.doOnError(t -> browseErrorFragment.setErrorContent(t.getMessage()))
.subscribe(mediaApiService -> {
mMediaApiService = mediaApiService;

4
app/src/main/java/de/nicidienase/chaosflix/fragments/OverlayFragment.java
View file

@ -26,7 +26,7 @@ import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.PlaybackHelper;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.entities.PlaybackProgress;
import de.nicidienase.chaosflix.entities.recording.Event;
@ -229,7 +229,7 @@ public class OverlayFragment extends PlaybackFragment {
private Row getRelatedItems() {
ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(new CardPresenter());
final long[] related = mSelectedEvent.getMetadata().getRelated();
mDisposables.add(((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
mDisposables.add(((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
mediaApiService -> {

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'me.tatarka:gradle-retrolambda:3.6.0'
// NOTE: Do not place your application dependencies here; they belong