From c19b39a216de24f4a4d7090d3d7f80ccfa82ad16 Mon Sep 17 00:00:00 2001 From: gianlucaparadise Date: Tue, 12 Oct 2021 08:51:53 +0200 Subject: [PATCH] Updated cast-framework dependency - Fix Dialog opener context --- android/build.gradle | 2 +- .../flutter_cast_framework/cast/CastDialogOpener.kt | 5 ++--- example/android/app/build.gradle | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 648f9fd..d67becc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - api "com.google.android.gms:play-services-cast-framework:17.1.0" + api "com.google.android.gms:play-services-cast-framework:19.0.0" // Lifecycle implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" diff --git a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/CastDialogOpener.kt b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/CastDialogOpener.kt index 7a2f9ac..26b5f5b 100644 --- a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/CastDialogOpener.kt +++ b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/CastDialogOpener.kt @@ -7,7 +7,6 @@ import androidx.mediarouter.app.MediaRouteChooserDialog import androidx.mediarouter.app.MediaRouteControllerDialog import com.gianlucaparadise.flutter_cast_framework.FlutterCastFrameworkPlugin import com.google.android.gms.cast.framework.CastContext -import io.flutter.plugin.common.PluginRegistry object CastDialogOpener { fun showCastDialog(applicationContext: Context, activity: Activity) { @@ -19,11 +18,11 @@ object CastDialogOpener { try { if (castSession != null) { // This dialog allows the user to control or disconnect from the currently selected route. - MediaRouteControllerDialog(applicationContext, themeResId) + MediaRouteControllerDialog(activity, themeResId) .show() } else { // This dialog allows the user to choose a route that matches a given selector. - MediaRouteChooserDialog(applicationContext, themeResId).apply { + MediaRouteChooserDialog(activity, themeResId).apply { routeSelector = castContext.mergedSelector show() } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index cfea839..07013a6 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -62,8 +62,8 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.3.1' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' }