2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-28 13:17:09 +00:00

refactor packages to separate TV and phone/tablet code

This commit is contained in:
Felix 2017-09-14 12:04:33 +02:00
parent 85cc29927a
commit 69c967411f
43 changed files with 135 additions and 132 deletions

View file

@ -24,7 +24,7 @@
-dontwarn javax.annotation.**
-dontwarn sun.misc.Unsafe
-dontwarn okio.**
-keep class de.nicidienase.chaosflix.entities.** { *; }
-keep class de.nicidienase.chaosflix.shared.entities.** { *; }
#retrofit
-dontwarn retrofit2.**
-keep class retrofit2.** { *; }

View file

@ -16,8 +16,7 @@ import de.nicidienase.chaosflix.test.R;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
import de.nicidienase.chaosflix.activities.ConferencesActivity;
import de.nicidienase.chaosflix.network.MediaApiService;
import de.nicidienase.chaosflix.leanback.activities.ConferencesActivity;
import okhttp3.mockwebserver.MockWebServer;
import static android.support.test.InstrumentationRegistry.getInstrumentation;

View file

@ -8,10 +8,8 @@ import android.support.test.rule.ServiceTestRule;
import android.support.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -20,8 +18,7 @@ import java.util.Collections;
import java.util.concurrent.TimeoutException;
import de.nicidienase.chaosflix.test.R;
import de.nicidienase.chaosflix.network.MediaApiService;
import okhttp3.mockwebserver.MockResponse;
import de.nicidienase.chaosflix.shared.network.MediaApiService;
import okhttp3.mockwebserver.MockWebServer;
import static junit.framework.Assert.fail;

View file

@ -19,7 +19,7 @@
android:theme="@style/Theme.Leanback"
android:name=".ChaosflixApplication">
<activity
android:name="de.nicidienase.chaosflix.activities.ConferencesActivity"
android:name=".leanback.activities.ConferencesActivity"
android:banner="@drawable/banner"
android:icon="@drawable/icon"
android:label="@string/app_name"
@ -30,18 +30,18 @@
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".activities.EventsActivity"
<activity android:name=".leanback.activities.EventsActivity"
android:exported="true"
android:theme="@style/Theme.Leanback"/>
<activity android:name=".activities.EventDetailsActivity"
<activity android:name=".leanback.activities.EventDetailsActivity"
android:exported="true"
android:theme="@style/Theme.Leanback"/>
<activity android:name=".activities.DetailsActivity"
<activity android:name=".leanback.activities.DetailsActivity"
android:exported="true"
android:theme="@style/Theme.Leanback"/>
<activity android:name=".activities.PlayerActivity"
<activity android:name=".leanback.activities.PlayerActivity"
android:theme="@style/Theme.Leanback"/>
<service android:name=".network.MediaApiService"/>
<service android:name=".shared.network.MediaApiService"/>
<meta-data android:name="DATABASE" android:value="mediaccc.db" />
<meta-data android:name="VERSION" android:value="4" />

View file

