Comunic/comunicmobile
1
0
Fork 0
mirror of https://gitlab.com/comunic/comunicmobile synced 2025-11-04 04:04:18 +00:00
Code Issues Projects Releases Wiki Activity

id => userID (improve clarity)

Browse Source
This commit is contained in:
Pierre HUBERT
2020-04-20 15:02:49 +02:00
parent 99ecc399ee
commit c0856c5126
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/helpers/calls_helper.dart
View File

@@ -29,7 +29,7 @@ class CallsHelper {
CallMembersList()
..addAll((await ws("calls/members", {"callID": callID}))
.map((f) => CallMember(
id: f["userID"],
userID: f["userID"],
status: f["ready"] ? MemberStatus.READY : MemberStatus.JOINED,
))
.toList()

6
lib/lists/call_members_list.dart
View File

@@ -7,11 +7,11 @@ import 'package:comunic/models/call_member.dart';
class CallMembersList extends AbstractList<CallMember> {
/// Get the IDs of the users in this list
Set<int> get usersID => this.map((f) => f.id).toSet();
Set<int> get usersID => this.map((f) => f.userID).toSet();
/// Remove a specific member from this list
void removeUser(int userID) => this.removeWhere((f) => f.id == userID);
void removeUser(int userID) => this.removeWhere((f) => f.userID == userID);
/// Get the connection of a specific user
CallMember getUser(int userID) => this.firstWhere((f) => f.id == userID);
CallMember getUser(int userID) => this.firstWhere((f) => f.userID == userID);
}

6
lib/models/call_member.dart
View File

@@ -7,12 +7,12 @@ import 'package:flutter/material.dart';
enum MemberStatus { JOINED, READY }
class CallMember {
final int id;
final int userID;
MemberStatus status;
CallMember({
@required this.id,
@required this.userID,
this.status = MemberStatus.JOINED,
}) : assert(id != null),
}) : assert(userID != null),
assert(status != null);
}

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

@@ -83,7 +83,7 @@ class _CallScreenState extends SafeState<CallScreen> {
// Register to events
this.listenChangeState<UserJoinedCallEvent>((e) {
// TODO : get user information if required
if (e.callID == convID) _membersList.add(CallMember(id: e.userID));
if (e.callID == convID) _membersList.add(CallMember(userID: e.userID));
});
this.listen<UserLeftCallEvent>((e) {
@@ -191,7 +191,7 @@ class _CallScreenState extends SafeState<CallScreen> {
text: TextSpan(
children: _membersList
.map((f) => TextSpan(
text: _usersList.getUser(f.id).displayName + " ",
text: _usersList.getUser(f.userID).displayName + " ",
style: TextStyle(
color: f.status == MemberStatus.JOINED
? null