Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-27 04:37:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

resize image for playstore-button

Browse source
This commit is contained in:
Felix 2017-10-25 22:50:49 +02:00
parent 8f8aa6bcf4
commit 1406921789
10 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -5,8 +5,8 @@ A Android TV / FireTV app to watch content from media.ccc.de
[![Install from Amazon](https://images-na.ssl-images-amazon.com/images/G/01/mobile-apps/devportal2/res/images/amazon-underground-app-us-black.png)](http://www.amazon.com/gp/product/B06Y3GYYGB/ref=mas_pm_chaosflix)
[![Installieren auf Amazon](https://images-na.ssl-images-amazon.com/images/G/01/mobile-apps/devportal2/res/images/amazon-underground-app-de-black.png)](http://www.amazon.de/gp/product/B06Y3GYYGB/ref=mas_pm_chaosflix)
[![Get it on Google Play](https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png)](https://play.google.com/store/apps/details?id=de.nicidienase.chaosflix&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1)
[![Jetzt bei Google Play](https://play.google.com/intl/en_us/badges/images/generic/de_badge_web_generic.png)](https://play.google.com/store/apps/details?id=de.nicidienase.chaosflix&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1)
[![Get it on Google Play](https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png | width=200)](https://play.google.com/store/apps/details?id=de.nicidienase.chaosflix&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1)
[![Jetzt bei Google Play](https://play.google.com/intl/en_us/badges/images/generic/de_badge_web_generic.png | width=200)](https://play.google.com/store/apps/details?id=de.nicidienase.chaosflix&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1)
You can get an APK you can install under [Releases](https://github.com/NiciDieNase/chaosflix/releases).

10
common/src/debug/java/de/nicidienase/chaosflix/ChaosflixApplication.java
View file

@ -6,15 +6,20 @@ import android.support.multidex.MultiDex;
import com.orm.SugarContext;
import org.jetbrains.annotations.NotNull;
/**
* Created by felix on 18.03.17.
*/
public class ChaosflixApplication extends Application {
private static Context APPLICATION_CONTEXT;
@Override
public void onCreate() {
super.onCreate();
SugarContext.init(this);
APPLICATION_CONTEXT = this;
}
@Override
@ -28,4 +33,9 @@ public class ChaosflixApplication extends Application {
MultiDex.install(base);
super.attachBaseContext(base);
}
@NotNull
public static Context getContext() {
return APPLICATION_CONTEXT;
}
}

1
common/src/main/res/drawable/icon_notext_144x144.png
View file

@ -1 +0,0 @@
../../../../../amazon_icons/icon_notext_144x144.png

1
common/src/main/res/drawable/icon_notext_48x48.png
View file

@ -1 +0,0 @@
../../../../../amazon_icons/icon_notext_48x48.png

1
common/src/main/res/drawable/icon_notext_512x512.png
View file

@ -1 +0,0 @@
../../../../../amazon_icons/icon_notext_512x512.png

1
common/src/main/res/drawable/toolbar_icon.png
View file

@ -1 +0,0 @@
../../../../../amazon_icons/toolbar_icon.png

10
touch/build.gradle
View file

@ -59,14 +59,18 @@ dependencies {
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
compile "com.android.support:design:${rootProject.ext.supportLibraryVersion}"
implementation "android.arch.lifecycle:runtime:1.0.0"
implementation "android.arch.lifecycle:runtime:1.0.3"
implementation "android.arch.lifecycle:extensions:${rootProject.ext.archCompVersion}"
implementation "android.arch.lifecycle:common-java8:1.0.0-beta1"
implementation "android.arch.lifecycle:common-java8:1.0.0-rc1"
implementation "android.arch.persistence.room:runtime:${rootProject.ext.archCompVersion}"
implementation "android.arch.persistence.room:rxjava2:${rootProject.ext.archCompVersion}"
kapt 'com.android.databinding:compiler:3.0.0-beta7'
kapt 'com.android.databinding:compiler:3.0.0-rc2'
kapt "android.arch.lifecycle:compiler:${rootProject.ext.archCompVersion}"
kapt "android.arch.persistence.room:compiler:${rootProject.ext.archCompVersion}"
compile "org.jetbrains.kotlin:kotlin-reflect:1.1.50"
compile 'com.google.dagger:dagger:2.10'
kapt 'com.google.dagger:dagger-compiler:2.10'
compile 'com.google.android.exoplayer:exoplayer:r2.5.2'
compile 'com.squareup.picasso:picasso:2.5.2'

1
touch/src/main/assets/icon.png
View file

@ -1 +0,0 @@
../../../../amazon_icons/icon_small_114x144.png

1
touch/src/main/assets/license.txt
View file

@ -1 +0,0 @@
../../../../LICENSE

6
touch/src/main/java/de/nicidienase/chaosflix/touch/activities/BrowseActivity.java
View file

@ -23,7 +23,9 @@ import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.common.entities.recording.Conference;
import de.nicidienase.chaosflix.common.entities.recording.Event;
import de.nicidienase.chaosflix.common.entities.recording.Recording;
import de.nicidienase.chaosflix.touch.BrowseViewModel;
import de.nicidienase.chaosflix.touch.ChaosflixViewModel;
import de.nicidienase.chaosflix.touch.ViewModelFactory;
import de.nicidienase.chaosflix.touch.fragments.ConferencesTabBrowseFragment;
import de.nicidienase.chaosflix.touch.fragments.EventDetailsFragment;
import de.nicidienase.chaosflix.touch.fragments.EventsFragment;
@ -43,14 +45,14 @@ public class BrowseActivity extends AppCompatActivity implements
private static final String TAG = BrowseActivity.class.getSimpleName();
CompositeDisposable mDisposables = new CompositeDisposable();
private ChaosflixViewModel mViewModel;
private BrowseViewModel mViewModel;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_container_layout);
mViewModel = ViewModelProviders.of(this).get(ChaosflixViewModel.class);
mViewModel = ViewModelProviders.of(this, ViewModelFactory.INSTANCE).get(BrowseViewModel.class);
if(savedInstanceState == null){
ConferencesTabBrowseFragment browseFragment