From fd537440fb7daa1cce038dd4652e434394b3ba2d Mon Sep 17 00:00:00 2001 From: Pushpam <93931528+Decoder07@users.noreply.github.com> Date: Wed, 17 Jan 2024 12:53:41 +0530 Subject: [PATCH 01/16] FLUT-139: Auto-Hide Top & Bottom Bars after 5 seconds (#1692) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added auto hide functionality for header and footer * 🤖 Automated Format and Fix * Fixed conflicts --------- Co-authored-by: Decoder07 Co-authored-by: ygit --- .../src/meeting/meeting_grid_component.dart | 124 ++++++++++++++++ ...ting_navigation_visibility_controller.dart | 26 ++++ .../lib/src/meeting/meeting_page.dart | 137 +----------------- .../meeting_modes/one_to_one_mode.dart | 2 - 4 files changed, 158 insertions(+), 131 deletions(-) create mode 100644 packages/hms_room_kit/lib/src/meeting/meeting_grid_component.dart diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_grid_component.dart b/packages/hms_room_kit/lib/src/meeting/meeting_grid_component.dart new file mode 100644 index 000000000..9829b788d --- /dev/null +++ b/packages/hms_room_kit/lib/src/meeting/meeting_grid_component.dart @@ -0,0 +1,124 @@ +///Dart imports +import 'dart:io'; + +///Package imports +import 'package:flutter/material.dart'; +import 'package:hmssdk_flutter/hmssdk_flutter.dart'; +import 'package:provider/provider.dart'; +import 'package:tuple/tuple.dart'; + +///Project imports +import 'package:hms_room_kit/hms_room_kit.dart'; +import 'package:hms_room_kit/src/enums/meeting_mode.dart'; +import 'package:hms_room_kit/src/meeting/meeting_navigation_visibility_controller.dart'; +import 'package:hms_room_kit/src/meeting/meeting_store.dart'; +import 'package:hms_room_kit/src/model/peer_track_node.dart'; +import 'package:hms_room_kit/src/widgets/meeting_modes/custom_one_to_one_grid.dart'; +import 'package:hms_room_kit/src/widgets/meeting_modes/one_to_one_mode.dart'; + +///[MeetingGridComponent] is a component that is used to show the video grid +class MeetingGridComponent extends StatelessWidget { + final MeetingNavigationVisibilityController? visibilityController; + + const MeetingGridComponent({super.key, required this.visibilityController}); + + @override + Widget build(BuildContext context) { + return Selector< + MeetingStore, + Tuple6, bool, int, int, MeetingMode, + PeerTrackNode?>>( + selector: (_, meetingStore) => Tuple6( + meetingStore.peerTracks, + meetingStore.isHLSLink, + meetingStore.peerTracks.length, + meetingStore.screenShareCount, + meetingStore.meetingMode, + meetingStore.peerTracks.isNotEmpty + ? meetingStore.peerTracks[meetingStore.screenShareCount] + : null), + builder: (_, data, __) { + if (data.item3 == 0) { + return Center( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + CircularProgressIndicator( + strokeWidth: 2, + color: HMSThemeColors.primaryDefault, + ), + const SizedBox( + height: 10, + ), + if (context.read().peers.isNotEmpty) + HMSTitleText( + text: "Please wait for broadcaster to join", + textColor: HMSThemeColors.onSurfaceHighEmphasis) + ], + )); + } + return Selector>( + selector: (_, meetingStore) => + Tuple2(meetingStore.meetingMode, meetingStore.localPeer), + builder: (_, modeData, __) { + ///This renders the video grid based on whether the controls are visible or not + return Selector( + selector: (_, meetingNavigationVisibilityController) => + meetingNavigationVisibilityController.showControls, + builder: (_, showControls, __) { + return Center( + child: AnimatedContainer( + duration: const Duration(milliseconds: 200), + + ///If the controls are visible we reduce the + ///height of video grid by 140 else it covers the whole screen + /// + ///Here we also check for the platform and reduce the height accordingly + height: showControls + ? MediaQuery.of(context).size.height - + MediaQuery.of(context).padding.top - + MediaQuery.of(context).padding.bottom - + (Platform.isAndroid + ? 160 + : Platform.isIOS + ? 230 + : 160) + : MediaQuery.of(context).size.height - + MediaQuery.of(context).padding.top - + MediaQuery.of(context).padding.bottom - + 20, + child: GestureDetector( + onTap: () => visibilityController + ?.toggleControlsVisibility(), + child: (modeData.item1 == + MeetingMode.activeSpeakerWithInset && + (context + .read() + .localPeer + ?.audioTrack != + null || + context + .read() + .localPeer + ?.videoTrack != + null)) + ? OneToOneMode( + ///This is done to keep the inset tile + ///at correct position when controls are hidden + bottomMargin: showControls ? 250 : 130, + peerTracks: data.item1, + screenShareCount: data.item4, + context: context, + ) + : CustomOneToOneGrid( + isLocalInsetPresent: false, + peerTracks: data.item1, + ), + ), + ), + ); + }); + }); + }); + } +} diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_navigation_visibility_controller.dart b/packages/hms_room_kit/lib/src/meeting/meeting_navigation_visibility_controller.dart index 194744c18..c0b5a1157 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_navigation_visibility_controller.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_navigation_visibility_controller.dart @@ -1,10 +1,36 @@ +///Dart imports +import 'dart:async'; + +///Package imports import 'package:flutter/widgets.dart'; class MeetingNavigationVisibilityController extends ChangeNotifier { bool showControls = true; + ///This variable stores whether the timer is active or not + /// + ///This is done to avoid multiple timers running at the same time + bool _isTimerActive = false; + + ///This method toggles the visibility of the buttons void toggleControlsVisibility() { showControls = !showControls; + + ///If the controls are now visible and + ///If the timer is not active, we start the timer + if (showControls && !_isTimerActive) { + startTimerToHideButtons(); + } notifyListeners(); } + + ///This method starts a timer for 5 seconds and then hides the buttons + void startTimerToHideButtons() { + _isTimerActive = true; + Timer(const Duration(seconds: 5), () { + showControls = false; + _isTimerActive = false; + notifyListeners(); + }); + } } diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart index 27bf239bc..2410aa88e 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart @@ -11,10 +11,7 @@ import 'package:hmssdk_flutter/hmssdk_flutter.dart'; ///Project imports import 'package:hms_room_kit/hms_room_kit.dart'; -import 'package:hms_room_kit/src/enums/meeting_mode.dart'; -import 'package:hms_room_kit/src/model/peer_track_node.dart'; -import 'package:hms_room_kit/src/widgets/meeting_modes/custom_one_to_one_grid.dart'; -import 'package:hms_room_kit/src/widgets/meeting_modes/one_to_one_mode.dart'; +import 'package:hms_room_kit/src/meeting/meeting_grid_component.dart'; import 'package:hms_room_kit/src/meeting/meeting_navigation_visibility_controller.dart'; import 'package:hms_room_kit/src/meeting/meeting_bottom_navigation_bar.dart'; import 'package:hms_room_kit/src/meeting/meeting_header.dart'; @@ -63,6 +60,7 @@ class _MeetingPageState extends State { checkAudioState(); _enableForegroundService(); _visibilityController = MeetingNavigationVisibilityController(); + _visibilityController!.startTimerToHideButtons(); } void checkAudioState() async { @@ -185,130 +183,11 @@ class _MeetingPageState extends State { MediaQuery.of(context).padding.bottom, child: Stack( children: [ - Selector< - MeetingStore, - Tuple6< - List, - bool, - int, - int, - MeetingMode, - PeerTrackNode?>>( - selector: (_, meetingStore) => Tuple6( - meetingStore.peerTracks, - meetingStore.isHLSLink, - meetingStore - .peerTracks.length, - meetingStore.screenShareCount, - meetingStore.meetingMode, - meetingStore - .peerTracks.isNotEmpty - ? meetingStore.peerTracks[ - meetingStore - .screenShareCount] - : null), - builder: (_, data, __) { - if (data.item3 == 0) { - return Center( - child: Column( - mainAxisSize: - MainAxisSize.min, - children: [ - CircularProgressIndicator( - strokeWidth: 2, - color: HMSThemeColors - .primaryDefault, - ), - const SizedBox( - height: 10, - ), - if (context - .read() - .peers - .isNotEmpty) - HMSTitleText( - text: - "Please wait for broadcaster to join", - textColor: - HMSThemeColors - .onSurfaceHighEmphasis) - ], - )); - } - return Selector< - MeetingStore, - Tuple2>( - selector: (_, - meetingStore) => - Tuple2( - meetingStore - .meetingMode, - meetingStore - .localPeer), - builder: (_, modeData, __) { - Size size = Size( - MediaQuery.of(context) - .size - .width, - MediaQuery.of(context) - .size - .height - - 122 - - MediaQuery.of( - context) - .padding - .bottom - - MediaQuery.of( - context) - .padding - .top); - return Positioned( - top: 55, - left: 0, - right: 0, - bottom: 68, - /*** - * The logic for gridview is as follows: - * - Default mode is Active Speaker mode which displays only 4 tiles on screen without scroll and updates the tile according to who is currently speaking - * - If there are only 2 peers in the room in which one is local peer then automatically the mode is switched to oneToOne mode - * - As the peer count increases the mode is switched back to active speaker view in case of default mode - * - Remaining as the mode from bottom sheet is selected corresponding grid layout is rendered - */ - child: - GestureDetector( - onTap: () => - _visibilityController - ?.toggleControlsVisibility(), - child: (modeData - .item1 == - MeetingMode - .activeSpeakerWithInset && - (context.read().localPeer?.audioTrack != - null || - context.read().localPeer?.videoTrack != - null)) - ? OneToOneMode( - bottomMargin: - 225, - peerTracks: - data - .item1, - screenShareCount: - data - .item4, - context: - context, - size: size) - : CustomOneToOneGrid( - isLocalInsetPresent: - false, - peerTracks: - data.item1, - ), - )); - }); - }), + ChangeNotifierProvider.value( + value: _visibilityController, + child: MeetingGridComponent( + visibilityController: + _visibilityController)), Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -396,7 +275,7 @@ class _MeetingPageState extends State { child: Stack( children: [ ///This renders the video component - ///[HMSVideoView] is only rendered if video is ON + ///[HMSTextureView] is only rendered if video is ON /// ///else we render the [HMSCircularAvatar] Selector< diff --git a/packages/hms_room_kit/lib/src/widgets/meeting_modes/one_to_one_mode.dart b/packages/hms_room_kit/lib/src/widgets/meeting_modes/one_to_one_mode.dart index 0c3f8b289..451a892f0 100644 --- a/packages/hms_room_kit/lib/src/widgets/meeting_modes/one_to_one_mode.dart +++ b/packages/hms_room_kit/lib/src/widgets/meeting_modes/one_to_one_mode.dart @@ -17,14 +17,12 @@ import 'package:hms_room_kit/src/widgets/peer_widgets/inset_collapsed_view.dart' class OneToOneMode extends StatefulWidget { final List peerTracks; final BuildContext context; - final Size size; final int screenShareCount; final double bottomMargin; const OneToOneMode( {Key? key, required this.peerTracks, required this.context, - required this.size, required this.screenShareCount, this.bottomMargin = 272}) : super(key: key); From a7be21ea9082a514ba713a8ff09b8700316dcecb Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Wed, 17 Jan 2024 13:48:00 +0530 Subject: [PATCH 02/16] Update sdk versions --- .../hmssdk_flutter/example/ios/Podfile.lock | 36 +++++++++---------- .../lib/assets/sdk-versions.json | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index 928741223..e7280467f 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -25,15 +25,15 @@ PODS: - Firebase/Performance (= 10.9.0) - firebase_core - Flutter - - FirebaseABTesting (10.19.0): + - FirebaseABTesting (10.20.0): - FirebaseCore (~> 10.0) - FirebaseCore (10.9.0): - FirebaseCoreInternal (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreExtension (10.19.0): + - FirebaseCoreExtension (10.20.0): - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.19.0): + - FirebaseCoreInternal (10.20.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - FirebaseCrashlytics (10.9.0): - FirebaseCore (~> 10.5) @@ -45,7 +45,7 @@ PODS: - PromisesObjC (~> 2.1) - FirebaseDynamicLinks (10.9.0): - FirebaseCore (~> 10.0) - - FirebaseInstallations (10.19.0): + - FirebaseInstallations (10.20.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) @@ -60,14 +60,14 @@ PODS: - GoogleUtilities/ISASwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (10.19.0): + - FirebaseRemoteConfig (10.20.0): - FirebaseABTesting (~> 10.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - FirebaseSharedSwift (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseSessions (10.19.0): + - FirebaseSessions (10.20.0): - FirebaseCore (~> 10.5) - FirebaseCoreExtension (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -75,7 +75,7 @@ PODS: - GoogleUtilities/Environment (~> 7.10) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (10.19.0) + - FirebaseSharedSwift (10.20.0) - Flutter (1.0.0) - flutter_foreground_task (0.0.1): - Flutter @@ -97,14 +97,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.4.1): + - HMSSDK (1.4.2): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - hmssdk_flutter (1.9.6): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.4.1) + - HMSSDK (= 1.4.2) - HMSWebRTC (1.0.5116) - MTBBarcodeScanner (5.0.11) - nanopb (2.30909.1): @@ -217,17 +217,17 @@ SPEC CHECKSUMS: firebase_crashlytics: 9b80d1944507cc07fa1c4455797f7d2eb7c8873f firebase_dynamic_links: db9f2ebcc3ea646e76a1d3ee37e9e57890ff0a83 firebase_performance: d11d1fd9591547f6b75f325aaadd6550eaf7e090 - FirebaseABTesting: bfa3b384b68cee10a89183649c64cd7998a37a12 + FirebaseABTesting: 1d5d49804bcfc5fa782bc2491a8c1364e2cf7241 FirebaseCore: b68d3616526ec02e4d155166bbafb8eca64af557 - FirebaseCoreExtension: c08d14c7b22e07994e876d837e6f58642f340087 - FirebaseCoreInternal: b444828ea7cfd594fca83046b95db98a2be4f290 + FirebaseCoreExtension: 0659f035b88c5a7a15a9763c48c2e6ca8c0a2977 + FirebaseCoreInternal: efeeb171ac02d623bdaefe121539939821e10811 FirebaseCrashlytics: b60329455285aff853e54139d8ddbfe1e5f2b9f9 FirebaseDynamicLinks: 8cb66c4f403aa6ddf86ff3bc3c383a652f344ce9 - FirebaseInstallations: 033d199474164db20c8350736842a94fe717b960 + FirebaseInstallations: 558b1da7d65afeb996fd5c814332f013234ece4e FirebasePerformance: eee2f5da94fd7e5d15487649f8fe10a90c87c174 - FirebaseRemoteConfig: a7fcc7a5941faa7e09248e91c8797340aa4c85f6 - FirebaseSessions: e5f4caa188dc8bc6142abc974355be75b042215e - FirebaseSharedSwift: f34eeb7d3ea87a34497629b6ca41657beadef76a + FirebaseRemoteConfig: b873a427a48159082361343a85649eed3f5377ea + FirebaseSessions: 2f348975f6d1c139231c180e12194161da2e0cd6 + FirebaseSharedSwift: 2fbf73618288b7a36b2014b957745dcdd781389e Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817 GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe @@ -235,8 +235,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 6a579cb806d4760cda149002150ff0beab03749b - hmssdk_flutter: 0b12e79b2f184fa3308fb65dade6e3b022d805c9 + HMSSDK: 7be2385e9e3ddbd5c03a228934622d679d033e15 + hmssdk_flutter: 1cd1e55001bdfd1b015eebced25ba3a7fb64649b HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 diff --git a/packages/hmssdk_flutter/lib/assets/sdk-versions.json b/packages/hmssdk_flutter/lib/assets/sdk-versions.json index 3a03d19de..f78aa5d02 100644 --- a/packages/hmssdk_flutter/lib/assets/sdk-versions.json +++ b/packages/hmssdk_flutter/lib/assets/sdk-versions.json @@ -1,7 +1,7 @@ { "flutter": "1.9.6", - "ios": "1.4.1", + "ios": "1.4.2", "iOSBroadcastExtension": "0.0.9", "iOSHLSPlayerSDK": "0.0.2", - "android": "2.8.5" + "android": "2.8.8" } From 7fde932140c3547d600111ce6c16180893c8ad8d Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Wed, 17 Jan 2024 14:03:08 +0530 Subject: [PATCH 03/16] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?25=20(425)=20=F0=9F=8D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/ExampleAppChangelog.txt | 39 ++++--------------- .../example/android/app/build.gradle | 4 +- .../hmssdk_flutter/example/ios/Podfile.lock | 8 ++-- .../example/ios/Runner/Info.plist | 4 +- packages/hmssdk_flutter/example/pubspec.lock | 26 ++++++------- packages/hmssdk_flutter/pubspec.lock | 26 ++++++------- 6 files changed, 42 insertions(+), 65 deletions(-) diff --git a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt index d41238161..4843be1fb 100644 --- a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt +++ b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt @@ -1,35 +1,12 @@ Board: https://100ms.atlassian.net/jira/software/projects/FLUT/boards/34/ -- Add app launch animation for Prebuilt -https://100ms.atlassian.net/browse/FLUT-180 +- Prebuilt: Auto-Hide Top & Bottom Bars after 5 seconds +https://100ms.atlassian.net/browse/FLUT-139 -- Real time chat controls -https://100ms.atlassian.net/browse/FLUT-153 +- iOS: end session from dashboard not kicking iOS user intermittently +https://100ms.atlassian.net/browse/FLUT-201 -- Skip Preview for Role Change -https://100ms.atlassian.net/browse/FLUT-162 - -- Even if screenshare is disabled, UI still shows screenshare option -https://100ms.atlassian.net/browse/LIVE-1981 - -- Block Peer From Chat -https://100ms.atlassian.net/browse/FLUT-157 - -- Multi Pin Chat -https://100ms.atlassian.net/browse/FLUT-154 - -- can't see pinned chat(by remote peer) on Flutter -https://100ms.atlassian.net/browse/FLUT-187 - -- Send to picker based on layout API -https://100ms.atlassian.net/browse/FLUT-156 - -- Added hide message functionality - -- Add Remove peer option in message context menu -https://100ms.atlassian.net/browse/FLUT-183 - -Room Kit: 1.0.9 -Core SDK: 1.9.6 -Android SDK: 2.8.5 -iOS SDK: 1.4.1 +Room Kit: 1.0.10 +Core SDK: 1.9.7 +Android SDK: 2.8.8 +iOS SDK: 1.4.2 diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index 012d73a03..d1c1b2871 100644 --- a/packages/hmssdk_flutter/example/android/app/build.gradle +++ b/packages/hmssdk_flutter/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "live.hms.flutter" minSdkVersion 21 targetSdkVersion 33 - versionCode 424 - versionName "1.5.124" + versionCode 425 + versionName "1.5.125" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index e7280467f..e0141acdd 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -97,14 +97,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.4.2): + - HMSSDK (1.4.1): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - hmssdk_flutter (1.9.6): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.4.2) + - HMSSDK (= 1.4.1) - HMSWebRTC (1.0.5116) - MTBBarcodeScanner (5.0.11) - nanopb (2.30909.1): @@ -235,8 +235,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 7be2385e9e3ddbd5c03a228934622d679d033e15 - hmssdk_flutter: 1cd1e55001bdfd1b015eebced25ba3a7fb64649b + HMSSDK: 6a579cb806d4760cda149002150ff0beab03749b + hmssdk_flutter: 0b12e79b2f184fa3308fb65dade6e3b022d805c9 HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index 0c03a60e5..cfd7b1a34 100644 --- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist +++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.124 + 1.5.125 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 424 + 425 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 08aa8aaa8..2ea44d33f 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,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" convert: dependency: transitive description: @@ -363,10 +363,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" mime: dependency: transitive description: @@ -648,18 +648,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: @@ -680,10 +680,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" tuple: dependency: transitive description: @@ -840,10 +840,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" win32: dependency: transitive description: @@ -869,5 +869,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0 <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,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" fake_async: dependency: transitive description: @@ -79,10 +79,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" path: dependency: transitive description: @@ -108,18 +108,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: @@ -140,10 +140,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" vector_math: dependency: transitive description: @@ -156,10 +156,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" From d008e7617d70b9b6be6a0a9bbf7cc1e1671e2569 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 13:07:51 +0530 Subject: [PATCH 04/16] Added changelog --- packages/hms_room_kit/CHANGELOG.md | 13 ++++++ packages/hms_room_kit/example/pubspec.lock | 7 ++- packages/hms_room_kit/pubspec.lock | 7 ++- packages/hms_room_kit/pubspec.yaml | 3 +- packages/hmssdk_flutter/CHANGELOG.md | 11 +++++ .../hms/hmssdk_flutter/HmssdkFlutterPlugin.kt | 44 ++++++++----------- packages/hmssdk_flutter/example/pubspec.lock | 7 ++- 7 files changed, 54 insertions(+), 38 deletions(-) diff --git a/packages/hms_room_kit/CHANGELOG.md b/packages/hms_room_kit/CHANGELOG.md index 573647237..1f0ddb750 100644 --- a/packages/hms_room_kit/CHANGELOG.md +++ b/packages/hms_room_kit/CHANGELOG.md @@ -5,6 +5,19 @@ | 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.10 - 2024-01-18 + +| Package | Version | +| -------------- | ------------------------------------------------------------------------------------------------------ | +| hms_room_kit | 1.0.10 | +| hmssdk_flutter | 1.9.7 | + +### 🚀 Added + +- Auto-Hide Top & Bottom Bars after 5 seconds + + Top & Bottom Bars will be hidden after 5 seconds of inactivity. + ## 1.0.9 - 2024-01-15 | Package | Version | diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 7db874700..4e93043bc 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -218,10 +218,9 @@ packages: hmssdk_flutter: dependency: transitive description: - name: hmssdk_flutter - sha256: "112381755d47a639ef296295ace5b9d73267b89458f33ac767d1b6536a3fc898" - url: "https://pub.dev" - source: hosted + path: "../../hmssdk_flutter" + relative: true + source: path version: "1.9.6" http: dependency: transitive diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index dd3607692..9b2883f03 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -203,10 +203,9 @@ packages: hmssdk_flutter: dependency: "direct main" description: - name: hmssdk_flutter - sha256: "112381755d47a639ef296295ace5b9d73267b89458f33ac767d1b6536a3fc898" - url: "https://pub.dev" - source: hosted + path: "../hmssdk_flutter" + relative: true + source: path version: "1.9.6" http: dependency: transitive diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 52feef84e..a7b71912c 100644 --- a/packages/hms_room_kit/pubspec.yaml +++ b/packages/hms_room_kit/pubspec.yaml @@ -14,7 +14,8 @@ dependencies: flutter: sdk: flutter - hmssdk_flutter: 1.9.6 + hmssdk_flutter: + path: ../hmssdk_flutter intl: ^0.18.0 permission_handler: ^11.0.0 provider: ^6.0.5 diff --git a/packages/hmssdk_flutter/CHANGELOG.md b/packages/hmssdk_flutter/CHANGELOG.md index 47ca3c5a5..dbe992062 100644 --- a/packages/hmssdk_flutter/CHANGELOG.md +++ b/packages/hmssdk_flutter/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.9.7 - 2024-01-18 + +| Package | Version | +| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | +| hms_room_kit | 1.0.10 | +| hmssdk_flutter | 1.9.7 | + +Updated to Android SDK 2.8.8 & iOS SDK 1.4.2 + +**Full Changelog**: [1.9.5...1.9.6](https://github.com/100mslive/100ms-flutter/compare/1.9.6...1.9.7) + # 1.9.6 - 2024-01-15 | Package | Version | diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt index 06fb32e83..6fabd902e 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt @@ -1996,25 +1996,22 @@ class HmssdkFlutterPlugin : private val audioPreviewDeviceChangeListener = object : AudioManagerDeviceChangeListener { + override fun onAudioDeviceChanged( - p0: AudioDevice?, - p1: Set?, + selectedAudioDevice: AudioDevice, + availableAudioDevices: Set, ) { val args = HashMap() args["event_name"] = "on_audio_device_changed" val dict = HashMap() - if (p0 != null) { - dict["current_audio_device"] = p0.name - } - if (p1 != null) { - val audioDevicesList = ArrayList() - hmssdk?.getAudioDevicesList()?.let { audioDevices -> - audioDevices.forEach { device -> - audioDevicesList.add(device.name) - } + dict["current_audio_device"] = selectedAudioDevice.name + val audioDevicesList = ArrayList() + hmssdk?.getAudioDevicesList()?.let { audioDevices -> + audioDevices.forEach { device -> + audioDevicesList.add(device.name) } - dict["available_audio_device"] = audioDevicesList } + dict["available_audio_device"] = audioDevicesList args["data"] = dict if (args["data"] != null) { CoroutineScope(Dispatchers.Main).launch { @@ -2023,10 +2020,10 @@ class HmssdkFlutterPlugin : } } - override fun onError(e: HMSException?) { + override fun onError(e: HMSException) { val args = HashMap() - args.put("event_name", "on_error") - args.put("data", HMSExceptionExtension.toDictionary(e)) + args["event_name"] = "on_error" + args["data"] = HMSExceptionExtension.toDictionary(e) if (args["data"] != null) { CoroutineScope(Dispatchers.Main).launch { @@ -2034,27 +2031,24 @@ class HmssdkFlutterPlugin : } } } + } private val audioDeviceChangeListener = object : AudioManagerDeviceChangeListener { override fun onAudioDeviceChanged( - p0: AudioDevice?, - p1: Set?, + selectedAudioDevice: AudioDevice, + availableAudioDevices: Set, ) { val args = HashMap() args["event_name"] = "on_audio_device_changed" val dict = HashMap() - if (p0 != null) { - dict["current_audio_device"] = p0.name - } - if (p1 != null) { + dict["current_audio_device"] = selectedAudioDevice.name val audioDevicesList = ArrayList() hmssdk?.getAudioDevicesList()?.let { audioDevices -> audioDevices.forEach { device -> audioDevicesList.add(device.name) } - } dict["available_audio_device"] = audioDevicesList } args["data"] = dict @@ -2065,10 +2059,10 @@ class HmssdkFlutterPlugin : } } - override fun onError(e: HMSException?) { + override fun onError(e: HMSException) { val args = HashMap() - args.put("event_name", "on_error") - args.put("data", HMSExceptionExtension.toDictionary(e)) + args["event_name"] = "on_error" + args["data"] = HMSExceptionExtension.toDictionary(e) if (args["data"] != null) { CoroutineScope(Dispatchers.Main).launch { diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 2ea44d33f..cb0c5b7b7 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -290,10 +290,9 @@ packages: hmssdk_flutter: dependency: transitive description: - name: hmssdk_flutter - sha256: "112381755d47a639ef296295ace5b9d73267b89458f33ac767d1b6536a3fc898" - url: "https://pub.dev" - source: hosted + path: ".." + relative: true + source: path version: "1.9.6" http: dependency: transitive From b62b71df2f686c019dbaed513b162d4a758c3bee Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 07:40:21 +0000 Subject: [PATCH 05/16] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/pubspec.lock | 26 ++++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index cb0c5b7b7..098334077 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -647,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: transitive description: @@ -839,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index c3cc2c33e..53939cd59 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" From 67462686356cb5ba9e42848d1232b27c77e73ec5 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 13:13:23 +0530 Subject: [PATCH 06/16] Added changelog --- packages/hmssdk_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hmssdk_flutter/CHANGELOG.md b/packages/hmssdk_flutter/CHANGELOG.md index dbe992062..60f00d23c 100644 --- a/packages/hmssdk_flutter/CHANGELOG.md +++ b/packages/hmssdk_flutter/CHANGELOG.md @@ -14,7 +14,7 @@ Updated to Android SDK 2.8.8 & iOS SDK 1.4.2 -**Full Changelog**: [1.9.5...1.9.6](https://github.com/100mslive/100ms-flutter/compare/1.9.6...1.9.7) +**Full Changelog**: [1.9.6...1.9.7](https://github.com/100mslive/100ms-flutter/compare/1.9.6...1.9.7) # 1.9.6 - 2024-01-15 From 41009aab826b8220ffe6062c34df85e6af3ca129 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 14:37:28 +0530 Subject: [PATCH 07/16] Fixed FLUT-215 --- .../lib/src/meeting/meeting_header.dart | 2 +- .../live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_header.dart b/packages/hms_room_kit/lib/src/meeting/meeting_header.dart index e251bcf62..49b4fc786 100644 --- a/packages/hms_room_kit/lib/src/meeting/meeting_header.dart +++ b/packages/hms_room_kit/lib/src/meeting/meeting_header.dart @@ -292,7 +292,7 @@ class _MeetingHeaderState extends State { ///else we render an empty SizedBox Selector>( selector: (_, meetingStore) => Tuple2( - meetingStore.currentAudioDeviceMode, + meetingStore.currentAudioOutputDevice, meetingStore.isSpeakerOn), builder: (_, data, __) { return HMSEmbeddedButton( diff --git a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt index 6fabd902e..6b4bcb136 100644 --- a/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt +++ b/packages/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt @@ -2006,10 +2006,8 @@ class HmssdkFlutterPlugin : val dict = HashMap() dict["current_audio_device"] = selectedAudioDevice.name val audioDevicesList = ArrayList() - hmssdk?.getAudioDevicesList()?.let { audioDevices -> - audioDevices.forEach { device -> - audioDevicesList.add(device.name) - } + availableAudioDevices.forEach { device -> + audioDevicesList.add(device.name) } dict["available_audio_device"] = audioDevicesList args["data"] = dict @@ -2045,12 +2043,10 @@ class HmssdkFlutterPlugin : val dict = HashMap() dict["current_audio_device"] = selectedAudioDevice.name val audioDevicesList = ArrayList() - hmssdk?.getAudioDevicesList()?.let { audioDevices -> - audioDevices.forEach { device -> - audioDevicesList.add(device.name) - } + availableAudioDevices.forEach { device -> + audioDevicesList.add(device.name) + } dict["available_audio_device"] = audioDevicesList - } args["data"] = dict if (args["data"] != null) { CoroutineScope(Dispatchers.Main).launch { From 4c5fb2526f0eb752e86bf7090676afcf03320f8f Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 14:52:25 +0530 Subject: [PATCH 08/16] removed bluetooth permissions --- .../hms_room_kit/lib/src/common/utility_functions.dart | 10 +--------- .../android/src/main/AndroidManifest.xml | 4 ---- .../example/android/app/src/main/AndroidManifest.xml | 2 -- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/packages/hms_room_kit/lib/src/common/utility_functions.dart b/packages/hms_room_kit/lib/src/common/utility_functions.dart index 6049c2b87..8d46d51d4 100644 --- a/packages/hms_room_kit/lib/src/common/utility_functions.dart +++ b/packages/hms_room_kit/lib/src/common/utility_functions.dart @@ -140,10 +140,7 @@ class Utilities { await Permission.microphone.request(); if (Platform.isIOS) { await Permission.bluetooth.request(); - } else if (Platform.isAndroid) { - await Permission.bluetoothConnect.request(); } - await Permission.phone.request(); ///We check if the permissions are granted @@ -158,8 +155,7 @@ class Utilities { } else if (Platform.isAndroid) { if (await Permission.camera.isGranted && await Permission.microphone.isGranted && - await Permission.phone.isGranted && - await Permission.bluetoothConnect.isGranted) { + await Permission.phone.isGranted) { return true; } } @@ -179,10 +175,6 @@ class Utilities { if (Platform.isIOS) { isBluetoothPermissionsDenied = await Permission.bluetooth.isPermanentlyDenied; - } else if (Platform.isAndroid) { - isBluetoothPermissionsDenied = - (await Permission.bluetoothConnect.isDenied && - !await Permission.bluetoothConnect.shouldShowRequestRationale); } ///We open the app settings if the user has permanently denied the permissions diff --git a/packages/hmssdk_flutter/android/src/main/AndroidManifest.xml b/packages/hmssdk_flutter/android/src/main/AndroidManifest.xml index aba43d192..2cf4b2071 100644 --- a/packages/hmssdk_flutter/android/src/main/AndroidManifest.xml +++ b/packages/hmssdk_flutter/android/src/main/AndroidManifest.xml @@ -13,10 +13,6 @@ - - - - diff --git a/packages/hmssdk_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/hmssdk_flutter/example/android/app/src/main/AndroidManifest.xml index c5faff7ff..54890f3c7 100644 --- a/packages/hmssdk_flutter/example/android/app/src/main/AndroidManifest.xml +++ b/packages/hmssdk_flutter/example/android/app/src/main/AndroidManifest.xml @@ -18,8 +18,6 @@ - - From aaf579eb772b91912cf1810b1ab14af3c525f2da Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 15:22:06 +0530 Subject: [PATCH 09/16] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?26=20(426)=20=F0=9F=8D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/ExampleAppChangelog.txt | 6 +++++ .../example/android/app/build.gradle | 4 +-- .../hmssdk_flutter/example/ios/Podfile.lock | 8 +++--- .../example/ios/Runner/Info.plist | 4 +-- packages/hmssdk_flutter/example/pubspec.lock | 26 +++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 +++++++++---------- 6 files changed, 40 insertions(+), 34 deletions(-) diff --git a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt index 4843be1fb..a952c26d5 100644 --- a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt +++ b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt @@ -6,6 +6,12 @@ https://100ms.atlassian.net/browse/FLUT-139 - iOS: end session from dashboard not kicking iOS user intermittently https://100ms.atlassian.net/browse/FLUT-201 +- Wrong device list on top right when BT is connected +https://100ms.atlassian.net/browse/FLUT-215 + +- Hide BT and notificatin permission on Flutter Android for platform parity +https://100ms.atlassian.net/browse/FLUT-216 + Room Kit: 1.0.10 Core SDK: 1.9.7 Android SDK: 2.8.8 diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index d1c1b2871..250a14f00 100644 --- a/packages/hmssdk_flutter/example/android/app/build.gradle +++ b/packages/hmssdk_flutter/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "live.hms.flutter" minSdkVersion 21 targetSdkVersion 33 - versionCode 425 - versionName "1.5.125" + versionCode 426 + versionName "1.5.126" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index e0141acdd..e7280467f 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -97,14 +97,14 @@ PODS: - HMSBroadcastExtensionSDK (0.0.9) - HMSHLSPlayerSDK (0.0.2): - HMSAnalyticsSDK (= 0.0.2) - - HMSSDK (1.4.1): + - HMSSDK (1.4.2): - HMSAnalyticsSDK (= 0.0.2) - HMSWebRTC (= 1.0.5116) - hmssdk_flutter (1.9.6): - Flutter - HMSBroadcastExtensionSDK (= 0.0.9) - HMSHLSPlayerSDK (= 0.0.2) - - HMSSDK (= 1.4.1) + - HMSSDK (= 1.4.2) - HMSWebRTC (1.0.5116) - MTBBarcodeScanner (5.0.11) - nanopb (2.30909.1): @@ -235,8 +235,8 @@ SPEC CHECKSUMS: HMSAnalyticsSDK: 4d2a88a729b1eb42f3d25f217c28937ec318a5b7 HMSBroadcastExtensionSDK: d80fe325f6c928bd8e5176290b5a4b7ae15d6fbb HMSHLSPlayerSDK: 6a54ad4d12f3dc2270d1ecd24019d71282a4f6a3 - HMSSDK: 6a579cb806d4760cda149002150ff0beab03749b - hmssdk_flutter: 0b12e79b2f184fa3308fb65dade6e3b022d805c9 + HMSSDK: 7be2385e9e3ddbd5c03a228934622d679d033e15 + hmssdk_flutter: 1cd1e55001bdfd1b015eebced25ba3a7fb64649b HMSWebRTC: ae54e9dd91b869051b283b43b14f57d43b7bf8e1 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index cfd7b1a34..5151b3a0e 100644 --- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist +++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.125 + 1.5.126 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 425 + 426 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 098334077..cb0c5b7b7 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,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" convert: dependency: transitive description: @@ -362,10 +362,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" mime: dependency: transitive description: @@ -647,18 +647,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: @@ -679,10 +679,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" tuple: dependency: transitive description: @@ -839,10 +839,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" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.1.0 <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,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" fake_async: dependency: transitive description: @@ -79,10 +79,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" path: dependency: transitive description: @@ -108,18 +108,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: @@ -140,10 +140,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" vector_math: dependency: transitive description: @@ -156,10 +156,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" From 963671aebc89bfc59ce06390042044384193be20 Mon Sep 17 00:00:00 2001 From: ygit Date: Thu, 18 Jan 2024 12:41:51 +0000 Subject: [PATCH 10/16] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/pubspec.lock | 26 ++++++++++---------- packages/hmssdk_flutter/pubspec.lock | 26 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index cb0c5b7b7..098334077 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -69,10 +69,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -362,10 +362,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -647,18 +647,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -679,10 +679,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" tuple: dependency: transitive description: @@ -839,10 +839,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" win32: dependency: transitive description: @@ -868,5 +868,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.1.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.13.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index c3cc2c33e..53939cd59 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" From c39ac02fd2026318e9dbd92663f9d3a85eec84e0 Mon Sep 17 00:00:00 2001 From: Yogesh Singh Date: Thu, 18 Jan 2024 18:53:58 +0530 Subject: [PATCH 11/16] =?UTF-8?q?released=20sample=20app=20version=201.5.1?= =?UTF-8?q?27=20(427)=20=F0=9F=8D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/android/app/build.gradle | 4 ++-- packages/hmssdk_flutter/example/ios/Gemfile.lock | 1 + packages/hmssdk_flutter/example/ios/Podfile.lock | 2 +- packages/hmssdk_flutter/example/ios/Runner/Info.plist | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/hmssdk_flutter/example/android/app/build.gradle b/packages/hmssdk_flutter/example/android/app/build.gradle index 250a14f00..8f5b1ccbd 100644 --- a/packages/hmssdk_flutter/example/android/app/build.gradle +++ b/packages/hmssdk_flutter/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { applicationId "live.hms.flutter" minSdkVersion 21 targetSdkVersion 33 - versionCode 426 - versionName "1.5.126" + versionCode 427 + versionName "1.5.127" } signingConfigs { diff --git a/packages/hmssdk_flutter/example/ios/Gemfile.lock b/packages/hmssdk_flutter/example/ios/Gemfile.lock index 2c203ea22..d666fc5aa 100644 --- a/packages/hmssdk_flutter/example/ios/Gemfile.lock +++ b/packages/hmssdk_flutter/example/ios/Gemfile.lock @@ -222,6 +222,7 @@ GEM PLATFORMS arm64-darwin-22 + arm64-darwin-23 DEPENDENCIES activesupport (= 7.0.8) diff --git a/packages/hmssdk_flutter/example/ios/Podfile.lock b/packages/hmssdk_flutter/example/ios/Podfile.lock index e7280467f..3f67c33d8 100644 --- a/packages/hmssdk_flutter/example/ios/Podfile.lock +++ b/packages/hmssdk_flutter/example/ios/Podfile.lock @@ -228,7 +228,7 @@ SPEC CHECKSUMS: FirebaseRemoteConfig: b873a427a48159082361343a85649eed3f5377ea FirebaseSessions: 2f348975f6d1c139231c180e12194161da2e0cd6 FirebaseSharedSwift: 2fbf73618288b7a36b2014b957745dcdd781389e - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_foreground_task: 21ef182ab0a29a3005cc72cd70e5f45cb7f7f817 GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist index 5151b3a0e..a9d575544 100644 --- a/packages/hmssdk_flutter/example/ios/Runner/Info.plist +++ b/packages/hmssdk_flutter/example/ios/Runner/Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.126 + 1.5.127 CFBundleSignature ???? CFBundleURLTypes @@ -48,7 +48,7 @@ CFBundleVersion - 426 + 427 ITSAppUsesNonExemptEncryption LSApplicationCategoryType From 25a7a1bb06245bea7ff01eb232838f4af929b4e4 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 18:25:07 +0530 Subject: [PATCH 12/16] Fixed scroll error --- .../lib/src/widgets/bottom_sheets/hls_more_options.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart index 8660f2113..f0697bb29 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart @@ -74,6 +74,7 @@ class _HLSMoreOptionsBottomSheetBottomSheetState MoreOptionItem( onTap: () async { Navigator.pop(context); + var meetingStore= context.read(); showModalBottomSheet( isScrollControlled: true, backgroundColor: HMSThemeColors.surfaceDim, @@ -84,7 +85,7 @@ class _HLSMoreOptionsBottomSheetBottomSheetState ), context: context, builder: (ctx) => ChangeNotifierProvider.value( - value: context.read(), + value: meetingStore, child: (HMSRoomLayout.chatData == null || (HMSRoomLayout.chatData?.isOverlay ?? true)) From 8ae757e8014170e4d66a999d3506908d54cbf5f8 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 19:31:01 +0530 Subject: [PATCH 13/16] Updated sdk versions --- packages/hms_room_kit/example/pubspec.yaml | 2 +- .../bottom_sheets/hls_more_options.dart | 2 +- packages/hms_room_kit/pubspec.yaml | 2 +- packages/hmssdk_flutter/example/pubspec.yaml | 2 +- packages/hmssdk_flutter/pubspec.lock | 26 +++++++++---------- packages/hmssdk_flutter/pubspec.yaml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/hms_room_kit/example/pubspec.yaml b/packages/hms_room_kit/example/pubspec.yaml index e10ad412c..c16fed7de 100644 --- 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.9 +version: 1.0.10 environment: sdk: ">=2.19.6 <3.0.0" diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart index f0697bb29..b7e9e0140 100644 --- a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart +++ b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/hls_more_options.dart @@ -74,7 +74,7 @@ class _HLSMoreOptionsBottomSheetBottomSheetState MoreOptionItem( onTap: () async { Navigator.pop(context); - var meetingStore= context.read(); + var meetingStore = context.read(); showModalBottomSheet( isScrollControlled: true, backgroundColor: HMSThemeColors.surfaceDim, diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index a7b71912c..224b1473c 100644 --- a/packages/hms_room_kit/pubspec.yaml +++ b/packages/hms_room_kit/pubspec.yaml @@ -1,6 +1,6 @@ name: hms_room_kit description: 100ms Room Kit provides simple & easy to use UI components to build Live Streaming & Video Conferencing experiences in your apps. -version: 1.0.9 +version: 1.0.10 homepage: https://www.100ms.live/ repository: https://github.com/100mslive/100ms-flutter issue_tracker: https://github.com/100mslive/100ms-flutter/issues diff --git a/packages/hmssdk_flutter/example/pubspec.yaml b/packages/hmssdk_flutter/example/pubspec.yaml index bf2a0a711..37e000913 100644 --- a/packages/hmssdk_flutter/example/pubspec.yaml +++ b/packages/hmssdk_flutter/example/pubspec.yaml @@ -4,7 +4,7 @@ description: Demonstrates how to use the hmssdk_flutter plugin. # The following line prevents the package from being accidentally published to # pub.dev using `pub publish`. This is preferred for private packages. publish_to: "none" # Remove this line if you wish to publish to pub.dev -version: 1.9.6 +version: 1.9.7 environment: sdk: ">=2.16.0 <4.0.0" diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index 53939cd59..c3cc2c33e 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,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" fake_async: dependency: transitive description: @@ -79,10 +79,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" path: dependency: transitive description: @@ -108,18 +108,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: @@ -140,10 +140,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" vector_math: dependency: transitive description: @@ -156,10 +156,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" diff --git a/packages/hmssdk_flutter/pubspec.yaml b/packages/hmssdk_flutter/pubspec.yaml index e17f3f23c..0a0d97ea4 100644 --- a/packages/hmssdk_flutter/pubspec.yaml +++ b/packages/hmssdk_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: hmssdk_flutter description: Add Real Time Audio & Video calls, Interactive Live Streaming & Recording, Chat, HLS, RTMP, PiP, CallKit, VoIP, Video conferencing, Stream Player & WebRTC-based communications API -version: 1.9.6 +version: 1.9.7 homepage: https://www.100ms.live/ repository: https://github.com/100mslive/100ms-flutter issue_tracker: https://github.com/100mslive/100ms-flutter/issues From d34520061253ba5411b7552db49bd5172281fa23 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 14:02:58 +0000 Subject: [PATCH 14/16] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/pubspec.lock | 4 +-- packages/hmssdk_flutter/pubspec.lock | 26 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 098334077..38bcadb62 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -286,14 +286,14 @@ packages: path: "../../hms_room_kit" relative: true source: path - version: "1.0.9" + version: "1.0.10" hmssdk_flutter: dependency: transitive description: path: ".." relative: true source: path - version: "1.9.6" + version: "1.9.7" http: dependency: transitive description: diff --git a/packages/hmssdk_flutter/pubspec.lock b/packages/hmssdk_flutter/pubspec.lock index c3cc2c33e..53939cd59 100644 --- a/packages/hmssdk_flutter/pubspec.lock +++ b/packages/hmssdk_flutter/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" fake_async: dependency: transitive description: @@ -79,10 +79,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" path: dependency: transitive description: @@ -108,18 +108,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -140,10 +140,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" vector_math: dependency: transitive description: @@ -156,10 +156,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.0" From 15130052030cf3f8ff44ceb6c10ad8c3454f81b1 Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 19:34:12 +0530 Subject: [PATCH 15/16] Updated room kit sdk version to 1.9.7 --- packages/hms_room_kit/example/pubspec.lock | 11 ++++++----- packages/hms_room_kit/pubspec.lock | 9 +++++---- packages/hms_room_kit/pubspec.yaml | 3 +-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/hms_room_kit/example/pubspec.lock b/packages/hms_room_kit/example/pubspec.lock index 4e93043bc..47c5f90ef 100644 --- a/packages/hms_room_kit/example/pubspec.lock +++ b/packages/hms_room_kit/example/pubspec.lock @@ -214,14 +214,15 @@ packages: path: ".." relative: true source: path - version: "1.0.9" + version: "1.0.10" hmssdk_flutter: dependency: transitive description: - path: "../../hmssdk_flutter" - relative: true - source: path - version: "1.9.6" + name: hmssdk_flutter + sha256: "78db3329609ca9f9a90168d45b9bed0ff56f43d1eeb13b532aa376de2aa44a4a" + url: "https://pub.dev" + source: hosted + version: "1.9.7" http: dependency: transitive description: diff --git a/packages/hms_room_kit/pubspec.lock b/packages/hms_room_kit/pubspec.lock index 9b2883f03..0521b39f8 100644 --- a/packages/hms_room_kit/pubspec.lock +++ b/packages/hms_room_kit/pubspec.lock @@ -203,10 +203,11 @@ packages: hmssdk_flutter: dependency: "direct main" description: - path: "../hmssdk_flutter" - relative: true - source: path - version: "1.9.6" + name: hmssdk_flutter + sha256: "78db3329609ca9f9a90168d45b9bed0ff56f43d1eeb13b532aa376de2aa44a4a" + url: "https://pub.dev" + source: hosted + version: "1.9.7" http: dependency: transitive description: diff --git a/packages/hms_room_kit/pubspec.yaml b/packages/hms_room_kit/pubspec.yaml index 224b1473c..285f40fda 100644 --- a/packages/hms_room_kit/pubspec.yaml +++ b/packages/hms_room_kit/pubspec.yaml @@ -14,8 +14,7 @@ dependencies: flutter: sdk: flutter - hmssdk_flutter: - path: ../hmssdk_flutter + hmssdk_flutter: 1.9.7 intl: ^0.18.0 permission_handler: ^11.0.0 provider: ^6.0.5 From 6a19279e0db4ac603cc45d12bccdf022bd2266aa Mon Sep 17 00:00:00 2001 From: Decoder07 Date: Thu, 18 Jan 2024 14:05:50 +0000 Subject: [PATCH 16/16] =?UTF-8?q?=F0=9F=A4=96=20Automated=20Format=20and?= =?UTF-8?q?=20Fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/hmssdk_flutter/example/pubspec.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/hmssdk_flutter/example/pubspec.lock b/packages/hmssdk_flutter/example/pubspec.lock index 38bcadb62..84e58d04a 100644 --- a/packages/hmssdk_flutter/example/pubspec.lock +++ b/packages/hmssdk_flutter/example/pubspec.lock @@ -290,9 +290,10 @@ packages: hmssdk_flutter: dependency: transitive description: - path: ".." - relative: true - source: path + name: hmssdk_flutter + sha256: "78db3329609ca9f9a90168d45b9bed0ff56f43d1eeb13b532aa376de2aa44a4a" + url: "https://pub.dev" + source: hosted version: "1.9.7" http: dependency: transitive