feat: Upgrade Flutter SDK 3.0 (#685)

* feat: Upgrade Flutter SDK 3.0.0

.github/workflows/build.yml

@@ -37,6 +37,9 @@ jobs:
   integration_test_android:
     name: Run Flutter Android Integration Tests
     needs: flutter_codestyle_check
+    strategy:
+      matrix:
+        version: ['2.10.5', '3.0.0']
     runs-on: macos-11
     timeout-minutes: 60
     env:
@@ -48,7 +51,7 @@ jobs:
           java-version: '11'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.10.5'
+          flutter-version: ${{ matrix.version }}
       - name: run flutter android integration tests
         uses: reactivecircus/android-emulator-runner@v2.21.0
         with:
@@ -60,6 +63,9 @@ jobs:
   integration_test_ios:
     name: Run Flutter iOS Integration Tests
     needs: flutter_codestyle_check
+    strategy:
+      matrix:
+        version: ['2.10.5', '3.0.0']
     runs-on: macos-11
     timeout-minutes: 60
     env:
@@ -68,7 +74,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.10.5'   
+          flutter-version: ${{ matrix.version }}
       - uses: futureware-tech/simulator-action@v1
         with:
           model: 'iPhone 13 Pro Max'
@@ -77,6 +83,9 @@ jobs:
   integration_test_macos:
     name: Run Flutter macOS Integration Tests
     needs: flutter_codestyle_check
+    strategy:
+      matrix:
+        version: ['2.10.5', '3.0.0']
     runs-on: macos-11
     timeout-minutes: 60
     env:
@@ -85,13 +94,16 @@ jobs:
       - uses: actions/checkout@v1
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.10.5'   
+          flutter-version: ${{ matrix.version }}
       - run: flutter config --enable-macos-desktop 
       - run: bash ci/run_flutter_macos_integration_test.sh
 
   integration_test_windows:
     name: Run Flutter Windows Integration Tests
     needs: flutter_codestyle_check
+    strategy:
+      matrix:
+        version: ['2.10.5', '3.0.0']
     runs-on: windows-2019
     timeout-minutes: 60
     env:
@@ -100,7 +112,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.10.5'
+          flutter-version: ${{ matrix.version }}
       - run: flutter config --enable-windows-desktop
       - run: bash ci/run_flutter_macos_integration_test.sh
 
@@ -136,6 +148,9 @@ jobs:
   build_android_windows:
     name: Build Android on Windows
     needs: flutter_codestyle_check
+    strategy:
+      matrix:
+        version: ['2.10.5', '3.0.0']
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v1
@@ -144,7 +159,7 @@ jobs:
           java-version: '11'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.10.5'
+          flutter-version: ${{ matrix.version }}
       - run: flutter pub get
       - name: Run flutter build apk
         run: flutter build apk
@@ -153,6 +168,9 @@ jobs:
   build_android_ubuntu:
     name: Build Android on Ubuntu
     needs: flutter_codestyle_check
+    strategy:
+      matrix:
+        version: ['2.10.5', '3.0.0']
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -161,7 +179,7 @@ jobs:
           java-version: '11'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.10.5'
+          flutter-version: ${{ matrix.version }}
       - run: flutter pub get
       - name: Run flutter build apk
         run: flutter build apk
@@ -170,13 +188,16 @@ jobs:
   build_ios:
     name: Build iOS
     needs: flutter_codestyle_check
+    strategy:
+      matrix:
+        version: ['2.10.5', '3.0.0']
     runs-on: macos-11
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v1
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.10.5'
+          flutter-version: ${{ matrix.version }}
       - run: flutter pub get
       - name: Run flutter build ios --no-codesign
         run: flutter build ios --no-codesign

README.md

@@ -136,9 +136,9 @@ as [Custom Audio Source and Renderer](https://docs.agora.io/en/Video/custom_audi
 
 Please note that you should not call the [RtcEngine.destroy](https://docs.agora.io/en/Video/API%20Reference/java/classio_1_1agora_1_1rtc_1_1_rtc_engine.html#afb808cdc9025a77af7dd2bce98311bfe)/[AgoraRtcEngineKit.destroy](https://docs.agora.io/en/Video/API%20Reference/oc/Classes/AgoraRtcEngineKit.html#//api/name/destroy) function on Android/iOS code, because it will affect the [RtcEngine](https://github.com/AgoraIO/Agora-Flutter-SDK/blob/master/lib/src/rtc_engine.dart) on the Flutter side. To see how to use `RtcEnginePlugin`, please check the custom audio source example:
 
-Android: [CustomAudioPlugin.kt](https://github.com/AgoraIO/Agora-Flutter-SDK/blob/master/example/android/app/src/main/kotlin/io/agora/agora_rtc_engine_example/custom_audio_source/CustomAudioPlugin.kt)
+Android: [CustomCaptureAudioPlugin.kt](https://github.com/AgoraIO/Agora-Flutter-SDK/blob/master/example/android/app/src/main/kotlin/io/agora/agora_rtc_engine_example/custom_capture_audio/CustomCaptureAudioPlugin.kt)
 
-iOS: [CustmoAudioSourcePlugin.swift](https://github.com/AgoraIO/Agora-Flutter-SDK/blob/master/example/ios/Runner/CustomAudioSource/CustmoAudioSourcePlugin.swift)
+iOS: [CustomCaptureAudioPlugin.swift](https://github.com/AgoraIO/Agora-Flutter-SDK/blob/master/example/ios/Runner/CustomCaptureAudio/CustomCaptureAudioPlugin.swift)
 
 ## API Reference Resources
 

android/src/main/kotlin/io/agora/agora_rtc_engine/AgoraPlatformView.kt

@@ -16,35 +16,39 @@ private class PlatformViewApiTypeCallApiMethodCallHandler(
 ) : CallApiMethodCallHandler(irisRtcEngine) {
   override fun callApi(apiType: Int, params: String?, sb: StringBuffer): Int {
     platformView.updateView()
-    return irisRtcEngine.callApi(apiType, params, platformView.getIrisRenderView(), sb)
+    return platformView.getIrisRenderView()?.let {
+      irisRtcEngine.callApi(apiType, params, platformView.getIrisRenderView(), sb)
+    } ?: -1
   }
 }
 
 // We should ensure not doing some leak in constructor
 @Suppress("LeakingThis")
 abstract class AgoraPlatformView(
-  private val context: Context,
+  private val context: Context?,
   messenger: BinaryMessenger,
   viewId: Int,
   args: Map<*, *>?,
-  private val irisRtcEngine: IrisRtcEngine
+  irisRtcEngine: IrisRtcEngine
 ) : PlatformView, MethodChannel.MethodCallHandler {
 
-  private val parentView: FrameLayout = FrameLayout(context)
+  private var parentView: FrameLayout? = null
 
-  private var platformView: View
+  private var platformView: View? = null
 
-  private val channel: MethodChannel
+  private var channel: MethodChannel? = null
 
-  private val callApiMethodCallHandler: CallApiMethodCallHandler =
-    PlatformViewApiTypeCallApiMethodCallHandler(irisRtcEngine, this)
+  private var callApiMethodCallHandler: CallApiMethodCallHandler? = null
 
   init {
-    platformView = createView(context.applicationContext)
-    parentView.addView(platformView)
+    parentView = context?.let { FrameLayout(context) }
+    platformView = createView(context)
+    parentView?.addView(platformView)
 
     channel = MethodChannel(messenger, "${channelName}_$viewId")
-    channel.setMethodCallHandler(this)
+    channel?.setMethodCallHandler(this)
+
+    callApiMethodCallHandler = PlatformViewApiTypeCallApiMethodCallHandler(irisRtcEngine, this)
 
     args?.apply {
       for ((key, value) in entries) {
@@ -54,28 +58,27 @@ abstract class AgoraPlatformView(
   }
 
   fun updateView() {
-    parentView.removeAllViews()
-    platformView = createView(context.applicationContext)
-    parentView.addView(platformView)
+    parentView?.removeAllViews()
+    platformView = createView(context)
+    parentView?.addView(platformView)
   }
 
-  abstract fun createView(context: Context): View
+  abstract fun createView(context: Context?): View?
 
   protected abstract val channelName: String
 
-  fun getIrisRenderView(): View {
+  fun getIrisRenderView(): View? {
     return platformView
   }
 
-  override fun getView(): View {
+  override fun getView(): View? {
     return parentView
   }
 
   override fun dispose() {
-    channel.setMethodCallHandler(null)
   }
 
   override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
-    callApiMethodCallHandler.onMethodCall(call, result)
+    callApiMethodCallHandler?.onMethodCall(call, result)
   }
 }

android/src/main/kotlin/io/agora/agora_rtc_engine/AgoraRtcEnginePlugin.kt

@@ -260,6 +260,6 @@ class AgoraRtcEnginePlugin : FlutterPlugin, MethodCallHandler, EventChannel.Stre
       }
       return@getAssetAbsolutePath
     }
-    result.error(IllegalArgumentException::class.simpleName, null, null)
+    result.error(IllegalArgumentException::class.simpleName ?: "IllegalArgumentException", "The parameter should not be null", null)
   }
 }

android/src/main/kotlin/io/agora/agora_rtc_engine/AgoraSurfaceViewFactory.kt

@@ -1,14 +1,10 @@
 package io.agora.agora_rtc_engine
 
 import android.content.Context
-import android.view.SurfaceView
 import android.view.View
-import android.widget.FrameLayout
 import io.agora.iris.rtc.IrisRtcEngine
 import io.agora.rtc.RtcEngine
 import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.StandardMessageCodec
 import io.flutter.plugin.platform.PlatformView
 import io.flutter.plugin.platform.PlatformViewFactory
@@ -17,9 +13,9 @@ class AgoraSurfaceViewFactory(
   private val messenger: BinaryMessenger,
 private val irisRtcEngine: IrisRtcEngine
 ) : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
-  override fun create(context: Context, viewId: Int, args: Any?): PlatformView {
+  override fun create(context: Context?, viewId: Int, args: Any?): PlatformView {
     return AgoraPlatformViewSurface(
-      context.applicationContext,
+      context,
       messenger,
       viewId,
       args as? Map<*, *>,
@@ -29,39 +25,17 @@ private val irisRtcEngine: IrisRtcEngine
 }
 
 class AgoraPlatformViewSurface(
-  context: Context,
+  context: Context?,
   messenger: BinaryMessenger,
   viewId: Int, args: Map<*, *>?,
   irisRtcEngine: IrisRtcEngine
 ) : AgoraPlatformView(context, messenger, viewId, args, irisRtcEngine) {
-  override fun createView(context: Context): View {
-    return RtcEngine.CreateRendererView(context)
+  override fun createView(context: Context?): View? {
+    return context?.let {
+      RtcEngine.CreateTextureView(context)
+    }
   }
 
   override val channelName: String
     get() = "agora_rtc_engine/surface_view"
-
-  override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
-    when (call.method) {
-      "setZOrderOnTop" -> {
-        val surfaceView = getIrisRenderView() as SurfaceView
-        val parentView = view as FrameLayout
-        parentView.removeView(surfaceView)
-        surfaceView.setZOrderOnTop((call.argument<Boolean>("onTop"))!!)
-        parentView.addView(surfaceView)
-        result.success(null)
-      }
-      "setZOrderMediaOverlay" -> {
-        val surfaceView = getIrisRenderView() as SurfaceView
-        val parentView = view as FrameLayout
-        parentView.removeView(surfaceView)
-        surfaceView.setZOrderMediaOverlay((call.argument<Boolean>("isMediaOverlay"))!!)
-        parentView.addView(surfaceView)
-        result.success(null)
-      }
-      else -> {
-        super.onMethodCall(call, result)
-      }
-    }
-  }
 }

android/src/main/kotlin/io/agora/agora_rtc_engine/AgoraTextureViewFactory.kt

@@ -14,9 +14,9 @@ class AgoraTextureViewFactory(
   private val irisRtcEngine: IrisRtcEngine
 ) : PlatformViewFactory(StandardMessageCodec.INSTANCE) {
 
-  override fun create(context: Context, viewId: Int, args: Any?): PlatformView {
+  override fun create(context: Context?, viewId: Int, args: Any?): PlatformView {
     return AgoraPlatformViewTexture(
-      context.applicationContext,
+      context,
       messenger,
       viewId,
       args as? Map<*, *>,
@@ -26,14 +26,13 @@ class AgoraTextureViewFactory(
 }
 
 class AgoraPlatformViewTexture(
-  context: Context,
+  context: Context?,
   messenger: BinaryMessenger,
   viewId: Int, args: Map<*, *>?,
   irisRtcEngine: IrisRtcEngine
 ) : AgoraPlatformView(context, messenger, viewId, args, irisRtcEngine) {
-  override fun createView(context: Context): View {
-
-    return RtcEngine.CreateTextureView(context)
+  override fun createView(context: Context?): View? {
+    return context?.let { RtcEngine.CreateTextureView(context) }
   }
 
   override val channelName: String

example/ios/Runner/Info.plist

@@ -47,5 +47,7 @@
 	<false/>
 	<key>io.flutter.embedded_views_preview</key>
 	<true/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

example/lib/examples/advanced/enable_virtualbackground/enable_virtualbackground.dart

@@ -188,7 +188,8 @@ class _State extends State<EnableVirtualBackground> {
     return Expanded(
       child: Stack(
         children: [
-          const rtc_local_view.SurfaceView(),
+          const rtc_local_view.SurfaceView(
+          ),
           Align(
             alignment: Alignment.topLeft,
             child: SingleChildScrollView(

example/lib/examples/advanced/index.dart

@@ -40,4 +40,5 @@ final advanced = [
     'widget': const EnableVirtualBackground()
   },
   {'name': 'MediaRecorder', 'widget': const MediaRecorder()},
+
 ];

example/lib/examples/advanced/stream_message/stream_message.dart

@@ -215,15 +215,15 @@ class _State extends State<StreamMessage> {
                 width: 120,
                 child: rtc_remote_view.SurfaceView(
                   uid: uid,
-                  channelId: config.channelId,
+                  channelId: _channelIdController.text,
                 ),
               )
             : SizedBox(
                 height: 120,
                 width: 120,
                 child: rtc_remote_view.TextureView(
                   uid: uid,
-                  channelId: config.channelId,
+                  channelId: _channelIdController.text,
                 ),
               ));
       }));

example/linux/.gitignore

@@ -1 +1,4 @@
 flutter/ephemeral
+flutter/generated_plugins.cmake
+flutter/generated_plugin_registrant.h
+flutter/generated_plugin_registrant.cc