Merge pull request #1653 from 100mslive/develop

Release 1.9.4: Develop to main
100mslive · Dec 8, 2023 · c5154bc · c5154bc
2 parents c69c9e0 + d54c8b0
commit c5154bc
Show file tree

Hide file tree

Showing 56 changed files with 1,515 additions and 905 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -4,24 +4,24 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.2.6
+      ref: v1.3.0
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
     - [email protected]
-    - checkov@3.0.37
+    - checkov@3.1.9
     - [email protected]
     - [email protected]
-    - trufflehog@3.62.1
+    - trufflehog@3.63.2-rc0
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
     - git-diff-check
     - [email protected]
     - [email protected]
-    - [email protected].0
-    - [email protected].3
+    - [email protected].1
+    - [email protected].5
     - [email protected]
 runtimes:
   enabled:

diff --git a/packages/hms_room_kit/CHANGELOG.md b/packages/hms_room_kit/CHANGELOG.md
@@ -5,6 +5,27 @@
 | 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.7 - 2023-12-08
+
+| Package        | Version                                                                                                |
+| -------------- | ------------------------------------------------------------------------------------------------------ |
+| hms_room_kit   | 1.0.7     |
+| hmssdk_flutter | 1.9.4     |
+
+### 🚀 Added
+
+- If `userName` is specified in `HMSPrebuiltOptions`, username editing on the preview screen will be disabled.
+
+### 🛠️ Fixed
+
+- Active speaker not updating on first page with active screenshare.
+
+- Improved overall performance of the application.
+
+### 🔄 Changed
+
+- `hms_room_kit` now uses `HMSTextureView` instead of `HMSVideoView` for rendering video.
+
 ## 1.0.6 - 2023-11-17
 
 ### 🚀 Added

