Comunic/comunicmobile
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicmobile synced 2025-02-16 21:52:38 +00:00
Code Issues Projects Releases Wiki Activity

Improve video appearance

Browse Source
This commit is contained in:
Pierre HUBERT 2020-05-09 16:06:24 +02:00
parent ce908d1b51
commit 44f417a0f2
1 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/ui/screens/call_screen.dart
View File

@ -1,4 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:math';
import 'package:comunic/helpers/calls_helper.dart'; import 'package:comunic/helpers/calls_helper.dart';
import 'package:comunic/helpers/conversations_helper.dart'; import 'package:comunic/helpers/conversations_helper.dart';
@ -478,7 +479,7 @@ class _CallScreenState extends SafeState<CallScreen> {
return Column( return Column(
children: <Widget>[ children: <Widget>[
_canHideMenuBar ? Container() : _buildMembersArea(), _canHideMenuBar ? Container() : _buildMembersArea(),
_buildVideosArea() Expanded(child: LayoutBuilder(builder: _buildVideosArea))
], ],
); );
} }
@ -503,18 +504,41 @@ class _CallScreenState extends SafeState<CallScreen> {
} }
/// Videos area /// Videos area
Widget _buildVideosArea() { Widget _buildVideosArea(BuildContext context, BoxConstraints constraints) {
return Expanded( final availableVideos = _membersList.readyPeers
child: Stack( .where((f) => f.hasVideoStream && _renderers.containsKey(f.userID))
.toList();
final rows = List<Row>();
var numberRows = sqrt(availableVideos.length).ceil();
var numberCols = numberRows;
if (availableVideos.length == 2) numberRows = 1;
final videoWidth = constraints.maxWidth / numberCols;
final videoHeight = constraints.maxHeight / numberRows;
for (int i = 0; i < numberRows; i++) {
rows.add(Row(
children: availableVideos
.getRange(i * numberRows,
min(availableVideos.length, i * numberRows + numberCols))
.map((f) => Container(
width: videoWidth,
height: videoHeight,
child: _buildMemberVideo(f.userID),
))
.toList(),
));
}
return Stack(
fit: StackFit.expand, fit: StackFit.expand,
children: [ children: [
// Remove peers videos // Remove peers videos
Column( Column(
children: _membersList.readyPeers children: rows,
.where(
(f) => f.hasVideoStream && _renderers.containsKey(f.userID))
.map((f) => _buildMemberVideo(f.userID))
.toList(),
), ),
// Local peer video // Local peer video
@ -525,12 +549,11 @@ class _CallScreenState extends SafeState<CallScreen> {
// Buttons bar // Buttons bar
_canHideMenuBar ? Container() : _buildFooterArea() _canHideMenuBar ? Container() : _buildFooterArea()
], ],
),
); );
} }
Widget _buildMemberVideo(int peerID) { Widget _buildMemberVideo(int peerID) {
return Expanded(child: RTCVideoView(_renderers[peerID])); return RTCVideoView(_renderers[peerID]);
} }
Widget _buildLocalVideo() { Widget _buildLocalVideo() {