-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1697 from 100mslive/develop
Release 1.9.7: Develop to main
- Loading branch information
Showing
25 changed files
with
257 additions
and
245 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
packages/hms_room_kit/lib/src/meeting/meeting_grid_component.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<List<PeerTrackNode>, 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<MeetingStore>().peers.isNotEmpty) | ||
| HMSTitleText( | ||
| text: "Please wait for broadcaster to join", | ||
| textColor: HMSThemeColors.onSurfaceHighEmphasis) | ||
| ], | ||
| )); | ||
| } | ||
| return Selector<MeetingStore, Tuple2<MeetingMode, HMSPeer?>>( | ||
| 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<MeetingNavigationVisibilityController, bool>( | ||
| 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<MeetingStore>() | ||
| .localPeer | ||
| ?.audioTrack != | ||
| null || | ||
| context | ||
| .read<MeetingStore>() | ||
| .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, | ||
| ), | ||
| ), | ||
| ), | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
packages/hms_room_kit/lib/src/meeting/meeting_navigation_visibility_controller.dart
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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(); | ||
| }); | ||
| } | ||
| } |
Oops, something went wrong.