Skip to content

Commit

Permalink
Updates samples to v3.34.0.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 650647617
  • Loading branch information
google-ima-devrel-bot authored and IMA Developer Relations committed Jul 11, 2024
1 parent 7911199 commit c8443e3
Show file tree
Hide file tree
Showing 37 changed files with 1,176 additions and 44 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
regex:
- "AdvancedExample"
- "BasicExample"
- "CloudVideoStitcherExample"
- "ExoPlayerExample"
- "SampleVideoPlayer"
- "PodServingExample"
Expand Down
6 changes: 3 additions & 3 deletions AdvancedExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {

defaultConfig {
applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand All @@ -34,13 +34,13 @@ repositories {
dependencies {
def media3_version = "1.3.1"
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.media3:media3-ui:$media3_version"
implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
implementation "androidx.media3:media3-exoplayer-dash:$media3_version"
implementation 'androidx.mediarouter:mediarouter:1.7.0'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.33.0'
implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.34.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import android.content.Context;
import android.util.Log;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import com.google.ads.interactivemedia.v3.api.AdErrorEvent;
import com.google.ads.interactivemedia.v3.api.AdEvent;
import com.google.ads.interactivemedia.v3.api.AdsLoader;
Expand Down Expand Up @@ -47,15 +48,14 @@ public interface Logger {
void log(String logMessage);
}

private ImaSdkFactory sdkFactory;
private final ImaSdkFactory sdkFactory;
private AdsLoader adsLoader;
private StreamManager streamManager;
private StreamDisplayContainer displayContainer;
private List<VideoStreamPlayer.VideoStreamPlayerCallback> playerCallbacks;
private final List<VideoStreamPlayer.VideoStreamPlayerCallback> playerCallbacks;

private SampleVideoPlayer videoPlayer;
private Context context;
private ViewGroup adUiContainer;
private final Context context;
private final ViewGroup adUiContainer;

private long bookMarkContentTimeMs; // Bookmarked content time, in milliseconds.
private long snapBackTimeMs; // Stream time to snap back to, in milliseconds.
Expand Down Expand Up @@ -84,11 +84,12 @@ private void createAdsLoader() {
// Change any settings as necessary here.
settings.setPlayerType(PLAYER_TYPE);
VideoStreamPlayer videoStreamPlayer = createVideoStreamPlayer();
displayContainer = ImaSdkFactory.createStreamDisplayContainer(adUiContainer, videoStreamPlayer);
StreamDisplayContainer displayContainer =
ImaSdkFactory.createStreamDisplayContainer(adUiContainer, videoStreamPlayer);
videoPlayer.setSampleVideoPlayerCallback(
new SampleVideoPlayer.SampleVideoPlayerCallback() {
@Override
public void onUserTextReceived(String userText) {
public void onUserTextReceived(@NonNull String userText) {
for (VideoStreamPlayer.VideoStreamPlayerCallback callback : playerCallbacks) {
callback.onUserTextReceived(userText);
}
Expand Down Expand Up @@ -184,7 +185,7 @@ private StreamRequest buildStreamRequest(VideoListFragment.VideoListItem videoLi
private VideoStreamPlayer createVideoStreamPlayer() {
return new VideoStreamPlayer() {
@Override
public void loadUrl(String url, List<HashMap<String, String>> subtitles) {
public void loadUrl(@NonNull String url, @NonNull List<HashMap<String, String>> subtitles) {
videoPlayer.setStreamUrl(url);
videoPlayer.play();

Expand Down Expand Up @@ -214,12 +215,12 @@ public int getVolume() {
}

@Override
public void addCallback(VideoStreamPlayerCallback videoStreamPlayerCallback) {
public void addCallback(@NonNull VideoStreamPlayerCallback videoStreamPlayerCallback) {
playerCallbacks.add(videoStreamPlayerCallback);
}

@Override
public void removeCallback(VideoStreamPlayerCallback videoStreamPlayerCallback) {
public void removeCallback(@NonNull VideoStreamPlayerCallback videoStreamPlayerCallback) {
playerCallbacks.remove(videoStreamPlayerCallback);
}

Expand Down Expand Up @@ -263,6 +264,7 @@ public void seek(long timeMs) {
videoPlayer.seekTo(timeMs);
}

@NonNull
@Override
public VideoProgressUpdate getContentProgress() {
if (videoPlayer == null) {
Expand Down
1 change: 0 additions & 1 deletion AdvancedExample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#Mon Jan 14 17:57:16 PST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions BasicExample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {

defaultConfig {
applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
Expand All @@ -34,11 +34,11 @@ repositories {
dependencies {
def media3_version = "1.3.1"
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation "androidx.media3:media3-ui:$media3_version"
implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
implementation "androidx.media3:media3-exoplayer-dash:$media3_version"
implementation 'androidx.mediarouter:mediarouter:1.7.0'
implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.33.0'
implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.34.0'
}
16 changes: 7 additions & 9 deletions BasicExample/app/src/main/res/layout/activity_my.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
tools:ignore="MergeRootFrame">

<RelativeLayout
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/black"
android:id="@+id/videoLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
Expand All @@ -32,13 +31,12 @@
android:background="@color/black" />
</RelativeLayout>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/descriptionLayout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.6">
<LinearLayout
android:id="@+id/descriptionLayout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.6">

<TextView
android:id="@+id/playerDescription"
Expand Down
1 change: 0 additions & 1 deletion BasicExample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#Mon Jan 14 17:01:17 PST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
43 changes: 43 additions & 0 deletions CloudVideoStitcherExample/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
apply plugin: 'com.android.application'

android {
namespace 'com.google.ads.interactivemedia.v3.samples.videoplayerapp'
compileSdk 34

// Java 17 required by Gradle 8+
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

defaultConfig {
applicationId "com.google.ads.interactivemedia.v3.samples.videoplayerapp"
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

repositories {
google()
mavenCentral()
}

dependencies {
def media3_version = "1.3.1"
implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation "androidx.media3:media3-ui:$media3_version"
implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
implementation "androidx.media3:media3-exoplayer-dash:$media3_version"
implementation 'androidx.mediarouter:mediarouter:1.7.0'
implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.34.0'
}
15 changes: 15 additions & 0 deletions CloudVideoStitcherExample/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Add project specific ProGuard rules here.
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
24 changes: 24 additions & 0 deletions CloudVideoStitcherExample/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<!-- Required permissions for the video player -->
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:taskAffinity="">
<activity
android:name=".MyActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Loading

0 comments on commit c8443e3

Please sign in to comment.