Merge pull request #1609 from 100mslive/develop

Release 1.9.0: Develop to main
100mslive · Oct 16, 2023 · 8a713cb · 8a713cb
2 parents 1399556 + 93a63af
commit 8a713cb
Show file tree

Hide file tree

Showing 77 changed files with 2,380 additions and 890 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,36 +1,56 @@
-sample apps/hms-callkit-app/.dart_tool/flutter_build/
-.dart_tool/package_config.json
-.dart_tool/package_config_subset
-.dart_tool/version
-android/.gradle/6.8.3/gc.properties
-android/.gradle/6.8.3/fileChanges/last-build.bin
-android/.gradle/6.8.3/fileHashes/fileHashes.lock
-android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
-android/.gradle/buildOutputCleanup/cache.properties
-android/.gradle/checksums/checksums.lock
-android/.gradle/checksums/sha1-checksums.bin
-android/.gradle/configuration-cache/gc.properties
-android/.gradle/vcs-1/gc.properties
-android/.idea/.name
-android/.idea/gradle.xml
-android/.idea/misc.xml
-android/.idea/workspace.xml
-example/.flutter-plugins
-example/.flutter-plugins-dependencies
-example/.dart_tool/package_config.json
-example/.dart_tool/package_config_subset
-example/.dart_tool/flutter_build/
-example/android/.gradle/
-example/android/.idea/
-example/ios/.symlinks/
-example/ios/Pods/
-sample apps/flutter-quickstart-app/.dart_tool/
-sample apps/hms-callkit-app/.dart_tool/
-sample apps/flutter-quickstart-app/build/ios/Pods.build/
-packages/hms_room_kit/.dart_tool
+## HMSSDK 
+packages/hmssdk_flutter/example/android/.gradle/6.8.3/gc.properties
+packages/hmssdk_flutter/example/android/.gradle/6.8.3/fileChanges/last-build.bin
+packages/hmssdk_flutter/example/android/.gradle/6.8.3/fileHashes/fileHashes.lock
+packages/hmssdk_flutter/example/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+packages/hmssdk_flutter/example/android/.gradle/buildOutputCleanup/cache.properties
+packages/hmssdk_flutter/example/android/.gradle/checksums/checksums.lock
+packages/hmssdk_flutter/example/android/.gradle/checksums/sha1-checksums.bin
+packages/hmssdk_flutter/example/android/.gradle/configuration-cache/gc.properties
+packages/hmssdk_flutter/example/android/.gradle/vcs-1/gc.properties
+packages/hmssdk_flutter/example/android/.idea/.name
+packages/hmssdk_flutter/example/android/local.properties
+packages/hmssdk_flutter/example/android/.idea/gradle.xml
+packages/hmssdk_flutter/example/android/.idea/misc.xml
+packages/hmssdk_flutter/example/android/.idea/workspace.xml
+packages/hmssdk_flutter/example/.flutter-plugins
+packages/hmssdk_flutter/example/.flutter-plugins-dependencies
+packages/hmssdk_flutter/example/.dart_tool/package_config.json
+packages/hmssdk_flutter/example/.dart_tool/package_config_subset
+packages/hmssdk_flutter/example/.dart_tool/flutter_build/
+packages/hmssdk_flutter/example/android/.gradle/
+packages/hmssdk_flutter/example/android/.idea/
+packages/hmssdk_flutter/example/ios/.symlinks/
+packages/hmssdk_flutter/example/ios/Pods/
 packages/hmssdk_flutter/.dart_tool
 packages/hmssdk_flutter/example/.dart_tool
 packages/hmssdk_flutter/example/android/fastlane
 packages/hmssdk_flutter/example/build
 packages/hmssdk_flutter/example/ios/fastlane
-packages/hmssdk_flutter/example/android/app/google-services.json
+packages/hmssdk_flutter/example/ios/flutter-hms-4aea6d38fd2a.json
+packages/hmssdk_flutter/example/android/app/google-services.json
+packages/hmssdk_flutter/example/android/flutter-hms-4aea6d38fd2a.json
+packages/hmssdk_flutter/build/
+
+##HMS ROOM KIT
+packages/hms_room_kit/.dart_tool
+packages/hms_room_kit/.DS_Store
+packages/hms_room_kit/.flutter-plugins
+packages/hms_room_kit/.flutter-plugins-dependencies
+packages/hms_room_kit/android/local.properties
+packages/hms_room_kit/ios/Flutter/flutter_export_environment.sh
+packages/hms_room_kit/ios/Flutter/Generated.xcconfig
+
+##Sample apps
+sample apps/flutter-quickstart-app/.dart_tool/
+sample apps/hms-callkit-app/.dart_tool/
+sample apps/flutter-quickstart-app/build/ios/Pods.build/
+sample apps/hms-callkit-app/.dart_tool/flutter_build/
+
+##GIT Files
+.dart_tool/package_config.json
+.dart_tool/package_config_subset
+.dart_tool/version
+.DS_Store
+packages/.DS_Store
+Runner.ipa
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -1,18 +1,18 @@
 version: 0.1
 cli:
-  version: 1.16.1
+  version: 1.16.2
 plugins:
   sources:
     - id: trunk
-      ref: v1.2.4
+      ref: v1.2.5
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
     - [email protected]
-    - checkov@2.4.9
-    - [email protected].0
+    - checkov@2.5.7
+    - [email protected].1
     - [email protected]
-    - trufflehog@3.57.0
+    - trufflehog@3.59.0
     - [email protected]
     - [email protected]
     - [email protected]

diff --git a/packages/hms_room_kit/CHANGELOG.md b/packages/hms_room_kit/CHANGELOG.md
@@ -5,6 +5,21 @@
 | hms_room_kit   | [![Pub Version](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit)     |
 | hmssdk_flutter | [![Pub Version](https://img.shields.io/pub/v/hmssdk_flutter)](https://pub.dev/packages/hmssdk_flutter) |
 
+## 1.0.3 - 2023-10-16
+
+### 🚀 Added
+
+- Large Room Support
+  - Enhanced Participants list to accommodate up to 20,000 peers in a room.
+
+- Added recording state indicator: showcasing "initializing" and "running" states.
+- Added `Lower Hand` Capability in Participant list 
+
+### Fixed
+
+- Fixed `userid` bug, where `userid` was not getting passed to SDK
+- Fixed UI bugs
+
 ## 1.0.2 - 2023-09-22
 
 ### 🚀 Added

diff --git a/packages/hms_room_kit/example/ios/Podfile.lock b/packages/hms_room_kit/example/ios/Podfile.lock
@@ -6,14 +6,14 @@ PODS:
   - HMSBroadcastExtensionSDK (0.0.9)
   - HMSHLSPlayerSDK (0.0.2):
     - HMSAnalyticsSDK (= 0.0.2)
-  - HMSSDK (0.9.12):
+  - HMSSDK (1.1.0):
     - HMSAnalyticsSDK (= 0.0.2)
     - HMSWebRTC (= 1.0.5116)
-  - hmssdk_flutter (1.8.0):
+  - hmssdk_flutter (1.9.0):
     - Flutter
     - HMSBroadcastExtensionSDK (= 0.0.9)
     - HMSHLSPlayerSDK (= 0.0.2)
-    - HMSSDK (= 0.9.12)
+    - HMSSDK (= 1.1.0)
   - HMSWebRTC (1.0.5116)
   - path_provider_foundation (0.0.1):
     - Flutter
@@ -70,8 +70,8 @@ SPEC CHECKSUMS:
   HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7
   HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb
   HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3
-  HMSSDK: 65c1445ad2aac04deb127fe7611f65b8e7447752
-  hmssdk_flutter: 806162401c1c9dd1fca07d913b9ee5f1e1d36930
+  HMSSDK: 49e3ac665ceb8904d41787ddf99742e8d7d6529a
+  hmssdk_flutter: 414edcdff09f1587f53b04e9b93b39e6174a61cd
   HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
@@ -81,4 +81,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.13.0
diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock
@@ -222,15 +222,14 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.2"
+    version: "1.0.3"
   hmssdk_flutter:
     dependency: transitive
     description:
-      name: hmssdk_flutter
-      sha256: fb6cdad295b0c76be408beb9cef0fe3fab9aa25c775779943a68fab4e675628b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.0"
+      path: "../../hmssdk_flutter"
+      relative: true
+    source: path
+    version: "1.9.0"
   http:
     dependency: transitive
     description:

diff --git a/packages/hms_room_kit/example/pubspec.yaml b/packages/hms_room_kit/example/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.1
+version: 1.0.3
 
 environment:
   sdk: ">=2.19.6 <3.0.0"

diff --git a/packages/hms_room_kit/lib/src/assets/icons/arrow.svg b/packages/hms_room_kit/lib/src/assets/icons/arrow.svg
diff --git a/packages/hms_room_kit/lib/src/assets/icons/left_arrow.svg b/packages/hms_room_kit/lib/src/assets/icons/left_arrow.svg
diff --git a/packages/hms_room_kit/lib/src/assets/icons/lower_hand.svg b/packages/hms_room_kit/lib/src/assets/icons/lower_hand.svg
diff --git a/packages/hms_room_kit/lib/src/assets/icons/right_arrow.svg b/packages/hms_room_kit/lib/src/assets/icons/right_arrow.svg
diff --git a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_bottom_navigation_bar.dart b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_bottom_navigation_bar.dart
@@ -95,7 +95,7 @@ class HLSViewerBottomNavigationBar extends StatelessWidget {
                                     onTap: () => {
                                       context
                                           .read<MeetingStore>()
-                                          .changeMetadata(),
+                                          .toggleLocalPeerHandRaise(),
                                     },
                                     enabledBorderColor: HMSThemeColors
                                         .backgroundDim

diff --git a/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart b/packages/hms_room_kit/lib/src/hls_viewer/hls_viewer_header.dart
@@ -1,8 +1,7 @@
 ///Dart imports
 import 'dart:io';
 
-///Package imports
-import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hms_room_kit/src/common/utility_functions.dart';
 import 'package:provider/provider.dart';
@@ -85,12 +84,14 @@ class HLSViewerHeader extends StatelessWidget {
                 ///We render the recording icon based on the recording status
                 ///If the recording is started we show the recording icon
                 ///If the recording is not started we show nothing
-                Selector<MeetingStore, Tuple3<bool, bool, bool>>(
-                    selector: (_, meetingStore) => Tuple3(
-                          meetingStore.recordingType["browser"] ?? false,
-                          meetingStore.recordingType["server"] ?? false,
-                          meetingStore.recordingType["hls"] ?? false,
-                        ),
+                ///
+                ///If recording initialising state is true we show the loader
+                Selector<MeetingStore, Tuple4<bool, bool, bool, bool>>(
+                    selector: (_, meetingStore) => Tuple4(
+                        meetingStore.recordingType["browser"] ?? false,
+                        meetingStore.recordingType["server"] ?? false,
+                        meetingStore.recordingType["hls"] ?? false,
+                        meetingStore.isRecordingInInitialisingState),
                     builder: (_, data, __) {
                       return (data.item1 || data.item2 || data.item3)
                           ? SvgPicture.asset(
@@ -101,7 +102,15 @@ class HLSViewerHeader extends StatelessWidget {
                                   HMSThemeColors.alertErrorDefault,
                                   BlendMode.srcIn),
                             )
-                          : Container();
+                          : data.item4
+                              ? SizedBox(
+                                  height: 24,
+                                  width: 24,
+                                  child: CircularProgressIndicator(
+                                    strokeWidth: 1,
+                                    color: HMSThemeColors.onSurfaceHighEmphasis,
+                                  ))
+                              : Container();
                     }),
                 const SizedBox(
                   width: 8,
@@ -113,7 +122,7 @@ class HLSViewerHeader extends StatelessWidget {
                 Selector<MeetingStore, Tuple2<bool, int>>(
                     selector: (_, meetingStore) => Tuple2(
                         meetingStore.streamingType['hls'] ?? false,
-                        meetingStore.peers.length),
+                        meetingStore.peersInRoom),
                     builder: (_, data, __) {
                       return data.item1
                           ? Container(

diff --git a/packages/hms_room_kit/lib/src/hmssdk_interactor.dart b/packages/hms_room_kit/lib/src/hmssdk_interactor.dart
@@ -392,4 +392,25 @@ class HMSSDKInteractor {
   Future<dynamic> cancelPreview() async {
     return await hmsSDK.cancelPreview();
   }
+
+  Future<dynamic> getPeerListIterator(
+      {PeerListIteratorOptions? peerListIteratorOptions}) async {
+    return await hmsSDK.getPeerListIterator(
+        peerListIteratorOptions: peerListIteratorOptions);
+  }
+
+  void lowerLocalPeerHand({HMSActionResultListener? hmsActionResultListener}) {
+    hmsSDK.lowerLocalPeerHand(hmsActionResultListener: hmsActionResultListener);
+  }
+
+  void raiseLocalPeerHand({HMSActionResultListener? hmsActionResultListener}) {
+    hmsSDK.raiseLocalPeerHand(hmsActionResultListener: hmsActionResultListener);
+  }
+
+  void lowerRemotePeerHand(
+      {required HMSPeer forPeer,
+      HMSActionResultListener? hmsActionResultListener}) {
+    hmsSDK.lowerRemotePeerHand(
+        forPeer: forPeer, hmsActionResultListener: hmsActionResultListener);
+  }
 }
diff --git a/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart b/packages/hms_room_kit/lib/src/layout_api/hms_room_layout.dart
@@ -216,6 +216,7 @@ class HMSRoomLayout {
   static Chat? chatData;
   static bool isParticipantsListEnabled = true;
   static bool isBRBEnabled = true;
+  static List<String>? offStageRoles = [];
 
   static Future<void> getRoomLayout(
       {required HMSSDKInteractor hmsSDKInteractor,
@@ -234,14 +235,20 @@ class HMSRoomLayout {
     if (roleName != null) {
       int? roleIndex =
           data?.indexWhere((layoutData) => layoutData.role == roleName);
+
+      ///Check if that role theme is present
+      ///If not we assign the theme at 0th index
       if (roleIndex != null && roleIndex != -1) {
         HMSThemeColors.applyLayoutColors(data?[roleIndex].themes?[0].palette);
         roleLayoutData = data?[roleIndex];
-        return;
+      } else {
+        HMSThemeColors.applyLayoutColors(data?[0].themes?[0].palette);
+        roleLayoutData = data?[0];
       }
+    } else {
+      HMSThemeColors.applyLayoutColors(data?[0].themes?[0].palette);
+      roleLayoutData = data?[0];
     }
-    HMSThemeColors.applyLayoutColors(data?[0].themes?[0].palette);
-    roleLayoutData = data?[0];
     peerType = roleLayoutData?.screens?.conferencing?.hlsLiveStreaming != null
         ? PeerRoleType.hlsViewer
         : PeerRoleType.conferencing;
@@ -254,6 +261,8 @@ class HMSRoomLayout {
       isBRBEnabled =
           roleLayoutData?.screens?.conferencing?.defaultConf?.elements?.brb !=
               null;
+      offStageRoles = roleLayoutData?.screens?.conferencing?.defaultConf
+          ?.elements?.onStageExp?.offStageRoles;
     } else {
       chatData = roleLayoutData
           ?.screens?.conferencing?.hlsLiveStreaming?.elements?.chat;
@@ -263,6 +272,8 @@ class HMSRoomLayout {
       isBRBEnabled = roleLayoutData
               ?.screens?.conferencing?.hlsLiveStreaming?.elements?.brb !=
           null;
+      offStageRoles = roleLayoutData?.screens?.conferencing?.hlsLiveStreaming
+          ?.elements?.onStageExp?.offStageRoles;
     }
   }