fix(llc): Update screen share visibility separate from video (#1032)

* Update screen share visibility separate from video

* Add changelog entry

Author: renefloor

packages/stream_video/CHANGELOG.md

@@ -7,6 +7,9 @@
 🔄 Changed
 * Deprecated `callRejoinTimeout` in `RetryConfig`, instead added `networkAvailabilityTimeout` to `CallPreferences` to control how long the SDK waits for network connectivity to be restored during reconnection attempts before timing out.
 
+🐞 Fixed
+* Sorting of participants after screen sharing stopped.s
+
 🔄 Dependency updates
 * Updated `flutter_callkit_incoming` dependency to the latests (2.5.5) version. That version contains Android 14 compatibility fixes for ringing notifications and lock screen handling.
 

packages/stream_video/lib/src/call/call.dart

@@ -2856,12 +2856,21 @@ class Call {
     required String sessionId,
     required String userId,
     required ViewportVisibility visibility,
+    required SfuTrackTypeVideo trackType,
   }) async {
     final change = VisibilityChange(
       sessionId: sessionId,
       userId: userId,
       visibility: visibility,
     );
+    if (trackType.isScreenShare) {
+      _stateManager.participantUpdateScreenShareViewportVisibility(
+        sessionId: sessionId,
+        userId: userId,
+        visibility: visibility,
+      );
+      return const Result.success(none);
+    }
 
     final result = await _session?.updateViewportVisibility(change) ??
         Result.error('Session is null');

packages/stream_video/lib/src/call/state/mixins/state_participant_mixin.dart

@@ -53,6 +53,25 @@ mixin StateParticipantMixin on StateNotifier<CallState> {
     );
   }
 
+  void participantUpdateScreenShareViewportVisibility({
+    required String sessionId,
+    required String userId,
+    required ViewportVisibility visibility,
+  }) {
+    state = state.copyWith(
+      callParticipants: state.callParticipants.map((participant) {
+        if (participant.sessionId == sessionId &&
+            participant.userId == userId) {
+          return participant.copyWith(
+            screenShareViewportVisibility: visibility,
+          );
+        }
+
+        return participant;
+      }).toList(),
+    );
+  }
+
   void participantUpdateSubscription({
     required String userId,
     required String sessionId,

packages/stream_video/lib/src/models/call_participant_state.dart

@@ -34,6 +34,7 @@ class CallParticipantState
     this.pin,
     this.reaction,
     this.viewportVisibility = ViewportVisibility.unknown,
+    this.screenShareViewportVisibility = ViewportVisibility.unknown,
   }) : audioLevels = audioLevels ?? [audioLevel];
 
   /// Internal constructor to be used with copyWith methods
@@ -56,6 +57,7 @@ class CallParticipantState
     required this.pin,
     required this.reaction,
     required this.viewportVisibility,
+    required this.screenShareViewportVisibility,
   });
 
   final String userId;
@@ -81,6 +83,7 @@ class CallParticipantState
   final CallParticipantPin? pin;
   final CallReaction? reaction;
   final ViewportVisibility viewportVisibility;
+  final ViewportVisibility screenShareViewportVisibility;
 
   bool get isPinned => pin != null;
   String get uniqueParticipantKey => '$userId-$sessionId';
@@ -108,6 +111,7 @@ class CallParticipantState
     CallParticipantPin? pin,
     CallReaction? reaction,
     ViewportVisibility? viewportVisibility,
+    ViewportVisibility? screenShareViewportVisibility,
   }) {
     return CallParticipantState._(
       userId: userId ?? this.userId,
@@ -128,6 +132,8 @@ class CallParticipantState
       pin: pin ?? this.pin,
       reaction: reaction ?? this.reaction,
       viewportVisibility: viewportVisibility ?? this.viewportVisibility,
+      screenShareViewportVisibility:
+          screenShareViewportVisibility ?? this.screenShareViewportVisibility,
     );
   }
 
@@ -171,6 +177,7 @@ class CallParticipantState
       pin: participantPin,
       reaction: reaction,
       viewportVisibility: viewportVisibility,
+      screenShareViewportVisibility: screenShareViewportVisibility,
     );
   }
 
@@ -200,6 +207,7 @@ class CallParticipantState
       pin: pin,
       reaction: reaction,
       viewportVisibility: viewportVisibility,
+      screenShareViewportVisibility: screenShareViewportVisibility,
     );
   }
 

packages/stream_video/lib/src/sfu/data/models/sfu_track_type.dart

@@ -17,6 +17,8 @@ class SfuTrackType {
   bool get isAudio => this is SfuTrackTypeAudio;
 
   bool get isVideo => this is SfuTrackTypeVideo;
+
+  bool get isScreenShare => this is SfuTrackTypeVideo && this == screenShare;
 }
 
 abstract class SfuTrackTypeAudio extends SfuTrackType {

packages/stream_video_flutter/lib/src/renderer/video_renderer.dart

@@ -153,7 +153,10 @@ class _StreamVideoRendererState extends State<StreamVideoRenderer> {
     latestVisibilityInfo = info;
     final fraction = info.visibleFraction;
 
-    final prevVisibility = widget.participant.viewportVisibility;
+    final prevVisibility = widget.videoTrackType.isScreenShare
+        ? widget.participant.screenShareViewportVisibility
+        : widget.participant.viewportVisibility;
+
     final visibility = ViewportVisibility.fromVisibleFraction(fraction);
 
     // Update the viewport visibility of the participant.
@@ -162,6 +165,7 @@ class _StreamVideoRendererState extends State<StreamVideoRenderer> {
         sessionId: widget.participant.sessionId,
         userId: widget.participant.userId,
         visibility: visibility,
+        trackType: widget.videoTrackType,
       );
     }