diff --git a/packages/hms_room_kit/README.md b/packages/hms_room_kit/README.md
@@ -1,6 +1,6 @@
 [![100ms-svg](https://user-images.githubusercontent.com/93931528/205858417-8c0a0d1b-2d46-4710-9316-7418092fd3d6.svg)](https://100ms.live/)
 
-[![HMSLive Room Kit](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit)
+[![Pub Version](https://img.shields.io/pub/v/hms_room_kit)](https://pub.dev/packages/hms_room_kit)
 [![License](https://img.shields.io/github/license/100mslive/100ms-flutter)](https://www.100ms.live/)
 [![Documentation](https://img.shields.io/badge/Read-Documentation-blue)](https://docs.100ms.live/flutter/v2/foundation/basics)
 [![Discord](https://img.shields.io/discord/843749923060711464?label=Join%20on%20Discord)](https://100ms.live/discord)
@@ -14,6 +14,13 @@
 A powerful prebuilt UI library for audio/video conferencing, live streaming, and one-to-one calls.
 This package provides developers with a comprehensive set of tools and components to quickly integrate high-quality audio and video communication features into their Flutter applications.
 
+
+| Package        | Version                                                                                                |
+| -------------- | ------------------------------------------------------------------------------------------------------ |
+| 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) |
+
+
 📖 Read the Complete Documentation here: https://www.100ms.live/docs/flutter/v2/guides/quickstart
 
 📲 Download the Sample iOS app here: <https://testflight.apple.com/join/Uhzebmut>
@@ -104,7 +111,7 @@ Please follow the below instructions to test the app for the Android Platform:
 
 1. Add minimum SDK version (`minSdkVersion 21`) in `android/app/build.gradle` file (inside `defaultConfig`).
 
-```json
+```
 ...
 defaultConfig {
     ...
@@ -116,7 +123,7 @@ defaultConfig {
 
 2. To add PIP support in your app manifest files, add:
 
-```xml
+```
 <activity
     ....
     android:supportsPictureInPicture="true"
@@ -152,7 +159,7 @@ super.onActivityResult(requestCode, resultCode, data)
 
 5. Add the `FOREGROUND_SERVICE` permission in `AndroidManifest.xml`:
 
-```xml
+```
 <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 ```
 
@@ -162,11 +169,44 @@ Please follow the below instructions to test the app for iOS Platform
 
 1. Add the target platform version as (`platform :ios, '12.0'`) in `ios/Podfile`
 
-```json
+```
 platform :ios, '12.0'
 ```
+2. Allow camera, recording audio and internet permissions by adding the below snippet to the `ios/Runner/info.plist` file.
+
+    ```
+    <key>NSMicrophoneUsageDescription</key>
+    <string>{YourAppName} wants to use your microphone</string>
+
+    <key>NSCameraUsageDescription</key>
+    <string>{YourAppName} wants to use your camera</string>
+
+    <key>NSLocalNetworkUsageDescription</key>
+    <string>{YourAppName} App wants to use your local network</string>
+
+    <key>NSBluetoothAlwaysUsageDescription</key>
+	<string>{YourAppName} needs access to bluetooth to connect to nearby devices.</string>
+    ```
+
+3. Add the below snippet to the `ios/Podfile` in post_install section:
+
+    ```
+    target.build_configurations.each do |config|
+    config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+        '$(inherited)',
+        ## dart: PermissionGroup.camera
+        'PERMISSION_CAMERA=1',
+
+        ## dart: PermissionGroup.microphone
+        'PERMISSION_MICROPHONE=1',
+
+        ## dart: PermissionGroup.bluetooth
+        'PERMISSION_BLUETOOTH=1',
+    ]
+    end
+    ```
 
-2. To add PIP support in your iOS app:
+4. To add PIP support in your iOS app:
 
 - Minimum Requirements:
   - Minimum iOS version required to support PiP is iOS 15
@@ -179,9 +219,9 @@ After you receive permission from Apple, add the Entitlement to your app by open
 
 ![Entitlements](https://www.100ms.live/docs/docs/v2/flutter-multitasking-camera-entitlement.png)
 
-3. To add screen share support in iOS app, checkout the docs [here](https://www.100ms.live/docs/flutter/v2/how-to-guides/set-up-video-conferencing/screen-share#ios-setup)
+5. To add screen share support in iOS app, checkout the docs [here](https://www.100ms.live/docs/flutter/v2/how-to-guides/set-up-video-conferencing/screen-share#ios-setup)
 
-4. Pass the `iOSScreenshareConfig` in `HMSPrebuiltOptions` parameter of `HMSPrebuilt` widget to enable screen share in your app.
+6. Pass the `iOSScreenshareConfig` in `HMSPrebuiltOptions` parameter of `HMSPrebuilt` widget to enable screen share in your app.
 
 ```dart
 // Pass the correct App Group & Preferred Extension parameters in HMSIOSScreenshareConfig class.

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 (1.2.1):
+  - HMSSDK (1.3.0):
     - HMSAnalyticsSDK (= 0.0.2)
     - HMSWebRTC (= 1.0.5116)
   - hmssdk_flutter (1.9.3):
     - Flutter
     - HMSBroadcastExtensionSDK (= 0.0.9)
     - HMSHLSPlayerSDK (= 0.0.2)
-    - HMSSDK (= 1.2.1)
+    - HMSSDK (= 1.3.0)
   - HMSWebRTC (1.0.5116)
   - path_provider_foundation (0.0.1):
     - Flutter
@@ -70,15 +70,15 @@ SPEC CHECKSUMS:
   HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7
   HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb
   HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3
-  HMSSDK: 6e176238d9972b78b7831398bbfefc3fddadad55
-  hmssdk_flutter: ceffbce79af4203f64def3fefe79f8f87c75a49c
+  HMSSDK: 631908d772646b66b3c4f7f4e1fb2681f7abb990
+  hmssdk_flutter: 0b17359aefb7ec222e1b0cc44a595759a317ff98
   HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  url_launcher_ios: 68d46cc9766d0c41dbdc884310529557e3cd7a86
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
 
 PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.14.3
diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock
@@ -41,14 +41,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
-  bot_toast:
-    dependency: transitive
-    description:
-      name: bot_toast
-      sha256: "6b93030a99a98335b8827ecd83021e92e885ffc61d261d3825ffdecdd17f3bdf"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.3"
   characters:
     dependency: transitive
     description:
@@ -85,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: cross_file
-      sha256: "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c"
+      sha256: "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3+6"
+    version: "0.3.3+7"
   crypto:
     dependency: transitive
     description:
@@ -222,15 +214,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.6"
+    version: "1.0.7"
   hmssdk_flutter:
     dependency: transitive
     description:
       name: hmssdk_flutter
-      sha256: "70d00820ab5cb02c03c2d4f41be70dd9dc3406521a469b8989d1e650232efd9a"
+      sha256: "27dfc516ee4673ff092fc4e18487c315780b8470a2fbcf0f486bdfa529fc53cb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.3"
+    version: "1.9.4"
   http:
     dependency: transitive
     description:
@@ -451,10 +443,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
+      sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.6"
+    version: "2.1.7"
   pointycastle:
     dependency: transitive
     description:
@@ -640,10 +632,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a"
+      sha256: bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "6.2.1"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -744,10 +736,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
+      sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "5.1.1"
   xdg_directories:
     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.6
+version: 1.0.7
 
 environment:
   sdk: ">=2.19.6 <3.0.0"

diff --git a/packages/hms_room_kit/lib/src/common/utility_functions.dart b/packages/hms_room_kit/lib/src/common/utility_functions.dart
@@ -1,13 +1,12 @@
-//Package imports
+///Dart imports
 import 'dart:io';
 import 'dart:math' as math;
 
-import 'package:bot_toast/bot_toast.dart';
+///Package imports
 import 'package:flutter/material.dart';
 import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:hms_room_kit/hms_room_kit.dart';
 import 'package:hmssdk_flutter/hmssdk_flutter.dart';
-import 'package:hms_room_kit/src/common/animated_text.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -266,16 +265,16 @@ class Utilities {
 
   static void showTimedMetadata(String message,
       {int time = 1, Alignment align = const Alignment(0, 0.8)}) {
-    BotToast.showText(
-        align: align,
-        wrapToastAnimation: (controller, cancelFunc, widget) =>
-            AnimatedTextWidget(
-                text: message, duration: Duration(seconds: time)),
-        onlyOne: false,
-        textStyle: HMSTextStyle.setTextStyle(fontSize: 14),
-        text: message,
-        contentColor: Colors.black87,
-        duration: Duration(seconds: time));
+    // BotToast.showText(
+    //     align: align,
+    //     wrapToastAnimation: (controller, cancelFunc, widget) =>
+    //         AnimatedTextWidget(
+    //             text: message, duration: Duration(seconds: time)),
+    //     onlyOne: false,
+    //     textStyle: HMSTextStyle.setTextStyle(fontSize: 14),
+    //     text: message,
+    //     contentColor: Colors.black87,
+    //     duration: Duration(seconds: time));
   }
 
   static Future<String> getStringData({required String key}) async {

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
@@ -42,7 +42,10 @@ class HLSViewerHeader extends StatelessWidget {
                     ? Container()
                     : HMSRoomLayout.roleLayoutData!.logo!.url!.contains("svg")
                         ? SvgPicture.network(
-                            HMSRoomLayout.roleLayoutData!.logo!.url!)
+                            HMSRoomLayout.roleLayoutData!.logo!.url!,
+                            height: 30,
+                            width: 30,
+                          )
                         : Image.network(
                             HMSRoomLayout.roleLayoutData!.logo!.url!,
                             errorBuilder: (context, exception, _) {

diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
@@ -292,9 +292,11 @@ class _MeetingPageState extends State<MeetingPage> {
                                                                     context:
                                                                         context,
                                                                     size: size)
-                                                                : const CustomOneToOneGrid(
+                                                                : CustomOneToOneGrid(
                                                                     isLocalInsetPresent:
                                                                         false,
+                                                                    peerTracks:
+                                                                        data.item1,
                                                                   ),
                                                           ));
                                                     });