From f5aefbcec1b879f47328975a2c1f32afe831e93c Mon Sep 17 00:00:00 2001 From: gianlucaparadise Date: Mon, 1 Nov 2021 21:03:36 +0100 Subject: [PATCH] Pigeon: Used renamed APIs - Renamed from `HostApis` to `PlatformBridgeApis` --- .../FlutterCastFrameworkPlugin.kt | 15 +++++++-------- .../cast/MessageCastingChannel.kt | 8 ++++---- ios/Classes/FlutterCastFrameworkPlugin.h | 2 +- ios/Classes/SwiftFlutterCastFrameworkPlugin.swift | 6 +++--- lib/src/cast/CastContext.dart | 10 +++++----- lib/src/cast/SessionManager.dart | 8 ++++---- lib/src/flutter_cast_framework.dart | 6 +++--- 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt index 131fecd..c21dcef 100644 --- a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt +++ b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/FlutterCastFrameworkPlugin.kt @@ -18,7 +18,6 @@ import io.flutter.embedding.engine.plugins.activity.ActivityAware import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding import io.flutter.plugin.common.BinaryMessenger import io.flutter.plugin.common.MethodCall -import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel.MethodCallHandler import io.flutter.plugin.common.MethodChannel.Result import io.flutter.plugin.common.PluginRegistry.Registrar @@ -49,9 +48,9 @@ class FlutterCastFrameworkPlugin : FlutterPlugin, MethodCallHandler, ActivityAwa this.applicationContext = applicationContext castApi = MyApi() - HostApis.CastApi.setup(messenger, castApi) + PlatformBridgeApis.CastHostApi.setup(messenger, castApi) - val castFlutterApi = HostApis.CastFlutterApi(messenger) + val castFlutterApi = PlatformBridgeApis.CastFlutterApi(messenger) flutterApi = castFlutterApi mMessageCastingChannel = MessageCastingChannel(castFlutterApi) @@ -97,8 +96,8 @@ class FlutterCastFrameworkPlugin : FlutterPlugin, MethodCallHandler, ActivityAwa private lateinit var mSessionManager: SessionManager private val mSessionManagerListener = CastSessionManagerListener() - private var castApi : HostApis.CastApi? = null - private var flutterApi: HostApis.CastFlutterApi? = null + private var castApi : PlatformBridgeApis.CastHostApi? = null + private var flutterApi: PlatformBridgeApis.CastFlutterApi? = null private var applicationContext: Context? = null private var activity: Activity? = null @@ -153,8 +152,8 @@ class FlutterCastFrameworkPlugin : FlutterPlugin, MethodCallHandler, ActivityAwa result.notImplemented() } - private inner class MyApi : HostApis.CastApi { - override fun sendMessage(message: HostApis.CastMessage?) { + private inner class MyApi : PlatformBridgeApis.CastHostApi { + override fun sendMessage(message: PlatformBridgeApis.CastMessage?) { mMessageCastingChannel?.sendMessage(mCastSession, message) } @@ -170,7 +169,7 @@ class FlutterCastFrameworkPlugin : FlutterPlugin, MethodCallHandler, ActivityAwa } } - private fun getOnNamespaceResult(oldSession: CastSession?, newSession: CastSession?) = HostApis.CastFlutterApi.Reply> { namespaces -> + private fun getOnNamespaceResult(oldSession: CastSession?, newSession: CastSession?) = PlatformBridgeApis.CastFlutterApi.Reply> { namespaces -> Log.d(TAG, "Updating mCastSession - getOnNamespaceResult - param: $namespaces") if (oldSession == null && newSession == null) return@Reply // nothing to do here if (namespaces == null || !namespaces.any()) return@Reply // nothing to do here diff --git a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/MessageCastingChannel.kt b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/MessageCastingChannel.kt index 8b0a479..d638f97 100644 --- a/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/MessageCastingChannel.kt +++ b/android/src/main/kotlin/com/gianlucaparadise/flutter_cast_framework/cast/MessageCastingChannel.kt @@ -1,26 +1,26 @@ package com.gianlucaparadise.flutter_cast_framework.cast import android.util.Log -import com.gianlucaparadise.flutter_cast_framework.HostApis +import com.gianlucaparadise.flutter_cast_framework.PlatformBridgeApis import com.google.android.gms.cast.Cast import com.google.android.gms.cast.CastDevice import com.google.android.gms.cast.framework.CastSession -class MessageCastingChannel(private val flutterApi : HostApis.CastFlutterApi) : Cast.MessageReceivedCallback { +class MessageCastingChannel(private val flutterApi : PlatformBridgeApis.CastFlutterApi) : Cast.MessageReceivedCallback { companion object { const val TAG = "MessageCastingChannel" } override fun onMessageReceived(castDevice: CastDevice?, namespace: String?, message: String?) { Log.d(TAG, "Message received: $message:") - val castMessage = HostApis.CastMessage() + val castMessage = PlatformBridgeApis.CastMessage() castMessage.namespace = namespace castMessage.message = message flutterApi.onMessageReceived(castMessage) {} } - fun sendMessage(castSession: CastSession?, castMessage: HostApis.CastMessage?) { + fun sendMessage(castSession: CastSession?, castMessage: PlatformBridgeApis.CastMessage?) { Log.d(TAG, "Send Message arguments: $castMessage:") if (castMessage == null) return diff --git a/ios/Classes/FlutterCastFrameworkPlugin.h b/ios/Classes/FlutterCastFrameworkPlugin.h index 07d12e0..0697835 100644 --- a/ios/Classes/FlutterCastFrameworkPlugin.h +++ b/ios/Classes/FlutterCastFrameworkPlugin.h @@ -1,5 +1,5 @@ #import -#import "HostApis.h" +#import "PlatformBridgeApis.h" @interface FlutterCastFrameworkPlugin : NSObject @end diff --git a/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift b/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift index 2bf733d..e03cf93 100644 --- a/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift +++ b/ios/Classes/SwiftFlutterCastFrameworkPlugin.swift @@ -2,7 +2,7 @@ import Flutter import UIKit import GoogleCast -public class SwiftFlutterCastFrameworkPlugin: NSObject, FlutterPlugin, GCKSessionManagerListener, CastApi { +public class SwiftFlutterCastFrameworkPlugin: NSObject, FlutterPlugin, GCKSessionManagerListener, CastHostApi { public static func register(with registrar: FlutterPluginRegistrar) { let messenger : FlutterBinaryMessenger = registrar.messenger() let flutterApi = CastFlutterApi.init(binaryMessenger: messenger) @@ -12,8 +12,8 @@ public class SwiftFlutterCastFrameworkPlugin: NSObject, FlutterPlugin, GCKSessio let channel = FlutterMethodChannel(name: "flutter_cast_framework_dummy_channel", binaryMessenger: messenger) registrar.addMethodCallDelegate(instance, channel: channel) - let api : CastApi & NSObjectProtocol = instance - CastApiSetup(messenger, api) + let api : CastHostApi & NSObjectProtocol = instance + CastHostApiSetup(messenger, api) } private let castContext: GCKCastContext diff --git a/lib/src/cast/CastContext.dart b/lib/src/cast/CastContext.dart index 6f66829..ada6e10 100644 --- a/lib/src/cast/CastContext.dart +++ b/lib/src/cast/CastContext.dart @@ -1,15 +1,15 @@ import 'package:flutter/foundation.dart'; -import '../HostApis.dart'; +import '../PlatformBridgeApis.dart'; import 'SessionManager.dart'; class CastContext { final ValueNotifier state = ValueNotifier(CastState.unavailable); - final CastApi castApi; + final CastHostApi hostApi; - CastContext(this.castApi); + CastContext(this.hostApi); void showCastChooserDialog() { - castApi.showCastDialog(); + hostApi.showCastDialog(); } void onCastStateChanged(int castState) { @@ -20,7 +20,7 @@ class CastContext { SessionManager get sessionManager { var result = _sessionManager; if (result == null) { - _sessionManager = result = SessionManager(castApi); + _sessionManager = result = SessionManager(hostApi); } return result; } diff --git a/lib/src/cast/SessionManager.dart b/lib/src/cast/SessionManager.dart index a64ba88..57de5dc 100644 --- a/lib/src/cast/SessionManager.dart +++ b/lib/src/cast/SessionManager.dart @@ -1,10 +1,10 @@ import 'package:flutter/foundation.dart'; -import '../HostApis.dart'; +import '../PlatformBridgeApis.dart'; class SessionManager { - final CastApi castApi; + final CastHostApi hostApi; - SessionManager(this.castApi); + SessionManager(this.hostApi); final ValueNotifier state = ValueNotifier(SessionState.idle); @@ -43,7 +43,7 @@ class SessionManager { final castMessage = CastMessage(); castMessage.namespace = namespace; castMessage.message = message; - castApi.sendMessage(castMessage); + hostApi.sendMessage(castMessage); } } diff --git a/lib/src/flutter_cast_framework.dart b/lib/src/flutter_cast_framework.dart index e7d3037..42bbd59 100644 --- a/lib/src/flutter_cast_framework.dart +++ b/lib/src/flutter_cast_framework.dart @@ -1,10 +1,10 @@ import 'package:flutter_cast_framework/cast.dart'; -import 'HostApis.dart'; +import 'PlatformBridgeApis.dart'; import 'cast/CastContext.dart'; class FlutterCastFramework { - static final castApi = CastApi(); + static final hostApi = CastHostApi(); /// List of namespaces to listen for custom messages static List namespaces = []; @@ -21,7 +21,7 @@ class FlutterCastFramework { static CastContext get castContext { var castContext = _castContext; if (!_isInitiated || castContext == null) { - _castContext = castContext = CastContext(castApi); + _castContext = castContext = CastContext(hostApi); // TODO: find a better way to init the plugin _isInitiated = true; _init();