Merge branch 'develop' into release-1.10.3

packages/hmssdk_flutter/lib/src/ui/meeting/hms_texture_view.dart

@@ -118,6 +118,14 @@ class _PlatformViewState extends State<_PlatformView> {
                 widget.disableAutoSimulcastLayerSelect);
       } else {
         viewController = widget.controller;
+
+        ///Calling Add Track with new track in case where the addTrack is not called by the app
+        if (!widget.track.isMute) {
+          viewController?.addTrack(
+              track: widget.track as HMSVideoTrack,
+              disableAutoSimulcastLayerSelect:
+                  widget.disableAutoSimulcastLayerSelect);
+        }
       }
 
       ///Here we set the callback method which gets called to set the view

sample apps/bloc/android/app/build.gradle

@@ -26,8 +26,8 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 32
-
+    compileSdkVersion 34
+    namespace 'com.example.demo_app_with_100ms_and_bloc'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -45,7 +45,8 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.demo_app_with_100ms_and_bloc"
         minSdkVersion 21
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 34
+        multiDexEnabled true
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

sample apps/bloc/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

sample apps/bloc/lib/observers/room_observer.dart

@@ -172,4 +172,11 @@ class RoomObserver implements HMSUpdateListener, HMSActionResultListener {
   void onSessionStoreAvailable({HMSSessionStore? hmsSessionStore}) {
     // TODO: implement onSessionStoreAvailable
   }
+
+  @override
+  void onPeerListUpdate(
+      {required List<HMSPeer> addedPeers,
+      required List<HMSPeer> removedPeers}) {
+    // TODO: implement onPeerListUpdate
+  }
 }

sample apps/bloc/pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -111,10 +111,10 @@ packages:
     dependency: "direct main"
     description:
       name: hmssdk_flutter
-      sha256: "58c9c104b928ca62af8cd6b8a826ffef27e727a412d854b98e7f1fb151832d5e"
+      sha256: bfa6e6ec411d6f86f6cc054936fb2163c4cd3f8703f8848099689652b3794376
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.2"
+    version: "1.10.1"
   http:
     dependency: "direct main"
     description:
@@ -159,10 +159,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   nested:
     dependency: transitive
     description:
@@ -260,18 +260,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -292,10 +292,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.0"
   typed_data:
     dependency: transitive
     description:
@@ -324,10 +324,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.1.4-beta"
 sdks:
-  dart: ">=3.2.0-194.0.dev <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=2.10.0"

sample apps/bloc/pubspec.yaml

@@ -36,7 +36,7 @@ dependencies:
   focus_detector:
   http:
   rxdart: ^0.27.2
-  hmssdk_flutter: 1.7.2
+  hmssdk_flutter: 1.10.1
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

sample apps/flutter-audio-room-quickstart/README.md

@@ -9,7 +9,7 @@ Create an `audio room` template from [100ms dashboard](https://dashboard.100ms.l
 Just plugin following values and run the application :
 
 - userName : Enter the username with which you wish to join
-- authToken : Auth token of the role with which you wish to join the room
+- roomCode : Room Code of the role with which you wish to join the room
 
 That's it. Press the `Join Audio Room` button and start conversing 🥳🥳🥳
 

sample apps/flutter-audio-room-quickstart/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +47,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0.0"
     }

sample apps/flutter-audio-room-quickstart/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,23 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.flutter_audio_room_quickstart">
+
+
+<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+
+<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+
+<uses-permission android:name="android.permission.RECORD_AUDIO"/>
+
+<uses-permission android:name="android.permission.INTERNET"/>
+
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+
+<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
    <application
         android:label="flutter_audio_room_quickstart"
         android:name="${applicationName}"

sample apps/flutter-audio-room-quickstart/android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

sample apps/flutter-audio-room-quickstart/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

sample apps/flutter-audio-room-quickstart/ios/Podfile.lock

@@ -44,4 +44,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.14.3

sample apps/flutter-audio-room-quickstart/ios/Runner.xcodeproj/project.pbxproj

