Merge pull request #1668 from 100mslive/develop

Release 1.9.5: Develop to main
100mslive · Dec 15, 2023 · 4393b85 · 4393b85
2 parents e180d64 + 310a9a7
commit 4393b85
Show file tree

Hide file tree

Showing 69 changed files with 1,066 additions and 702 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,4 @@ sample apps/hms-callkit-app/.dart_tool/flutter_build/
 .DS_Store
 packages/.DS_Store
 Runner.ipa
+sample apps/flutterflow-prebuilt-quickstart/.dart_tool/
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -1,6 +1,6 @@
 version: 0.1
 cli:
-  version: 1.17.2
+  version: 1.18.0
 plugins:
   sources:
     - id: trunk
@@ -10,9 +10,9 @@ lint:
   enabled:
     - [email protected]
     - [email protected]
-    - osv-scanner@1.4.3
-    - trivy@0.47.0
-    - [email protected]-rc0
+    - osv-scanner@1.5.0
+    - trivy@0.48.0
+    - [email protected]
     - [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,17 @@
 | 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.8 - 2023-12-15
+
+| Package        | Version                                                                                                |
+| -------------- | ------------------------------------------------------------------------------------------------------ |
+| hms_room_kit   | 1.0.8     |
+| hmssdk_flutter | 1.9.5     |
+
+### 🔄 Changed
+
+- Updated Streaming and Recording UI
+
 ## 1.0.7 - 2023-12-08
 
 | Package        | Version                                                                                                |

diff --git a/packages/hms_room_kit/README.md b/packages/hms_room_kit/README.md
@@ -14,12 +14,12 @@
 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) |
 
+
 🧱 The Prebuilt QuickStart Guide is [available here](https://www.100ms.live/docs/flutter/v2/quickstart/prebuilt).
 
 📖 Read the Complete Documentation here: https://www.100ms.live/docs/flutter/v2/guides/quickstart

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.3.0):
+  - HMSSDK (1.3.1):
     - HMSAnalyticsSDK (= 0.0.2)
     - HMSWebRTC (= 1.0.5116)
-  - hmssdk_flutter (1.9.3):
+  - hmssdk_flutter (1.9.4):
     - Flutter
     - HMSBroadcastExtensionSDK (= 0.0.9)
     - HMSHLSPlayerSDK (= 0.0.2)
-    - HMSSDK (= 1.3.0)
+    - HMSSDK (= 1.3.1)
   - HMSWebRTC (1.0.5116)
   - path_provider_foundation (0.0.1):
     - Flutter
@@ -70,8 +70,8 @@ SPEC CHECKSUMS:
   HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7
   HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb
   HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3
-  HMSSDK: 631908d772646b66b3c4f7f4e1fb2681f7abb990
-  hmssdk_flutter: 0b17359aefb7ec222e1b0cc44a595759a317ff98
+  HMSSDK: 04aac0fefd95419cd1b4135156d4295cbcd51216
+  hmssdk_flutter: 3876d06f4ad68bf48a2ceb4c797551fedb860bd1
   HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6

diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock
@@ -214,15 +214,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.7"
+    version: "1.0.8"
   hmssdk_flutter:
     dependency: transitive
     description:
       name: hmssdk_flutter
-      sha256: "27dfc516ee4673ff092fc4e18487c315780b8470a2fbcf0f486bdfa529fc53cb"
+      sha256: f61fb1ffcaf7296e0e2eeff9bc34d699baf9190136b8570a15cde61819cf3276
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.4"
+    version: "1.9.5"
   http:
     dependency: transitive
     description:
@@ -243,10 +243,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   js:
     dependency: transitive
     description:
@@ -616,10 +616,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher
-      sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba
+      sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.2.2"
   url_launcher_android:
     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.7
+version: 1.0.8
 
 environment:
   sdk: ">=2.19.6 <3.0.0"

diff --git a/packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg b/packages/hms_room_kit/lib/src/assets/icons/recording_paused.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
@@ -4,6 +4,7 @@ import 'dart:io';
 ///Package imports
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:hms_room_kit/hms_room_kit.dart';
 import 'package:provider/provider.dart';
 
 ///Project imports
