Sanity build fixes (#1640)

* Updated android sdk version * Added device selection in preview * 🤖 Automated Format and Fix * released sample app version 1.5.89 (389) 🍀 * updated dependencies --------- Co-authored-by: Decoder07 <[email protected]> Co-authored-by: ygit <[email protected]> Co-authored-by: Yogesh Singh <[email protected]>
100mslive · Nov 16, 2023 · b505b85 · b505b85
1 parent df6922c
commit b505b85
Show file tree

Hide file tree

Showing 12 changed files with 347 additions and 169 deletions.
diff --git a/packages/hms_room_kit/lib/src/meeting/meeting_page.dart b/packages/hms_room_kit/lib/src/meeting/meeting_page.dart
@@ -40,8 +40,13 @@ import 'package:hms_room_kit/src/widgets/toasts/hms_recording_error_toast.dart';
 class MeetingPage extends StatefulWidget {
   final String meetingLink;
   final bool isRoomMute;
+  final HMSAudioDevice currentAudioDeviceMode;
+
   const MeetingPage(
-      {Key? key, required this.meetingLink, this.isRoomMute = true})
+      {Key? key,
+      required this.meetingLink,
+      this.isRoomMute = true,
+      required this.currentAudioDeviceMode})
       : super(key: key);
 
   @override
@@ -65,6 +70,8 @@ class _MeetingPageState extends State<MeetingPage> {
         context.read<MeetingStore>().toggleSpeaker();
       });
     }
+    context.read<MeetingStore>().currentAudioDeviceMode =
+        widget.currentAudioDeviceMode;
   }
 
   void _enableForegroundService() {

diff --git a/packages/hms_room_kit/lib/src/meeting_screen_controller.dart b/packages/hms_room_kit/lib/src/meeting_screen_controller.dart
@@ -43,6 +43,9 @@ class MeetingScreenController extends StatefulWidget {
   ///For more details checkout the [HMSConfig] class
   final HMSConfig? config;
 
+  ///[currentAudioDeviceMode] is the current audio device mode
+  final HMSAudioDevice currentAudioDeviceMode;
+
   const MeetingScreenController(
       {Key? key,
       required this.roomCode,
@@ -52,7 +55,8 @@ class MeetingScreenController extends StatefulWidget {
       this.showStats = false,
       this.mirrorCamera = true,
       this.role,
-      this.config})
+      this.config,
+      this.currentAudioDeviceMode = HMSAudioDevice.AUTOMATIC})
       : super(key: key);
 
   @override
@@ -95,6 +99,7 @@ class _MeetingScreenControllerState extends State<MeetingScreenController> {
           return MeetingPage(
             meetingLink: widget.roomCode,
             isRoomMute: widget.isRoomMute,
+            currentAudioDeviceMode: widget.currentAudioDeviceMode,
           );
         },
         selector: (_, meetingStore) => meetingStore.localPeer?.role.name);

diff --git a/packages/hms_room_kit/lib/src/preview/preview_bottom_button_section.dart b/packages/hms_room_kit/lib/src/preview/preview_bottom_button_section.dart
@@ -1,6 +1,3 @@
-///Dart imports
-import 'dart:io';
-
 ///Package imports
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -111,25 +108,17 @@ class PreviewBottomButtonSection extends StatelessWidget {
                           .contains("audio"))
                     HMSEmbeddedButton(
                         onTap: () {
-                          ///For iOS, This will open the native audio device selection UI
-                          ///
-                          ///For Android, it will open a bottom sheet
-                          ///with the list of available audio devices
-                          if (Platform.isIOS) {
-                            previewStore.switchAudioOutputUsingiOSUI();
-                          } else {
-                            showModalBottomSheet(
-                                isScrollControlled: true,
-                                backgroundColor: Colors.transparent,
-                                context: context,
-                                builder: (ctx) => ChangeNotifierProvider.value(
-                                    value: previewStore,
-                                    child: const PreviewDeviceSettings()));
-                          }
+                          showModalBottomSheet(
+                              isScrollControlled: true,
+                              backgroundColor: Colors.transparent,
+                              context: context,
+                              builder: (ctx) => ChangeNotifierProvider.value(
+                                  value: previewStore,
+                                  child: const PreviewDeviceSettings()));
                         },
                         isActive: true,
                         child: SvgPicture.asset(
-                          'packages/hms_room_kit/lib/src/assets/icons/${Utilities.getAudioDeviceIconName(previewStore.currentAudioOutputDevice)}.svg',
+                          'packages/hms_room_kit/lib/src/assets/icons/${previewStore.isRoomMute ? "speaker_state_off" : Utilities.getAudioDeviceIconName(previewStore.currentAudioOutputDevice)}.svg',
                           colorFilter: ColorFilter.mode(
                               HMSThemeColors.onSurfaceHighEmphasis,
                               BlendMode.srcIn),

diff --git a/packages/hms_room_kit/lib/src/preview/preview_device_settings.dart b/packages/hms_room_kit/lib/src/preview/preview_device_settings.dart
diff --git a/packages/hms_room_kit/lib/src/preview/preview_page.dart b/packages/hms_room_kit/lib/src/preview/preview_page.dart
@@ -187,11 +187,13 @@ class _PreviewPageState extends State<PreviewPage> {
                   ? ListenableProvider.value(
                       value: _meetingStore,
                       child: MeetingScreenController(
-                        role: previewStore.peer?.role,
-                        roomCode: Constant.roomCode,
-                        localPeerNetworkQuality: null,
-                        user: nameController.text,
-                      ),
+                          role: previewStore.peer?.role,
+                          roomCode: Constant.roomCode,
+                          localPeerNetworkQuality: null,
+                          user: nameController.text,
+                          isRoomMute: previewStore.isRoomMute,
+                          currentAudioDeviceMode:
+                              previewStore.currentAudioDeviceMode),
                     )
                   : SingleChildScrollView(
                       ///We show circular progress indicator until the local peer is null

diff --git a/packages/hms_room_kit/lib/src/preview/preview_store.dart b/packages/hms_room_kit/lib/src/preview/preview_store.dart
@@ -284,12 +284,18 @@ class PreviewStore extends ChangeNotifier
   }
 
   void switchAudioOutput({required HMSAudioDevice audioDevice}) {
+    if (isRoomMute) {
+      toggleSpeaker();
+    }
     currentAudioDeviceMode = audioDevice;
     hmsSDKInteractor.switchAudioOutput(audioDevice: audioDevice);
     notifyListeners();
   }
 
   void switchAudioOutputUsingiOSUI() {
+    if (isRoomMute) {
+      toggleSpeaker();
+    }
     hmsSDKInteractor.switchAudioOutputUsingiOSUI();
   }
 

diff --git a/packages/hms_room_kit/lib/src/widgets/bottom_sheets/audio_settings_bottom_sheet.dart b/packages/hms_room_kit/lib/src/widgets/bottom_sheets/audio_settings_bottom_sheet.dart
@@ -34,15 +34,15 @@ class _AudioSettingsBottomSheetState extends State<AudioSettingsBottomSheet> {
     return DraggableScrollableSheet(
         maxChildSize:
             (context.read<MeetingStore>().availableAudioOutputDevices.length +
-                    1.4) *
+                    2.2) *
                 0.1,
         minChildSize:
             (context.read<MeetingStore>().availableAudioOutputDevices.length +
-                    1.2) *
+                    2) *
                 0.1,
         initialChildSize:
             (context.read<MeetingStore>().availableAudioOutputDevices.length +
-                    1.2) *
+                    2) *
                 0.1,
         builder: (context, ScrollController scrollController) {
           return Container(

diff --git a/...ges/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt b/...ges/hmssdk_flutter/android/src/main/kotlin/live/hms/hmssdk_flutter/HmssdkFlutterPlugin.kt
@@ -526,6 +526,7 @@ class HmssdkFlutterPlugin :
         HMSPipAction.disposePIP(activity)
         HMSPeerListIteratorAction.clearIteratorMap()
         removeAllKeyChangeListener()
+        setIsRoomAudioUnmutedLocally(true)
     }
 
     private fun destroy(result: Result) {
@@ -872,6 +873,7 @@ class HmssdkFlutterPlugin :
         HMSPipAction.disposePIP(activity)
         HMSPeerListIteratorAction.clearIteratorMap()
         removeAllKeyChangeListener()
+        setIsRoomAudioUnmutedLocally(true)
     }
 
     private fun isAllowedToEndMeeting(): Boolean? {
@@ -1125,6 +1127,7 @@ class HmssdkFlutterPlugin :
                     HMSPipAction.disposePIP(activity)
                     HMSPeerListIteratorAction.clearIteratorMap()
                     removeAllKeyChangeListener()
+                    setIsRoomAudioUnmutedLocally(true)
                 }
                 if (args["data"] != null) {
                     CoroutineScope(Dispatchers.Main).launch {

diff --git a/packages/hmssdk_flutter/example/ExampleAppChangelog.txt b/packages/hmssdk_flutter/example/ExampleAppChangelog.txt
@@ -3,25 +3,10 @@ Board: https://100ms.atlassian.net/jira/software/projects/FLUT/boards/34/
 Implement sending of Subscriber Stats
 - https://100ms.atlassian.net/browse/FLUT-134
 
-Upgrade Android SDK to fix Auto simulcast issue in HmsVideoView
-- https://100ms.atlassian.net/browse/FLUT-145
+Prebuilt: Add options to Mute Session or change Audio Output
+- https://100ms.atlassian.net/browse/FLUT-155
 
-Remove default usage of Software Echo Cancellation
-- https://100ms.atlassian.net/browse/FLUT-146
-
-Post call interruption fix
-- https://100ms.atlassian.net/browse/FLUT-143
-
-Persist Room meeting link after successfully joining the Room
-- https://100ms.atlassian.net/browse/FLUT-147
-
-Incorrect DateTime format on iOS prevents the user from Joining a Room
-- https://100ms.atlassian.net/browse/FLUT-144
-
-To handle error in case the logo url returns error
-- https://100ms.atlassian.net/browse/FLUT-152
-
-Room Kit: 1.0.3
-Core SDK: 1.9.2
+Room Kit: 1.0.4
+Core SDK: 1.9.3
 Android SDK: 2.8.0
-iOS SDK: 1.2.0
+iOS SDK: 1.2.1
diff --git 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 388
-        versionName "1.5.88"
+        versionCode 389
+        versionName "1.5.89"
     }
 
     signingConfigs {

diff --git a/packages/hmssdk_flutter/example/ios/Runner/Info.plist b/packages/hmssdk_flutter/example/ios/Runner/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.88</string>
+	<string>1.5.89</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -48,7 +48,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>388</string>
+	<string>389</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

diff --git a/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift b/packages/hmssdk_flutter/ios/Classes/SwiftHmssdkFlutterPlugin.swift
@@ -1575,5 +1575,6 @@ public class SwiftHmssdkFlutterPlugin: NSObject, FlutterPlugin, HMSUpdateListene
         removeAllKeyChangeListener()
         removeHMSLogger()
         HMSPeerListIteratorAction.clearIteratorMap()
+        setIsRoomAudioUnmutedLocally(isRoomAudioUnmuted: true)
     }
 }