@@ -155,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -204,6 +204,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (

sample apps/flutter-audio-room-quickstart/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

sample apps/flutter-audio-room-quickstart/lib/main.dart

@@ -36,6 +36,11 @@ class MyHomePage extends StatefulWidget {
 class _MyHomePageState extends State<MyHomePage> {
   bool res = false;
 
+  void navigate() {
+    Navigator.push(
+        context, CupertinoPageRoute(builder: (_) => const MeetingPage()));
+  }
+
   static Future<bool> getPermissions() async {
     if (Platform.isIOS) return true;
 
@@ -59,21 +64,20 @@ class _MyHomePageState extends State<MyHomePage> {
         child: Center(
           child: ElevatedButton(
             style: ButtonStyle(
+                backgroundColor: MaterialStateProperty.all<Color>(Colors.blue),
                 shape: MaterialStateProperty.all<RoundedRectangleBorder>(
                     RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(8.0),
-            ))),
+                  borderRadius: BorderRadius.circular(8.0),
+                ))),
             onPressed: () async => {
               res = await getPermissions(),
-              if (res)
-                Navigator.push(context,
-                    CupertinoPageRoute(builder: (_) => const MeetingPage()))
+              if (res) {navigate()}
             },
             child: const Padding(
               padding: EdgeInsets.symmetric(vertical: 20, horizontal: 15),
               child: Text(
                 'Join Audio Room',
-                style: TextStyle(fontSize: 20),
+                style: TextStyle(fontSize: 20, color: Colors.white),
               ),
             ),
           ),
@@ -95,8 +99,11 @@ class _MeetingPageState extends State<MeetingPage>
   late HMSSDK _hmsSDK;
 
   //Enter the username and authToken from dashboard for the corresponding role here.
-  String userName = "Enter Username Here";
-  String authToken = "Enter AuthToken Here";
+  String userName = "Enter username here";
+
+  ///For speaker role roomCode: "yim-wofo-ytk"
+  ///For listener role roomCode: "iai-nkis-oob"
+  String roomCode = "yim-wofo-ytk";
   Offset position = const Offset(5, 5);
   bool isJoinSuccessful = false;
   final List<PeerTrackNode> _listeners = [];
@@ -115,7 +122,12 @@ class _MeetingPageState extends State<MeetingPage>
     _hmsSDK = HMSSDK();
     await _hmsSDK.build();
     _hmsSDK.addUpdateListener(listener: this);
-    _hmsSDK.join(config: HMSConfig(authToken: authToken, userName: userName));
+    var authToken = await _hmsSDK.getAuthTokenByRoomCode(roomCode: roomCode);
+    if ((authToken is String?) && authToken != null) {
+      _hmsSDK.join(config: HMSConfig(authToken: authToken, userName: userName));
+    } else {
+      log("Error in getting auth token");
+    }
   }
 
   @override
@@ -271,6 +283,9 @@ class _MeetingPageState extends State<MeetingPage>
       case HMSPeerUpdate.networkQualityUpdated:
         // TODO: Handle this case.
         break;
+      case HMSPeerUpdate.handRaiseUpdated:
+        // TODO: Handle this case.
+        break;
     }
   }
 
@@ -399,6 +414,18 @@ class _MeetingPageState extends State<MeetingPage>
     // Checkout the docs for room updates here: https://www.100ms.live/docs/flutter/v2/how--to-guides/listen-to-room-updates/update-listeners
   }
 
+  @override
+  void onPeerListUpdate(
+      {required List<HMSPeer> addedPeers,
+      required List<HMSPeer> removedPeers}) {
+    // TODO: implement onPeerListUpdate
+  }
+
+  @override
+  void onSessionStoreAvailable({HMSSessionStore? hmsSessionStore}) {
+    // TODO: implement onSessionStoreAvailable
+  }
+
   @override
   void onUpdateSpeakers({required List<HMSSpeaker> updateSpeakers}) {
     // Checkout the docs for handling the updates regarding who is currently speaking here: https://www.100ms.live/docs/flutter/v2/how--to-guides/set-up-video-conferencing/render-video/show-audio-level