diff --git a/metadata/com.mgaetan89.showsrage.txt b/metadata/com.mgaetan89.showsrage.txt index a0dcf22e48..8077fb0440 100644 --- a/metadata/com.mgaetan89.showsrage.txt +++ b/metadata/com.mgaetan89.showsrage.txt @@ -41,10 +41,9 @@ Build:1.0.1,15 gradle=yes Build:1.1,16 - disable=patch doesn't apply commit=v1.1 subdir=app - patch=0001-Remove-Google-Play-Services-dependency.patch + patch=0001-Remove-Google-Play-Services-dependency-v1.1.patch;0002-Update-gradle-plugin-to-1.4.0-beta6-and-disable-scre-v1.1.patch gradle=yes Maintainer Notes: diff --git a/metadata/com.mgaetan89.showsrage/0001-Remove-Google-Play-Services-dependency-v1.1.patch b/metadata/com.mgaetan89.showsrage/0001-Remove-Google-Play-Services-dependency-v1.1.patch new file mode 100644 index 0000000000..fa19ccd692 --- /dev/null +++ b/metadata/com.mgaetan89.showsrage/0001-Remove-Google-Play-Services-dependency-v1.1.patch @@ -0,0 +1,60 @@ +diff --git a/app/build.gradle b/app/build.gradle +index d800eb8..e69a5e6 100644 +--- a/app/build.gradle ++++ b/app/build.gradle +@@ -116,7 +116,6 @@ dependencies { + compile 'com.android.support:support-v4:23.0.1' + compile 'com.github.bumptech.glide:glide:3.6.1' + compile 'com.github.bumptech.glide:okhttp-integration:1.3.1' +- compile 'com.google.android.gms:play-services-cast:8.1.0' + compile 'com.squareup.okhttp:okhttp:2.5.0' + compile 'com.squareup.okhttp:okhttp-urlconnection:2.5.0' + compile 'com.squareup.retrofit:retrofit:1.9.0' +diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml +index 4b57473..13098f9 100644 +--- a/app/src/main/AndroidManifest.xml ++++ b/app/src/main/AndroidManifest.xml +@@ -61,10 +61,6 @@ + android:name="com.mgaetan89.showsrage.helper.OkHttpGlideModule" + android:value="GlideModule"/> + +- +- + +diff --git a/app/src/main/java/com/mgaetan89/showsrage/fragment/EpisodeDetailFragment.java b/app/src/main/java/com/mgaetan89/showsrage/fragment/EpisodeDetailFragment.java +index 3dd2e49..e5b6e55 100644 +--- a/app/src/main/java/com/mgaetan89/showsrage/fragment/EpisodeDetailFragment.java ++++ b/app/src/main/java/com/mgaetan89/showsrage/fragment/EpisodeDetailFragment.java +@@ -349,9 +349,6 @@ public class EpisodeDetailFragment extends MediaRouteDiscoveryFragment implement + } + + private void displayStreamingMenus(Episode episode) { +- if (this.castMenu != null) { +- this.castMenu.setVisible(this.isCastMenuVisible(episode)); +- } + + if (this.playVideoMenu != null) { + this.playVideoMenu.setVisible(this.isPlayMenuVisible(episode)); +@@ -393,17 +390,7 @@ public class EpisodeDetailFragment extends MediaRouteDiscoveryFragment implement + } + + private boolean isCastMenuVisible(@Nullable Episode episode) { +- FragmentActivity activity = this.getActivity(); +- +- if (activity == null) { +- return false; +- } +- +- SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity); +- boolean episodeDownloaded = this.isEpisodeDownloaded(episode); +- boolean viewInExternalVideoPlayer = preferences.getBoolean("stream_in_chromecast", false); +- +- return episodeDownloaded && viewInExternalVideoPlayer; ++ return false; + } + + private boolean isEpisodeDownloaded(@Nullable Episode episode) { diff --git a/metadata/com.mgaetan89.showsrage/0002-Update-gradle-plugin-to-1.4.0-beta6-and-disable-scre-v1.1.patch b/metadata/com.mgaetan89.showsrage/0002-Update-gradle-plugin-to-1.4.0-beta6-and-disable-scre-v1.1.patch new file mode 100644 index 0000000000..60283379bd --- /dev/null +++ b/metadata/com.mgaetan89.showsrage/0002-Update-gradle-plugin-to-1.4.0-beta6-and-disable-scre-v1.1.patch @@ -0,0 +1,40 @@ +From 7a91d5f297ea20ca11674017661cd3f6eee97d2a Mon Sep 17 00:00:00 2001 +From: Olivier Mehani +Date: Thu, 15 Oct 2015 22:41:05 +1100 +Subject: [PATCH 2/2] Update gradle plugin to 1.4.0-beta6, and disable + screen-density resConfigs + +Signed-off-by: Olivier Mehani +--- + app/build.gradle | 1 - + build.gradle | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/app/build.gradle b/app/build.gradle +index e69a5e6..f5a24fe 100644 +--- a/app/build.gradle ++++ b/app/build.gradle +@@ -14,7 +14,6 @@ android { + versionCode 16 + versionName '1.1' + resConfigs 'en', 'fr' +- resConfigs 'anydpi', 'hdpi', 'mdpi', 'xhdpi', 'xxhdpi', 'xxxhdpi' + } + + compileOptions { +diff --git a/build.gradle b/build.gradle +index 4b730f9..350c32b 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -6,7 +6,7 @@ buildscript { + } + + dependencies { +- classpath 'com.android.tools.build:gradle:1.4.0-beta1' ++ classpath 'com.android.tools.build:gradle:1.4.0-beta6' + classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.1.1' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0' + } +-- +2.6.1 +