extracted module touch

common/build.gradle

@@ -6,7 +6,7 @@ android {
 
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 17
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
@@ -31,6 +31,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:25.4.0'
+    compile 'com.android.support:multidex:1.0.2'
+
     compile 'com.github.satyan:sugar:1.4'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     compile 'io.reactivex.rxjava2:rxjava:2.0.1'

common/src/debug/java/de/nicidienase/chaosflix/ChaosflixApplication.java

@@ -0,0 +1,31 @@
+package de.nicidienase.chaosflix;
+
+import android.app.Application;
+import android.content.Context;
+import android.support.multidex.MultiDex;
+
+import com.orm.SugarContext;
+
+/**
+ * Created by felix on 18.03.17.
+ */
+
+public class ChaosflixApplication extends Application {
+	@Override
+	public void onCreate() {
+		super.onCreate();
+		SugarContext.init(this);
+	}
+
+	@Override
+	public void onTerminate() {
+		SugarContext.terminate();
+		super.onTerminate();
+	}
+
+	@Override
+	protected void attachBaseContext(Context base) {
+		MultiDex.install(base);
+		super.attachBaseContext(base);
+	}
+}

common/src/main/AndroidManifest.xml

@@ -1,2 +1,8 @@
 <manifest package="de.nicidienase.chaosflix"
-          xmlns:android="http://schemas.android.com/apk/res/android"/>
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <meta-data android:name="DATABASE" android:value="mediaccc.db" />
+    <meta-data android:name="VERSION" android:value="4" />
+    <meta-data android:name="QUERY_LOG" android:value="false" />
+    <meta-data android:name="DOMAIN_PACKAGE_NAME" android:value="de.nicidienase.chaosflix" />
+</manifest>

common/src/main/java/de/nicidienase/chaosflix/common/entities/PlaybackProgress.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/WatchlistItem.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/Conference.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/ConferencesWrapper.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/Event.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/Metadata.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/recording/Recording.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/streaming/Group.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/streaming/LiveConference.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/streaming/Room.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/streaming/Stream.java

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

common/src/main/java/de/nicidienase/chaosflix/common/entities/streaming/StreamUrl.java

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

common/src/main/java/de/nicidienase/chaosflix/common/network/MediaApiService.java

@@ -1,4 +1,4 @@
-package de.nicidienase.chaosflix.shared.network;
+package de.nicidienase.chaosflix.common.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.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 de.nicidienase.chaosflix.common.entities.recording.Conference;
+import de.nicidienase.chaosflix.common.entities.recording.ConferencesWrapper;
+import de.nicidienase.chaosflix.common.entities.recording.Event;
+import de.nicidienase.chaosflix.common.entities.recording.Recording;
+import de.nicidienase.chaosflix.common.entities.streaming.LiveConference;
 import io.reactivex.Observable;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.OkHttpClient;

common/src/main/java/de/nicidienase/chaosflix/common/network/RecordingService.java

@@ -1,11 +1,11 @@
-package de.nicidienase.chaosflix.shared.network;
+package de.nicidienase.chaosflix.common.network;
 
 import java.util.List;
 
-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.common.entities.recording.Conference;
+import de.nicidienase.chaosflix.common.entities.recording.ConferencesWrapper;
+import de.nicidienase.chaosflix.common.entities.recording.Event;
+import de.nicidienase.chaosflix.common.entities.recording.Recording;
 import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Path;

common/src/main/java/de/nicidienase/chaosflix/common/network/StreamingService.java

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

common/src/main/res/drawable-hdpi/default_background.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <gradient
+        android:angle="-270"
+        android:endColor="@color/background_gradient_end"
+        android:startColor="@color/background_gradient_start"/>
+</shape>

common/src/main/res/drawable-xhdpi/default_background.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <gradient
+        android:angle="-270"
+        android:endColor="@color/background_gradient_end"
+        android:startColor="@color/background_gradient_start"/>
+</shape>

common/src/main/res/drawable/ic_local_movies_white_24dp.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0"
+        android:width="24dp">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18,3v2h-2L16,3L8,3v2L6,5L6,3L4,3v18h2v-2h2v2h8v-2h2v2h2L20,3h-2zM8,17L6,17v-2h2v2zM8,13L6,13v-2h2v2zM8,9L6,9L6,7h2v2zM18,17h-2v-2h2v2zM18,13h-2v-2h2v2zM18,9h-2L16,7h2v2z"/>
+</vector>

common/src/main/res/drawable/ic_videocam_white_24dp.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0"
+        android:width="24dp">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/>
+</vector>

common/src/main/res/drawable/player_bg_gradient_dark.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:angle="90"
+        android:centerColor="#00000000"
+        android:endColor="#B2000000"
+        android:startColor="#B2000000"
+        android:type="linear"/>
+
+</shape>

common/src/main/res/values/colors.xml

@@ -0,0 +1,18 @@
+<resources>
+    <color name="background_gradient_start">#000000</color>
+    <color name="background_gradient_end">#DDDDDD</color>
+    <color name="fastlane_background">#0096a6</color>
+    <color name="search_opaque">#ffaa3f</color>
+    <color name="selected_background">#ffaa3f</color>
+    <color name="detail_background">#0096a6</color>
+    <color name="soft_opaque">#30000000</color>
+    <color name="img_soft_opaque">#30FF0000</color>
+    <color name="img_full_opaque">#00000000</color>
+    <color name="black_opaque">#AA000000</color>
+    <color name="black">#59000000</color>
+    <color name="white">#FFFFFF</color>
+    <color name="orange_transparent">#AAFADCA7</color>
+    <color name="orange">#FADCA7</color>
+    <color name="yellow">#EEFF41</color>
+    <color name="default_background">#3d3d3d</color>
+</resources>

common/src/main/res/values/dimens.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="detail_thumb_width">274dp</dimen>
+    <dimen name="detail_thumb_height">274dp</dimen>
+    <dimen name="spinner_width">50dp</dimen>
+    <dimen name="spinner_height">50dp</dimen>
+</resources>

common/src/main/res/values/strings.xml

@@ -1,5 +1,40 @@
 <resources>
-    <string name="app_name">Chaosflix-Common</string>
     <string name="api_media_ccc_url">https://api.media.ccc.de</string>
     <string name="streaming_media_ccc_url">https://streaming.media.ccc.de</string>
+    <!--<string name="streaming_media_ccc_url">http://192.168.178.98:8000</string>-->
+
+    <string name="app_name">Chaosflix</string>
+    <string name="related_movies">Related Videos</string>
+    <string name="error">Error</string>
+    <string name="ok">OK</string>
+    <string name="pause">Pause</string>
+    <string name="play">Play</string>
+    <string name="stop">Stop</string>
+
+
+    <string name="video_error_media_load_timeout">Media loading timed out</string>
+    <string name="video_error_server_inaccessible">Media server was not reachable</string>
+    <string name="video_error_unknown_error">Failed to load video</string>
+    <string name="error_fragment_message">An error occurred</string>
+    <string name="dismiss_error">Dismiss</string>
+    <string name="oops">Oops</string>
+    <string name="random_talks_on_this_track">Random Talks in the same Track</string>
+    <string name="random_talks">Other random Talks at this Conference</string>
+    <string name="resume_question">Resume previous position or start from beginning</string>
+    <string name="start_again">Start again</string>
+    <string name="resume">Resume</string>
+    <string name="related_talks">Related Talks</string>
+    <string name="recomendations">Recomendations</string>
+    <string name="watchlist">Watchlist</string>
+    <string name="recordings">Recordings</string>
+    <string name="streaming_prefix">[streaming]</string>
+    <string name="conferences">Conferences</string>
+    <string name="remove_from_watchlist">Remove from Watchlist</string>
+    <string name="add_to_watchlist">Add to Watchlist</string>
+    <string name="streams">Streams</string>
+    <string name="livestreams">Livestreams</string>
+    <string name="watchlist_message">You can find you watchlist on the Homescreen of Chaosflix</string>
+    <string name="watchlist_preferences_key">watchlist</string>
+    <string name="watchlist_dialog_needed">new-watchlist</string>
+    <string name="return_to_homescreen">Return to Homescreen</string>
 </resources>

settings.gradle

@@ -1 +1 @@
-include ':leanback', ':common'
+include ':leanback', ':common', ':touch'