@@ -14,7 +15,6 @@ import 'package:hms_room_kit/src/common/utility_components.dart';
 import 'package:hms_room_kit/src/hls_viewer/hls_chat_component.dart';
 import 'package:hms_room_kit/src/widgets/bottom_sheets/hls_more_options.dart';
 import 'package:hms_room_kit/src/hls_viewer/hls_player_store.dart';
-import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart';
 import 'package:hms_room_kit/src/meeting/meeting_store.dart';
 import 'package:hms_room_kit/src/widgets/common_widgets/hms_embedded_button.dart';
 
@@ -223,38 +223,45 @@ class HLSViewerBottomNavigationBar extends StatelessWidget {
                                 ),
 
                               ///Menu Button
-                              HMSEmbeddedButton(
-                                onTap: () async => {
-                                  showModalBottomSheet(
-                                    isScrollControlled: true,
-                                    backgroundColor: HMSThemeColors.surfaceDim,
-                                    shape: const RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.only(
-                                          topLeft: Radius.circular(16),
-                                          topRight: Radius.circular(16)),
-                                    ),
-                                    context: context,
-                                    builder: (ctx) => ChangeNotifierProvider.value(
-                                        value: context.read<MeetingStore>(),
-                                        child:
-                                            const HLSMoreOptionsBottomSheet()),
-                                  )
-                                },
-                                enabledBorderColor:
-                                    HMSThemeColors.backgroundDim.withAlpha(64),
-                                onColor:
-                                    HMSThemeColors.backgroundDim.withAlpha(64),
-                                isActive: true,
-                                child: Padding(
-                                  padding: const EdgeInsets.all(8.0),
-                                  child: SvgPicture.asset(
-                                      "packages/hms_room_kit/lib/src/assets/icons/menu.svg",
-                                      colorFilter: ColorFilter.mode(
-                                          HMSThemeColors.onSurfaceHighEmphasis,
-                                          BlendMode.srcIn),
-                                      semanticsLabel: "more_button"),
+                              if (HMSRoomLayout.isParticipantsListEnabled ||
+                                  Constant.prebuiltOptions?.userName == null)
+                                HMSEmbeddedButton(
+                                  onTap: () async => {
+                                    showModalBottomSheet(
+                                      isScrollControlled: true,
+                                      backgroundColor:
+                                          HMSThemeColors.surfaceDim,
+                                      shape: const RoundedRectangleBorder(
+                                        borderRadius: BorderRadius.only(
+                                            topLeft: Radius.circular(16),
+                                            topRight: Radius.circular(16)),
+                                      ),
+                                      context: context,
+                                      builder: (ctx) =>
+                                          ChangeNotifierProvider.value(
+                                              value:
+                                                  context.read<MeetingStore>(),
+                                              child:
+                                                  const HLSMoreOptionsBottomSheet()),
+                                    )
+                                  },
+                                  enabledBorderColor: HMSThemeColors
+                                      .backgroundDim
+                                      .withAlpha(64),
+                                  onColor: HMSThemeColors.backgroundDim
+                                      .withAlpha(64),
+                                  isActive: true,
+                                  child: Padding(
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: SvgPicture.asset(
+                                        "packages/hms_room_kit/lib/src/assets/icons/menu.svg",
+                                        colorFilter: ColorFilter.mode(
+                                            HMSThemeColors
+                                                .onSurfaceHighEmphasis,
+                                            BlendMode.srcIn),
+                                        semanticsLabel: "more_button"),
+                                  ),
                                 ),
-                              ),
                             ],
                           )
                         : Container(),

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
@@ -2,9 +2,10 @@
 import 'dart:developer';
 import 'dart:io';
 
+///Package imports
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:hms_room_kit/src/common/utility_functions.dart';
+import 'package:hmssdk_flutter/hmssdk_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:tuple/tuple.dart';
 
@@ -13,6 +14,7 @@ import 'package:hms_room_kit/src/layout_api/hms_room_layout.dart';
 import 'package:hms_room_kit/src/layout_api/hms_theme_colors.dart';
 import 'package:hms_room_kit/src/meeting/meeting_store.dart';
 import 'package:hms_room_kit/src/widgets/common_widgets/hms_title_text.dart';