@ -12,7 +12,7 @@
* the License.
*/
package de.nicidienase.chaosflix;
package de.nicidienase.chaosflix.leanback;
import android.graphics.drawable.Drawable;
import android.support.v17.leanback.widget.ImageCardView;
@ -22,10 +22,11 @@ import android.widget.ImageView;
import com.bumptech.glide.Glide;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.entities.streaming.Room;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.shared.entities.streaming.Room;
/*
* A CardPresenter is used to generate Views and bind Objects to them on demand.

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix;
package de.nicidienase.chaosflix.leanback;
import android.content.Context;
import android.support.v17.leanback.widget.Presenter;
@ -9,8 +9,9 @@ import android.view.ViewGroup;
import android.widget.TextView;
import butterknife.ButterKnife;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.streaming.Room;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.streaming.Room;
/**
* Created by felix on 18.03.17.

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix;
package de.nicidienase.chaosflix.leanback;
import android.content.Context;
import android.content.res.Resources;
@ -13,6 +13,8 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import de.nicidienase.chaosflix.R;
/**
* Created by felix on 16.04.17.
*/

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix;
package de.nicidienase.chaosflix.leanback;
import android.app.Fragment;
import android.content.Intent;
@ -11,12 +11,12 @@ import android.support.v17.leanback.widget.RowPresenter;
import android.support.v4.app.ActivityOptionsCompat;
import android.util.Log;
import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.activities.EventDetailsActivity;
import de.nicidienase.chaosflix.activities.EventsActivity;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.streaming.Room;
import de.nicidienase.chaosflix.leanback.activities.DetailsActivity;
import de.nicidienase.chaosflix.leanback.activities.EventDetailsActivity;
import de.nicidienase.chaosflix.leanback.activities.EventsActivity;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.streaming.Room;
/**
* Created by felix on 21.03.17.

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix;
package de.nicidienase.chaosflix.leanback;
import android.annotation.TargetApi;
@ -22,11 +22,11 @@ import android.support.v17.leanback.widget.PlaybackControlsRowPresenter;
import android.support.v17.leanback.widget.SparseArrayObjectAdapter;
import android.util.Log;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.entities.streaming.Room;
import de.nicidienase.chaosflix.entities.streaming.StreamUrl;
import de.nicidienase.chaosflix.fragments.OverlayFragment;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.recording.Recording;
import de.nicidienase.chaosflix.shared.entities.streaming.Room;
import de.nicidienase.chaosflix.shared.entities.streaming.StreamUrl;
import de.nicidienase.chaosflix.leanback.fragments.OverlayFragment;
import io.reactivex.disposables.Disposable;
/**

View file

@ -1,8 +1,9 @@
package de.nicidienase.chaosflix.activities;
package de.nicidienase.chaosflix.leanback.activities;
import android.os.Bundle;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
/**
* Created by felix on 18.03.17.

View file

@ -12,11 +12,12 @@
* the License.
*/
package de.nicidienase.chaosflix.activities;
package de.nicidienase.chaosflix.leanback.activities;
import android.os.Bundle;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
/*
* Details activity class that loads LeanbackDetailsFragment class

View file

@ -1,9 +1,10 @@
package de.nicidienase.chaosflix.activities;
package de.nicidienase.chaosflix.leanback.activities;
import android.os.Bundle;
import android.os.PersistableBundle;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
/**
* Created by felix on 18.03.17.

View file

@ -1,8 +1,9 @@
package de.nicidienase.chaosflix.activities;
package de.nicidienase.chaosflix.leanback.activities;
import android.os.Bundle;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
public class EventsActivity extends AbstractServiceConnectedActivity {

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.activities;
package de.nicidienase.chaosflix.leanback.activities;
import android.net.Uri;
import android.os.Bundle;
@ -42,7 +42,8 @@ import com.google.android.exoplayer2.util.Util;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.fragments.OverlayFragment;
import de.nicidienase.chaosflix.leanback.fragments.OverlayFragment;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
/**
* Created by felix on 26.03.17.

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.fragments;
package de.nicidienase.chaosflix.leanback.fragments;
import android.app.Fragment;
import android.app.FragmentManager;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.fragments;
package de.nicidienase.chaosflix.leanback.fragments;
import android.os.Bundle;
import android.support.v17.leanback.app.BrowseFragment;
@ -17,15 +17,15 @@ import java.util.Map;
import java.util.Set;
import de.nicidienase.chaosflix.BuildConfig;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.leanback.CardPresenter;
import de.nicidienase.chaosflix.leanback.ItemViewClickedListener;
import de.nicidienase.chaosflix.R;
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;
import de.nicidienase.chaosflix.entities.streaming.Group;
import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.shared.entities.WatchlistItem;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import de.nicidienase.chaosflix.shared.entities.recording.ConferencesWrapper;
import de.nicidienase.chaosflix.shared.entities.streaming.Group;
import de.nicidienase.chaosflix.shared.entities.streaming.LiveConference;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.fragments;
package de.nicidienase.chaosflix.leanback.fragments;
import android.os.Bundle;
import android.os.Handler;
@ -9,10 +9,10 @@ import android.support.v17.leanback.widget.VerticalGridPresenter;
import java.util.Collections;
import java.util.List;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.leanback.CardPresenter;
import de.nicidienase.chaosflix.leanback.ItemViewClickedListener;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import io.reactivex.android.schedulers.AndroidSchedulers;
/**

View file

@ -12,7 +12,7 @@
* the License.
*/
package de.nicidienase.chaosflix.fragments;
package de.nicidienase.chaosflix.leanback.fragments;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
@ -45,13 +45,13 @@ import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.leanback.CardPresenter;
import de.nicidienase.chaosflix.leanback.ItemViewClickedListener;
import de.nicidienase.chaosflix.R;
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;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.leanback.activities.EventsActivity;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import io.reactivex.android.schedulers.AndroidSchedulers;
public class EventsBrowseFragment extends BrowseFragment {

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.fragments;
package de.nicidienase.chaosflix.leanback.fragments;
import android.content.Context;
import android.content.Intent;
@ -38,25 +38,25 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.EventDetailsDescriptionPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.leanback.CardPresenter;
import de.nicidienase.chaosflix.leanback.EventDetailsDescriptionPresenter;
import de.nicidienase.chaosflix.leanback.ItemViewClickedListener;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.activities.ConferencesActivity;
import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.activities.EventDetailsActivity;
import de.nicidienase.chaosflix.activities.PlayerActivity;
import de.nicidienase.chaosflix.entities.WatchlistItem;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.entities.streaming.Group;
import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.entities.streaming.Room;
import de.nicidienase.chaosflix.entities.streaming.Stream;
import de.nicidienase.chaosflix.entities.streaming.StreamUrl;
import de.nicidienase.chaosflix.network.MediaApiService;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.leanback.activities.ConferencesActivity;
import de.nicidienase.chaosflix.leanback.activities.DetailsActivity;
import de.nicidienase.chaosflix.leanback.activities.EventDetailsActivity;
import de.nicidienase.chaosflix.leanback.activities.PlayerActivity;
import de.nicidienase.chaosflix.shared.entities.WatchlistItem;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.recording.Recording;
import de.nicidienase.chaosflix.shared.entities.streaming.Group;
import de.nicidienase.chaosflix.shared.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.shared.entities.streaming.Room;
import de.nicidienase.chaosflix.shared.entities.streaming.Stream;
import de.nicidienase.chaosflix.shared.entities.streaming.StreamUrl;
import de.nicidienase.chaosflix.shared.network.MediaApiService;
import io.reactivex.android.schedulers.AndroidSchedulers;
/**

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.fragments;
package de.nicidienase.chaosflix.leanback.fragments;
import android.app.Activity;
import android.app.AlertDialog;
@ -22,17 +22,17 @@ import android.util.Log;
import java.util.List;
import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.PlaybackHelper;
import de.nicidienase.chaosflix.leanback.CardPresenter;
import de.nicidienase.chaosflix.leanback.ItemViewClickedListener;
import de.nicidienase.chaosflix.leanback.PlaybackHelper;
import de.nicidienase.chaosflix.R;
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;
import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.entities.streaming.Room;
import de.nicidienase.chaosflix.entities.streaming.StreamUrl;
import de.nicidienase.chaosflix.shared.AbstractServiceConnectedActivity;
import de.nicidienase.chaosflix.leanback.activities.DetailsActivity;
import de.nicidienase.chaosflix.shared.entities.PlaybackProgress;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.recording.Recording;
import de.nicidienase.chaosflix.shared.entities.streaming.Room;
import de.nicidienase.chaosflix.shared.entities.streaming.StreamUrl;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.activities;
package de.nicidienase.chaosflix.shared;
import android.app.Activity;
import android.content.ComponentName;
@ -10,7 +10,7 @@ import android.os.IBinder;
import android.os.PersistableBundle;
import android.support.annotation.Nullable;
import de.nicidienase.chaosflix.network.MediaApiService;
import de.nicidienase.chaosflix.shared.network.MediaApiService;
import io.reactivex.Single;
/**

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities;
package de.nicidienase.chaosflix.shared.entities;
import com.orm.SugarRecord;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities;
package de.nicidienase.chaosflix.shared.entities;
import com.orm.SugarRecord;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.recording;
package de.nicidienase.chaosflix.shared.entities.recording;
import android.os.Parcel;
import android.os.Parcelable;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.recording;
package de.nicidienase.chaosflix.shared.entities.recording;
import android.util.Log;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.recording;
package de.nicidienase.chaosflix.shared.entities.recording;
import android.os.Parcel;
import android.os.Parcelable;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.recording;
package de.nicidienase.chaosflix.shared.entities.recording;
import android.os.Parcel;
import android.os.Parcelable;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.recording;
package de.nicidienase.chaosflix.shared.entities.recording;
import android.os.Parcel;
import android.os.Parcelable;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.streaming;
package de.nicidienase.chaosflix.shared.entities.streaming;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.streaming;
package de.nicidienase.chaosflix.shared.entities.streaming;
import java.util.ArrayList;
import java.util.List;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.streaming;
package de.nicidienase.chaosflix.shared.entities.streaming;
import android.os.Parcel;
import android.os.Parcelable;

View file

@ -1,10 +1,8 @@
package de.nicidienase.chaosflix.entities.streaming;
package de.nicidienase.chaosflix.shared.entities.streaming;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities.streaming;
package de.nicidienase.chaosflix.shared.entities.streaming;
import android.os.Parcel;
import android.os.Parcelable;

View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.network;
package de.nicidienase.chaosflix.shared.network;
import android.app.Service;
import android.content.Intent;
@ -11,11 +11,11 @@ import android.util.Log;
import java.util.List;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.ConferencesWrapper;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import de.nicidienase.chaosflix.shared.entities.recording.ConferencesWrapper;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.recording.Recording;
import de.nicidienase.chaosflix.shared.entities.streaming.LiveConference;
import io.reactivex.Observable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.OkHttpClient;

View file

@ -1,11 +1,11 @@
package de.nicidienase.chaosflix.network;
package de.nicidienase.chaosflix.shared.network;
import java.util.List;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.ConferencesWrapper;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.shared.entities.recording.Conference;
import de.nicidienase.chaosflix.shared.entities.recording.ConferencesWrapper;
import de.nicidienase.chaosflix.shared.entities.recording.Event;
import de.nicidienase.chaosflix.shared.entities.recording.Recording;
import io.reactivex.Observable;
import retrofit2.http.GET;
import retrofit2.http.Path;

View file

@ -1,8 +1,8 @@
package de.nicidienase.chaosflix.network;
package de.nicidienase.chaosflix.shared.network;
import java.util.List;
import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.shared.entities.streaming.LiveConference;
import io.reactivex.Observable;
import retrofit2.http.GET;

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:name="de.nicidienase.chaosflix.fragments.ConferencesBrowseFragment"
android:name="de.nicidienase.chaosflix.leanback.fragments.ConferencesBrowseFragment"
android:id="@+id/browse_fragment"
android:orientation="vertical"
android:layout_width="match_parent"

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:name="de.nicidienase.chaosflix.fragments.ConferencesGridFragment"
android:name="de.nicidienase.chaosflix.leanback.fragments.ConferencesGridFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment android:id="@+id/details_fragment"
android:name="de.nicidienase.chaosflix.fragments.EventsDetailsFragment"
android:name="de.nicidienase.chaosflix.leanback.fragments.EventsDetailsFragment"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.DetailsActivity"
tools:context=".leanback.activities.DetailsActivity"
tools:deviceIds="tv"/>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment android:id="@+id/browse_fragment"
android:name="de.nicidienase.chaosflix.fragments.EventsBrowseFragment"
android:name="de.nicidienase.chaosflix.leanback.fragments.EventsBrowseFragment"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.EventsActivity"
tools:context=".leanback.activities.EventsActivity"
tools:deviceIds="tv"
tools:ignore="MergeRootFrame"/>

View file

@ -10,7 +10,7 @@
android:layout_gravity="center"/>
<fragment
android:name="de.nicidienase.chaosflix.fragments.OverlayFragment"
android:name="de.nicidienase.chaosflix.leanback.fragments.OverlayFragment"
android:id="@+id/playback_controls_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

View file

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

View file

@ -1,6 +1,6 @@
#Tue Mar 21 22:31:49 CET 2017
#Thu Sep 14 11:51:55 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip