Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2024-11-27 06:30:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

move entities to separate sub-packages

Browse source
This commit is contained in:
Felix 2017-03-24 23:45:26 +01:00
parent 5069bd6c92
commit c61046b844
25 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/de/nicidienase/chaosflix/CardPresenter.java
View file

@ -17,13 +17,12 @@ package de.nicidienase.chaosflix;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.v17.leanback.widget.ImageCardView; import android.support.v17.leanback.widget.ImageCardView;
import android.support.v17.leanback.widget.Presenter; import android.support.v17.leanback.widget.Presenter;
import android.util.Log;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
/* /*
* A CardPresenter is used to generate Views and bind Objects to them on demand. * A CardPresenter is used to generate Views and bind Objects to them on demand.

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

@ -3,7 +3,7 @@ package de.nicidienase.chaosflix;
import android.support.v17.leanback.widget.AbstractDetailsDescriptionPresenter; import android.support.v17.leanback.widget.AbstractDetailsDescriptionPresenter;
import android.text.TextUtils; import android.text.TextUtils;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
/** /**
* Created by felix on 18.03.17. * Created by felix on 18.03.17.

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

@ -14,8 +14,8 @@ import android.support.v4.app.ActivityOptionsCompat;
import de.nicidienase.chaosflix.activities.DetailsActivity; import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.activities.EventDetailsActivity; import de.nicidienase.chaosflix.activities.EventDetailsActivity;
import de.nicidienase.chaosflix.activities.EventsActivity; import de.nicidienase.chaosflix.activities.EventsActivity;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
/** /**
* Created by felix on 21.03.17. * Created by felix on 21.03.17.

4
app/src/main/java/de/nicidienase/chaosflix/activities/PlaybackOverlayActivity.java
View file

@ -30,8 +30,8 @@ import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.SimpleTarget;
import de.nicidienase.chaosflix.R; import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.Recording; import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.fragments.PlaybackOverlayFragment; import de.nicidienase.chaosflix.fragments.PlaybackOverlayFragment;
/** /**

3
app/src/main/java/de/nicidienase/chaosflix/entities/Conference.java → app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conference.java
View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities; package de.nicidienase.chaosflix.entities.recording;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@ -10,7 +10,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Created by felix on 11.03.17. * Created by felix on 11.03.17.

2
app/src/main/java/de/nicidienase/chaosflix/entities/Conferences.java → app/src/main/java/de/nicidienase/chaosflix/entities/recording/Conferences.java
View file

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

2
app/src/main/java/de/nicidienase/chaosflix/entities/Event.java → app/src/main/java/de/nicidienase/chaosflix/entities/recording/Event.java
View file

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

2
app/src/main/java/de/nicidienase/chaosflix/entities/Recording.java → app/src/main/java/de/nicidienase/chaosflix/entities/recording/Recording.java
View file

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

4
app/src/main/java/de/nicidienase/chaosflix/entities/Group.java → app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Group.java
View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities; package de.nicidienase.chaosflix.entities.streaming;
import java.util.List; import java.util.List;
@ -6,7 +6,7 @@ import java.util.List;
* Created by felix on 23.03.17. * Created by felix on 23.03.17.
*/ */
class Group { public class Group {
String group; String group;
List<Room> rooms; List<Room> rooms;

6
app/src/main/java/de/nicidienase/chaosflix/entities/StreamingConference.java → app/src/main/java/de/nicidienase/chaosflix/entities/streaming/LiveConference.java
View file

@ -1,12 +1,14 @@
package de.nicidienase.chaosflix.entities; package de.nicidienase.chaosflix.entities.streaming;
import java.util.List; import java.util.List;
import de.nicidienase.chaosflix.entities.streaming.Group;
/** /**
* Created by felix on 23.03.17. * Created by felix on 23.03.17.
*/ */
public class StreamingConference { public class LiveConference {
String conference; String conference;
String slug; String slug;
String author; String author;

4
app/src/main/java/de/nicidienase/chaosflix/entities/Room.java → app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Room.java
View file

@ -1,4 +1,4 @@
package de.nicidienase.chaosflix.entities; package de.nicidienase.chaosflix.entities.streaming;
import java.util.List; import java.util.List;
@ -6,7 +6,7 @@ import java.util.List;
* Created by felix on 23.03.17. * Created by felix on 23.03.17.
*/ */
class Room { public class Room {
String slug; String slug;
String shedulename; String shedulename;
String thumb; String thumb;

2
app/src/main/java/de/nicidienase/chaosflix/entities/Stream.java → app/src/main/java/de/nicidienase/chaosflix/entities/streaming/Stream.java
View file

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

4
app/src/main/java/de/nicidienase/chaosflix/entities/StreamUrl.java → app/src/main/java/de/nicidienase/chaosflix/entities/streaming/StreamUrl.java
View file

@ -1,10 +1,10 @@
package de.nicidienase.chaosflix.entities; package de.nicidienase.chaosflix.entities.streaming;
/** /**
* Created by felix on 23.03.17. * Created by felix on 23.03.17.
*/ */
class StreamUrl { public class StreamUrl {
String display; String display;
String tech; String tech;
String url; String url;

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

@ -16,8 +16,10 @@ import java.util.Set;
import de.nicidienase.chaosflix.CardPresenter; import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener; import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.R; import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.activities.ConferencesActivity;
import de.nicidienase.chaosflix.entities.Conferences; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.Conferences;
import de.nicidienase.chaosflix.network.MediaApiService;
import de.nicidienase.chaosflix.network.RecordingClient; import de.nicidienase.chaosflix.network.RecordingClient;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;

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

@ -12,8 +12,8 @@ import java.util.List;
import de.nicidienase.chaosflix.CardPresenter; import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener; import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.Conferences; import de.nicidienase.chaosflix.entities.recording.Conferences;
import de.nicidienase.chaosflix.network.RecordingClient; import de.nicidienase.chaosflix.network.RecordingClient;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;

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

@ -49,8 +49,8 @@ import de.nicidienase.chaosflix.CardPresenter;
import de.nicidienase.chaosflix.ItemViewClickedListener; import de.nicidienase.chaosflix.ItemViewClickedListener;
import de.nicidienase.chaosflix.R; import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.EventsActivity; import de.nicidienase.chaosflix.activities.EventsActivity;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.network.RecordingClient; import de.nicidienase.chaosflix.network.RecordingClient;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;

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

@ -39,9 +39,9 @@ import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.activities.DetailsActivity; import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.activities.EventDetailsActivity; import de.nicidienase.chaosflix.activities.EventDetailsActivity;
import de.nicidienase.chaosflix.activities.PlaybackOverlayActivity; import de.nicidienase.chaosflix.activities.PlaybackOverlayActivity;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.Recording; import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.network.RecordingClient; import de.nicidienase.chaosflix.network.RecordingClient;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;

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

@ -52,8 +52,8 @@ import com.bumptech.glide.request.target.SimpleTarget;
import java.util.HashMap; import java.util.HashMap;
import de.nicidienase.chaosflix.activities.DetailsActivity; import de.nicidienase.chaosflix.activities.DetailsActivity;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.Recording; import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.network.RecordingClient; import de.nicidienase.chaosflix.network.RecordingClient;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;

5
app/src/main/java/de/nicidienase/chaosflix/network/MediaApiService.java
View file

@ -7,6 +7,11 @@ import android.os.IBinder;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import de.nicidienase.chaosflix.R; import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.recording.Conferences;
import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.recording.Recording;
import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import retrofit2.Retrofit; import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.gson.GsonConverterFactory;

12
app/src/main/java/de/nicidienase/chaosflix/network/RecordingClient.java
View file

@ -1,15 +1,11 @@
package de.nicidienase.chaosflix.network; package de.nicidienase.chaosflix.network;
import android.util.Log;
import java.io.IOException;
import java.util.List; import java.util.List;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.Conferences; import de.nicidienase.chaosflix.entities.recording.Conferences;
import de.nicidienase.chaosflix.entities.Event; import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.Recording; import de.nicidienase.chaosflix.entities.recording.Recording;
import retrofit2.Call;
import retrofit2.Retrofit; import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.gson.GsonConverterFactory;
import retrofit2.http.Path; import retrofit2.http.Path;

10
app/src/main/java/de/nicidienase/chaosflix/network/RecordingService.java
View file

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

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

@ -2,8 +2,7 @@ package de.nicidienase.chaosflix.network;
import java.util.List; import java.util.List;
import de.nicidienase.chaosflix.entities.StreamingConference; import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import retrofit2.Call;
import retrofit2.Retrofit; import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory; import retrofit2.converter.gson.GsonConverterFactory;

4
app/src/main/java/de/nicidienase/chaosflix/network/StreamingService.java
View file

@ -2,8 +2,8 @@ package de.nicidienase.chaosflix.network;
import java.util.List; import java.util.List;
import de.nicidienase.chaosflix.entities.StreamingConference; import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import retrofit2.Call; import io.reactivex.Observable;
import retrofit2.http.GET; import retrofit2.http.GET;
/** /**

8
app/src/test/java/de/nicidienase/chaosflix/RecordingClientTest.java
View file

@ -10,14 +10,10 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import de.nicidienase.chaosflix.entities.Conference; import de.nicidienase.chaosflix.entities.recording.Conference;
import de.nicidienase.chaosflix.entities.Conferences; import de.nicidienase.chaosflix.entities.recording.Event;
import de.nicidienase.chaosflix.entities.Event;
import de.nicidienase.chaosflix.entities.Recording;
import de.nicidienase.chaosflix.network.RecordingClient; import de.nicidienase.chaosflix.network.RecordingClient;
/** /**

2
app/src/test/java/de/nicidienase/chaosflix/StreamingClientTest.java
View file

@ -9,7 +9,7 @@ import static org.junit.Assert.*;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import de.nicidienase.chaosflix.entities.StreamingConference; import de.nicidienase.chaosflix.entities.streaming.LiveConference;
import de.nicidienase.chaosflix.network.StreamingClient; import de.nicidienase.chaosflix.network.StreamingClient;
import de.nicidienase.chaosflix.network.StreamingService; import de.nicidienase.chaosflix.network.StreamingService;
import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockResponse;