Merge pull request #158 from AgoraIO-Community/active-speaker-fix

Disable Active Speaker when overrided
AgoraIO-Community · Sep 28, 2023 · 7da5a92 · 7da5a92
2 parents 1d4cf87 + 89aabe4
commit 7da5a92
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.7
+- Fixes active speaker bug when user overrides with manual pin
+- Updates permission_handler to v11.0.0
+
 ## 1.3.6
 
 - Fixes error [[#151](https://github.com/AgoraIO-Community/VideoUIKit-Flutter/issues/151)

diff --git a/lib/controllers/session_controller.dart b/lib/controllers/session_controller.dart
@@ -273,6 +273,11 @@ class SessionController extends ValueNotifier<AgoraSettings> {
     }
   }
 
+  /// Function to disableActiveSpeaker
+  void setActiveSpeakerDisabled(bool activeSpeakerDisabled) {
+    value = value.copyWith(isActiveSpeakerDisabled: activeSpeakerDisabled);
+  }
+
   /// Function to swap [AgoraUser] in the floating layout.
   void swapUser({required int index}) {
     final AgoraUser newUser = value.users[index];

diff --git a/lib/models/agora_rtm_mute_request.dart b/lib/models/agora_rtm_mute_request.dart
@@ -99,7 +99,7 @@ class AgoraUIKit {
   String platform = platformStr();
 
   String framework = "flutter";
-  String version = "1.3.6";
+  String version = "1.3.7";
 
   AgoraUIKit.fromJson(Map<String, dynamic> json)
       : platform = json['platform'],

diff --git a/lib/src/layout/floating_layout.dart b/lib/src/layout/floating_layout.dart
@@ -172,6 +172,10 @@ class _FloatingLayoutState extends State<FloatingLayout> {
                                                               8),
                                                       child: GestureDetector(
                                                         onTap: () {
+                                                          widget.client
+                                                              .sessionController
+                                                              .setActiveSpeakerDisabled(
+                                                                  false);
                                                           widget.client
                                                               .sessionController
                                                               .swapUser(
@@ -238,6 +242,10 @@ class _FloatingLayoutState extends State<FloatingLayout> {
                                                             child:
                                                                 GestureDetector(
                                                               onTap: () {
+                                                                widget.client
+                                                                    .sessionController
+                                                                    .setActiveSpeakerDisabled(
+                                                                        true);
                                                                 widget.client
                                                                     .sessionController
                                                                     .swapUser(
@@ -353,6 +361,10 @@ class _FloatingLayoutState extends State<FloatingLayout> {
                                                             child:
                                                                 GestureDetector(
                                                               onTap: () {
+                                                                widget.client
+                                                                    .sessionController
+                                                                    .setActiveSpeakerDisabled(
+                                                                        true);
                                                                 widget.client
                                                                     .sessionController
                                                                     .swapUser(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: agora_uikit
 description: Flutter plugin to simply integrate Agora Video Calling or Live
   Video Streaming to your app with just a few lines of code.
-version: 1.3.6
+version: 1.3.7
 homepage: https://www.agora.io/en/
 repository: https://github.com/AgoraIO-Community/VideoUIKit-Flutter
 
@@ -14,9 +14,9 @@ dependencies:
   agora_rtm: ^1.5.5
   flutter:
     sdk: flutter
-  http: '>=0.13.1 <2.0.0'
-  lints: ">=1.0.1 <2.1.0"
-  permission_handler: ^10.2.0
+  http: ">=0.13.1 <2.0.0"
+  lints: ">=1.0.1 <2.1.2"
+  permission_handler: ^11.0.0
 
 dev_dependencies:
   flutter_test: