Merge pull request #407 from ooyala/PLAYER-4837

[PLAYER-4837] Merge Candidate to Dev for Sample Apps
ooyala · Dec 4, 2018 · 936c192 · 936c192
2 parents 7a6bb2f + dfb6959
commit 936c192
Show file tree

Hide file tree

Showing 584 changed files with 105,831 additions and 857 deletions.
diff --git a/AdvancedPlaybackSampleApp/app/build.gradle b/AdvancedPlaybackSampleApp/app/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         applicationId "com.ooyala.sample.AdvancedPlaybackSampleApp"
-        minSdkVersion 16
+        minSdkVersion rootProject.minSdkVersion
         multiDexEnabled true
-        targetSdkVersion 27
+        targetSdkVersion rootProject.targetSdkVersion
 
         // Added due to https://github.com/facebook/react-native/issues/2814
         ndk {
@@ -83,24 +82,25 @@ dependencies {
     implementation files('libs/OoyalaSDK.aar')
     implementation files('libs/OoyalaSkinSDK.aar')
 
-    implementation 'com.google.android.gms:play-services-ads:15.0.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.google.android.exoplayer:exoplayer:2.8.3'
-    implementation 'com.android.support:multidex:1.0.3'
+    // App dependencies
+    implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
+    implementation "androidx.legacy:legacy-support-v4:$rootProject.supportLibraryVersion"
+    implementation "androidx.recyclerview:recyclerview:$rootProject.supportLibraryVersion"
+    implementation "androidx.multidex:multidex:$rootProject.multidexVersion"
+    implementation "com.google.android.exoplayer:exoplayer:$rootProject.exoplayerVersion"
+    implementation "com.google.android.gms:play-services-ads:$rootProject.gmsAdsVersion"
+    implementation "javax.inject:javax.inject:$rootProject.injectVersion"
 
     //react-native dependencies
-    implementation 'com.facebook.fresco:fresco:1.3.0'
-    implementation 'com.facebook.fresco:imagepipeline-okhttp3:1.3.0'
-    implementation 'com.facebook.soloader:soloader:0.1.0'
-    implementation 'com.google.code.findbugs:jsr305:3.0.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.6.0'
-    implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.6.0'
-    implementation 'com.squareup.okio:okio:1.13.0'
-    implementation 'org.webkit:android-jsc:r174650'
-    implementation 'com.facebook.stetho:stetho:1.2.0'
-    implementation 'com.facebook.stetho:stetho-okhttp:1.2.0'
-    implementation 'javax.inject:javax.inject:1'
+    implementation "com.facebook.fresco:fresco:$rootProject.frescoVersion"
+    implementation "com.facebook.fresco:imagepipeline-okhttp3:$rootProject.imagePipelineVersion"
+    implementation "com.facebook.soloader:soloader:$rootProject.soloaderVersion"
+    implementation "com.facebook.stetho:stetho:$rootProject.stethoVersion"
+    implementation "com.facebook.stetho:stetho-okhttp:$rootProject.stethoOkhttpVersion"
+    implementation "com.google.code.findbugs:jsr305:$rootProject.findbugsVersion"
+    implementation "com.squareup.okhttp3:okhttp:$rootProject.okhttpVersion"
+    implementation "com.squareup.okhttp3:okhttp-urlconnection:$rootProject.urlconnectionVersion"
+    implementation "com.squareup.okio:okio:$rootProject.okioVersion"
+    implementation "org.webkit:android-jsc:$rootProject.androidJscVersion"
     implementation(group:'com.facebook', name:'react-native', version:'0.55.4', ext:'aar')
 }
diff --git a/AdvancedPlaybackSampleApp/app/src/main/AndroidManifest.xml b/AdvancedPlaybackSampleApp/app/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat">
+        android:theme="@style/Theme.AppCompat"
+        android:usesCleartextTraffic="true">
 
         <activity
             android:name="com.ooyala.sample.lists.AdvancedPlaybackListActivity"

diff --git a/...edPlaybackSampleApp/app/src/main/java/com/ooyala/sample/players/AbstractHookActivity.java b/...edPlaybackSampleApp/app/src/main/java/com/ooyala/sample/players/AbstractHookActivity.java
@@ -2,16 +2,14 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 import com.ooyala.android.OoyalaNotification;
 import com.ooyala.android.OoyalaPlayer;
-import com.ooyala.android.performance.PerformanceMonitor;
-import com.ooyala.android.ui.OoyalaPlayerControls;
 import com.ooyala.android.ui.OoyalaPlayerLayoutController;
 import com.ooyala.android.util.SDCardLogcatOoyalaEventsLogger;
 

diff --git a/...aybackSampleApp/app/src/main/java/com/ooyala/sample/players/AbstractSkinHookActivity.java b/...aybackSampleApp/app/src/main/java/com/ooyala/sample/players/AbstractSkinHookActivity.java
@@ -2,10 +2,10 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;

diff --git a/...laybackSampleApp/app/src/main/java/com/ooyala/sample/players/AudioOnlyPlayerActivity.java b/...laybackSampleApp/app/src/main/java/com/ooyala/sample/players/AudioOnlyPlayerActivity.java
@@ -1,7 +1,7 @@
 package com.ooyala.sample.players;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import com.ooyala.android.OoyalaPlayer;
 import com.ooyala.android.OoyalaPlayerLayout;

diff --git a/...PlaybackSampleApp/app/src/main/java/com/ooyala/sample/players/InsertAdPlayerActivity.java b/...PlaybackSampleApp/app/src/main/java/com/ooyala/sample/players/InsertAdPlayerActivity.java
@@ -46,6 +46,7 @@ void completePlayerSetup(boolean asked) {
 			Options options = new Options.Builder().setUseExoPlayer(true).build();
 			player = new OoyalaPlayer(pcode, new PlayerDomain(domain), options);
 			playerLayoutController = new OoyalaPlayerLayoutController(playerLayout, player);
+			player.enableSSL(false);
 			player.addObserver(this);
 
 			//  Set up performance monitoring to watch standard events and ads events.

diff --git a/...pleApp/app/src/main/java/com/ooyala/sample/utils/AbstractDefaultOoyalaPlayerControls.java b/...pleApp/app/src/main/java/com/ooyala/sample/utils/AbstractDefaultOoyalaPlayerControls.java
@@ -226,6 +226,11 @@ public void setVisible(boolean visible) {
     }
   }
 
+  @Override
+  public void refresh() {
+
+  }
+
   protected abstract void updateButtonStates();
 
   protected abstract void setupControls();

diff --git a/AdvancedPlaybackSampleApp/app/src/main/java/com/ooyala/sample/utils/CustomOverlay.java b/AdvancedPlaybackSampleApp/app/src/main/java/com/ooyala/sample/utils/CustomOverlay.java
@@ -93,4 +93,10 @@ public void setVisible(boolean b) {
   public void update(Observable observable, Object o) {
 
   }
+
+  @Override
+  public void refresh() {
+
+  }
+
 }
diff --git a/AdvancedPlaybackSampleApp/build.gradle b/AdvancedPlaybackSampleApp/build.gradle
@@ -1,18 +1,60 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    // Define versions in a single place
+    ext {
+        // Sdk and tools
+        compileSdkVersion = 28
+        minSdkVersion = 16
+        targetSdkVersion = 28
+
+        // App dependencies
+        exoplayerVersion = '2.8.3'
+        hamcrestVersion = '1.3'
+        injectVersion = '1'
+        jacksonVersion = '2.2.3'
+        junitVersion = '4.12'
+        kotlin_version = '1.2.71'
+        multidexVersion = '2.0.0'
+        supportLibraryVersion = '1.0.0'
+        volleyVersion = '1.1.1'
+
+        // Google Play Services
+        gmsAdsVersion = '15.0.1'
+        gmsAuthVersion = '15.0.1'
+        interactiveMediaVersion = '3.8.5'
+
+        // Project dependencies
+        bintrayVersion = '0.8.1'
+        gradleVersion = '3.2.1'
+        mavenGradleVersion = '1.5'
+
+        // react-native dependencies
+        androidJscVersion = 'r174650'
+        findbugsVersion = '3.0.0'
+        frescoVersion = '1.3.0'
+        imagePipelineVersion = '1.3.0'
+        okhttpVersion = '3.6.0'
+        okioVersion = '1.13.0'
+        soloaderVersion = '0.1.0'
+        stethoVersion = '1.2.0'
+        stethoOkhttpVersion = '1.2.0'
+        urlconnectionVersion = '3.6.0'
+    }
+
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath "com.android.tools.build:gradle:$gradleVersion"
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
 

diff --git a/AdvancedPlaybackSampleApp/gradle.properties b/AdvancedPlaybackSampleApp/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/AdvancedPlaybackSampleApp/gradle/wrapper/gradle-wrapper.properties b/AdvancedPlaybackSampleApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 10 18:23:18 PDT 2017
+#Mon Oct 29 14:38:15 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/BasicPlaybackSampleApp/app/build.gradle b/BasicPlaybackSampleApp/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         applicationId "com.ooyala.sample.BasicPlaybackSampleApp"
-        minSdkVersion 16
-        targetSdkVersion 27
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
     }
 
     buildTypes {
@@ -29,13 +28,15 @@ task copyTask(type: Copy) {
 tasks.copyTask.execute()
 
 dependencies {
-// For development purposes only
-//    compile project(':core')
-
+    // For development purposes only
+    // implementation project(':core')
     implementation files('libs/OoyalaSDK.aar')
-    implementation 'com.google.android.exoplayer:exoplayer:2.8.3'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.google.android.gms:play-services-ads:15.0.1'
 
+    // App dependencies
+    implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
+    implementation "androidx.legacy:legacy-support-v4:$rootProject.supportLibraryVersion"
+    implementation "com.google.android.exoplayer:exoplayer:$rootProject.exoplayerVersion"
+
+    // Google Play Services
+    implementation "com.google.android.gms:play-services-ads:$rootProject.gmsAdsVersion"
 }
diff --git a/BasicPlaybackSampleApp/app/src/main/java/com/ooyala/sample/players/AbstractHookActivity.java b/BasicPlaybackSampleApp/app/src/main/java/com/ooyala/sample/players/AbstractHookActivity.java
@@ -2,10 +2,10 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 import com.ooyala.android.OoyalaNotification;

diff --git a/BasicPlaybackSampleApp/build.gradle b/BasicPlaybackSampleApp/build.gradle
@@ -1,18 +1,42 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    // Define versions in a single place
+    ext {
+        // Sdk and tools
+        compileSdkVersion = 28
+        minSdkVersion = 16
+        targetSdkVersion = 28
+
+        // App dependencies
+        exoplayerVersion = '2.8.3'
+        injectVersion = '1'
+        jacksonVersion = '2.2.3'
+        junitVersion = '4.12'
+        supportLibraryVersion = '1.0.0'
+
+        // Google Play Services
+        gmsAdsVersion = '15.0.1'
+
+        // Project dependencies
+        bintrayVersion = '0.8.1'
+        gradleVersion = '3.2.1'
+        mavenGradleVersion = '1.5'
+    }
+
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath "com.android.tools.build:gradle:$gradleVersion"
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
 

diff --git a/BasicPlaybackSampleApp/gradle.properties b/BasicPlaybackSampleApp/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/BasicPlaybackSampleApp/gradle/wrapper/gradle-wrapper.properties b/BasicPlaybackSampleApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 10 18:24:18 PDT 2017
+#Mon Oct 29 14:43:40 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/ChromecastSampleApp/app/build.gradle b/ChromecastSampleApp/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
         applicationId "com.ooyala.sample.ChromecastSampleApp"
-        minSdkVersion 16
-        targetSdkVersion 27
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
@@ -40,15 +39,17 @@ dependencies {
 // For development purposes only
 //    compile project(':cast')
 //    compile project(':core')
-
-    implementation 'com.google.android.exoplayer:exoplayer:2.8.3'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:mediarouter-v7:27.1.1'
-    implementation 'com.google.android.gms:play-services-cast-framework:15.0.1'
     implementation files('libs/OoyalaSDK.aar')
     implementation files('libs/OoyalaCastSDK.aar')
 
+    implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
+    implementation "androidx.mediarouter:mediarouter:$rootProject.mediaRouterVersion"
+    implementation "com.google.android.exoplayer:exoplayer:$rootProject.exoplayerVersion"
+
+    // Google Play Services
+    implementation "com.google.android.gms:play-services-cast-framework:$rootProject.gmsCastVersion"
+
 //    For Development purpose only:
 //    implementation project(':core')
 //    implementation project(':cast')
-}
+}
diff --git a/ChromecastSampleApp/app/src/main/AndroidManifest.xml b/ChromecastSampleApp/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:allowBackup="true"

diff --git a/ChromecastSampleApp/app/src/main/java/com/ooyala/sample/ChromecastListActivity.java b/ChromecastSampleApp/app/src/main/java/com/ooyala/sample/ChromecastListActivity.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.View;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		android.useAndroidX=true
		android.enableJetifier=true