aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Conditionally render participants (#3700)

Browse Source 
* chore: only show activity participants in state event widget it user has assigned role

* chore: show participants in activity state event if there are no available roles
pull/2245/head
ggurdin 3 months ago committed by GitHub
parent 1e3529180b
commit b1d9b30b29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 118 additions and 106 deletions
Show Stats Download Patch File Download Diff File

26
lib/pangea/activity_sessions/activity_room_extension.dart
Unescape Escape View File

@ -1,3 +1,5 @@
import 'dart:math';
import 'package:flutter/foundation.dart';
import 'package:collection/collection.dart';
@ -55,7 +57,7 @@ extension ActivityRoomExtension on Room {
Future<void> continueActivity() async {
final currentRoles = activityRoles ?? ActivityRolesModel.empty;
final role = currentRoles.role(client.userID!);
final role = ownRole;
if (role == null || !role.isFinished) return;
role.finishedAt = null; // Reset finished state
@ -75,7 +77,7 @@ extension ActivityRoomExtension on Room {
}
final currentRoles = activityRoles ?? ActivityRolesModel.empty;
final role = currentRoles.role(client.userID!);
final role = ownRole;
if (role == null || role.isFinished) return;
role.finishedAt = DateTime.now();
currentRoles.updateRole(role);
@ -101,7 +103,7 @@ extension ActivityRoomExtension on Room {
Future<void> archiveActivity() async {
final currentRoles = activityRoles ?? ActivityRolesModel.empty;
final role = currentRoles.role(client.userID!);
final role = ownRole;
if (role == null || !role.isFinished) return;
role.archivedAt = DateTime.now();
@ -256,6 +258,14 @@ extension ActivityRoomExtension on Room {
}
}
ActivityRoleModel? get ownRole => activityRoles?.role(client.userID!);
int get remainingRoles {
final availableRoles = activityPlan!.roles;
final assignedRoles = activityRoles?.roles ?? {};
return max(0, availableRoles.length - assignedRoles.length);
}
bool get showActivityChatUI {
return activityPlan != null &&
powerForChangingStateEvent(PangeaEventTypes.activityRole) == 0 &&
@ -264,18 +274,17 @@ extension ActivityRoomExtension on Room {
bool get isActiveInActivity {
if (!showActivityChatUI) return false;
final role = activityRoles?.role(client.userID!);
final role = ownRole;
return role != null && !role.isFinished;
}
bool get isInactiveInActivity {
if (!showActivityChatUI) return false;
final role = activityRoles?.role(client.userID!);
final role = ownRole;
return role == null || role.isFinished;
}
bool get hasCompletedActivity =>
activityRoles?.role(client.userID!)?.isFinished ?? false;
bool get hasCompletedActivity => ownRole?.isFinished ?? false;
bool get activityIsFinished {
final roles = activityRoles?.roles.values.where(
@ -295,6 +304,5 @@ extension ActivityRoomExtension on Room {
});
}
bool get isHiddenActivityRoom =>
activityRoles?.role(client.userID!)?.isArchived ?? false;
bool get isHiddenActivityRoom => ownRole?.isArchived ?? false;
}

121
lib/pangea/activity_sessions/activity_state_event.dart
Unescape Escape View File

@ -46,70 +46,73 @@ class ActivityStateEvent extends StatelessWidget {
activity.markdown,
style: const TextStyle(fontSize: 14.0),
),
Wrap(
alignment: WrapAlignment.center,
spacing: 12.0,
runSpacing: 12.0,
children: availableRoles.values.map((availableRole) {
final assignedRole = assignedRoles[availableRole.id];
final user = event.room.getParticipants().firstWhereOrNull(
(u) => u.id == assignedRole?.userId,
);
if (event.room.ownRole != null ||
event.room.remainingRoles == 0) ...[
Wrap(
alignment: WrapAlignment.center,
spacing: 12.0,
runSpacing: 12.0,
children: availableRoles.values.map((availableRole) {
final assignedRole = assignedRoles[availableRole.id];
final user = event.room.getParticipants().firstWhereOrNull(
(u) => u.id == assignedRole?.userId,
);
return ActivityParticipantIndicator(
availableRole: availableRole,
assignedRole: assignedRole,
opacity: assignedRole == null || assignedRole.isFinished
? 0.5
: 1.0,
avatarUrl:
availableRole.avatarUrl ?? user?.avatarUrl?.toString(),
);
}).toList(),
),
Wrap(
alignment: WrapAlignment.center,
spacing: 12.0,
runSpacing: 12.0,
children: remainingMembers.map((member) {
return Container(
decoration: BoxDecoration(
color: theme.colorScheme.primaryContainer,
borderRadius: BorderRadius.circular(18.0),
),
padding: const EdgeInsets.all(4.0),
child: Opacity(
opacity: 0.5,
child: Row(
spacing: 4.0,
mainAxisSize: MainAxisSize.min,
children: [
Avatar(
size: 18.0,
mxContent: member.avatarUrl,
name: member.calcDisplayname(),
userId: member.id,
),
ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 80.0,
return ActivityParticipantIndicator(
availableRole: availableRole,
assignedRole: assignedRole,
opacity: assignedRole == null || assignedRole.isFinished
? 0.5
: 1.0,
avatarUrl:
availableRole.avatarUrl ?? user?.avatarUrl?.toString(),
);
}).toList(),
),
Wrap(
alignment: WrapAlignment.center,
spacing: 12.0,
runSpacing: 12.0,
children: remainingMembers.map((member) {
return Container(
decoration: BoxDecoration(
color: theme.colorScheme.primaryContainer,
borderRadius: BorderRadius.circular(18.0),
),
padding: const EdgeInsets.all(4.0),
child: Opacity(
opacity: 0.5,
child: Row(
spacing: 4.0,
mainAxisSize: MainAxisSize.min,
children: [
Avatar(
size: 18.0,
mxContent: member.avatarUrl,
name: member.calcDisplayname(),
userId: member.id,
),
child: Text(
member.calcDisplayname(),
style: TextStyle(
fontSize: 12.0,
color: theme.colorScheme.onPrimaryContainer,
ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 80.0,
),
child: Text(
member.calcDisplayname(),
style: TextStyle(
fontSize: 12.0,
color: theme.colorScheme.onPrimaryContainer,
),
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
overflow: TextOverflow.ellipsis,
maxLines: 1,
),
),
],
],
),
),
),
);
}).toList(),
),
);
}).toList(),
),
],
],
),
);

2
lib/pangea/activity_sessions/activity_status_message.dart
Unescape Escape View File

@ -20,7 +20,7 @@ class ActivityStatusMessage extends StatelessWidget {
return const SizedBox.shrink();
}
final role = room.activityRoles?.role(room.client.userID!);
final role = room.ownRole;
if (role != null && !role.isFinished) {
return const SizedBox.shrink();
}

75
lib/pangea/activity_sessions/activity_unfinished_status_message.dart
Unescape Escape View File

@ -72,46 +72,47 @@ class ActivityUnfinishedStatusMessageState
),
const SizedBox(height: 16.0),
],
ElevatedButton(
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 12.0,
vertical: 8.0,
if (completed || remainingRoles > 0)
ElevatedButton(
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 12.0,
vertical: 8.0,
),
foregroundColor: theme.colorScheme.onPrimaryContainer,
backgroundColor: theme.colorScheme.primaryContainer,
),
foregroundColor: theme.colorScheme.onPrimaryContainer,
backgroundColor: theme.colorScheme.primaryContainer,
),
onPressed: completed
? () {
showFutureLoadingDialog(
context: context,
future: widget.room.continueActivity,
);
}
: _selectedRoleId != null
? () {
showFutureLoadingDialog(
context: context,
future: () => widget.room.joinActivity(
availableRoles[_selectedRoleId!]!,
),
);
}
: null,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
completed
? L10n.of(context).continueText
: L10n.of(context).confirmRole,
style: TextStyle(
fontSize: isColumnMode ? 16.0 : 12.0,
onPressed: completed
? () {
showFutureLoadingDialog(
context: context,
future: widget.room.continueActivity,
);
}
: _selectedRoleId != null
? () {
showFutureLoadingDialog(
context: context,
future: () => widget.room.joinActivity(
availableRoles[_selectedRoleId!]!,
),
);
}
: null,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
completed
? L10n.of(context).continueText
: L10n.of(context).confirmRole,
style: TextStyle(
fontSize: isColumnMode ? 16.0 : 12.0,
),
),
),
],
],
),
),
),
],
);
}

Write Preview
Loading…
Cancel
Save