+import 'package:hms_room_kit/src/common/utility_functions.dart';
 
 ///[HLSViewerHeader] is the header of the HLS Viewer screen
 class HLSViewerHeader extends StatelessWidget {
@@ -67,7 +69,10 @@ class HLSViewerHeader extends StatelessWidget {
                 ///If the HLS streaming is not started we show nothing
                 Selector<MeetingStore, bool>(
                     selector: (_, meetingStore) =>
-                        meetingStore.streamingType['hls'] ?? false,
+                        (meetingStore.streamingType['hls'] ==
+                                HMSStreamingState.started ||
+                            meetingStore.streamingType['rtmp'] ==
+                                HMSStreamingState.started),
                     builder: (_, isHLSStarted, __) {
                       return isHLSStarted
                           ? Container(
@@ -97,14 +102,24 @@ class HLSViewerHeader extends StatelessWidget {
                 ///If the recording is not started we show nothing
                 ///
                 ///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),
+                Selector<
+                        MeetingStore,
+                        Tuple3<HMSRecordingState, HMSRecordingState,
+                            HMSRecordingState>>(
+                    selector: (_, meetingStore) => Tuple3(
+                        meetingStore.recordingType["browser"] ??
+                            HMSRecordingState.none,
+                        meetingStore.recordingType["server"] ??
+                            HMSRecordingState.none,
+                        meetingStore.recordingType["hls"] ??
+                            HMSRecordingState.none),
                     builder: (_, data, __) {
-                      return (data.item1 || data.item2 || data.item3)
+                      return (data.item1 == HMSRecordingState.started ||
+                              data.item1 == HMSRecordingState.resumed ||
+                              data.item2 == HMSRecordingState.started ||
+                              data.item2 == HMSRecordingState.resumed ||
+                              data.item3 == HMSRecordingState.started ||
+                              data.item3 == HMSRecordingState.resumed)
                           ? SvgPicture.asset(
                               "packages/hms_room_kit/lib/src/assets/icons/record.svg",
                               height: 24,
@@ -113,26 +128,42 @@ class HLSViewerHeader extends StatelessWidget {
                                   HMSThemeColors.alertErrorDefault,
                                   BlendMode.srcIn),
                             )
-                          : data.item4
+                          : (data.item1 == HMSRecordingState.starting ||
+                                  data.item2 == HMSRecordingState.starting ||
+                                  data.item3 == HMSRecordingState.starting)
                               ? SizedBox(
                                   height: 24,
                                   width: 24,
                                   child: CircularProgressIndicator(
                                     strokeWidth: 1,
                                     color: HMSThemeColors.onSurfaceHighEmphasis,
                                   ))
-                              : Container();
+                              : (data.item1 == HMSRecordingState.paused ||
+                                      data.item2 == HMSRecordingState.paused ||
+                                      data.item3 == HMSRecordingState.paused)
+                                  ? SvgPicture.asset(
+                                      "packages/hms_room_kit/lib/src/assets/icons/recording_paused.svg",
+                                      height: 24,
+                                      width: 24,
+                                      colorFilter: ColorFilter.mode(
+                                          HMSThemeColors.onSurfaceHighEmphasis,
+                                          BlendMode.srcIn),
+                                    )
+                                  : Container();
                     }),
                 const SizedBox(
                   width: 8,
                 ),
 
                 ///This renders the number of peers
-                ///If the HLS streaming is started, we render the number of peers
+                ///If the HLS or RTMP streaming is started, we render the number of peers
                 ///else we render an empty Container
                 Selector<MeetingStore, Tuple2<bool, int>>(
                     selector: (_, meetingStore) => Tuple2(
-                        meetingStore.streamingType['hls'] ?? false,
+                        meetingStore.streamingType['hls'] ==
+                                HMSStreamingState.started ||
+                            meetingStore.streamingType['rtmp'] ==
+                                HMSStreamingState.started,
                         meetingStore.peersInRoom),
                     builder: (_, data, __) {
                       return data.item1