ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: make user nullable in carousel (#3631)

Browse source
This commit is contained in:
ggurdin 2025-08-05 12:12:25 -04:00 • committed by GitHub
parent dea50a51fd
commit 31c6228ca4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/pangea/activity_planner/activity_finished_status_message.dart
View file

@ -54,13 +54,13 @@ class ActivityFinishedStatusMessageState
if (_highlightedRole == null) {
return -1; // No highlighted role
}
return widget.room.activityRoles.indexOf(_highlightedRole!);
return rolesWithSummaries.indexOf(_highlightedRole!);
}
void _setDefaultHighlightedRole() {
if (_hightlightedRoleIndex >= 0) return;
final roles = widget.room.activityRoles;
final roles = rolesWithSummaries;
_highlightedRole = roles.firstWhereOrNull(
(r) => r.userId == widget.room.client.userID,
);
@ -80,18 +80,18 @@ class ActivityFinishedStatusMessageState
_hightlightedRoleIndex > 0 && _highlightedRole != null;
bool get _canMoveRight =>
_hightlightedRoleIndex < widget.room.activityRoles.length - 1 &&
_hightlightedRoleIndex < rolesWithSummaries.length - 1 &&
_highlightedRole != null;
void _moveLeft() {
if (_hightlightedRoleIndex > 0) {
_highlightRole(widget.room.activityRoles[_hightlightedRoleIndex - 1]);
_highlightRole(rolesWithSummaries[_hightlightedRoleIndex - 1]);
}
}
void _moveRight() {
if (_hightlightedRoleIndex < widget.room.activityRoles.length - 1) {
_highlightRole(widget.room.activityRoles[_hightlightedRoleIndex + 1]);
if (_hightlightedRoleIndex < rolesWithSummaries.length - 1) {
_highlightRole(rolesWithSummaries[_hightlightedRoleIndex + 1]);
}
}
@ -109,6 +109,16 @@ class ActivityFinishedStatusMessageState
.sendActivityAnalytics(widget.room.id);
}
List<ActivityRoleModel> get rolesWithSummaries {
if (widget.room.activitySummary == null) return <ActivityRoleModel>[];
final roles = widget.room.activityRoles;
return roles.where((role) {
return widget.room.activitySummary!.participants.any(
(p) => p.participantId == role.userId,
);
}).toList();
}
@override
Widget build(BuildContext context) {
final summary = widget.room.activitySummary;
@ -120,6 +130,7 @@ class ActivityFinishedStatusMessageState
final user = widget.room.getParticipants().firstWhereOrNull(
(u) => u.id == _highlightedRole?.userId,
);
final userSummary =
widget.room.activitySummary?.participants.firstWhereOrNull(
(p) => p.participantId == _highlightedRole!.userId,
@ -182,9 +193,7 @@ class ActivityFinishedStatusMessageState
),
),
),
if (_highlightedRole != null &&
user != null &&
userSummary != null)
if (_highlightedRole != null && userSummary != null)
ActivityResultsCarousel(
selectedRole: _highlightedRole!,
moveLeft: _canMoveLeft ? _moveLeft : null,
@ -196,7 +205,7 @@ class ActivityFinishedStatusMessageState
Wrap(
spacing: 12.0,
runSpacing: 12.0,
children: widget.room.activityRoles
children: rolesWithSummaries
.map(
(role) => ActivityParticipantIndicator(
onTap: _highlightedRole == role

10
lib/pangea/activity_planner/activity_results_carousel.dart
View file

@ -10,19 +10,20 @@ import 'package:fluffychat/widgets/avatar.dart';
class ActivityResultsCarousel extends StatelessWidget {
final ActivityRoleModel selectedRole;
final User user;
final ParticipantSummaryModel summary;
final VoidCallback? moveLeft;
final VoidCallback? moveRight;
final User? user;
const ActivityResultsCarousel({
super.key,
required this.selectedRole,
required this.moveLeft,
required this.moveRight,
required this.user,
required this.summary,
this.user,
});
@override
@ -64,8 +65,9 @@ class ActivityResultsCarousel extends StatelessWidget {
alignment: Alignment.center,
child: Avatar(
size: isColumnMode ? 60.0 : 40.0,
mxContent: user.avatarUrl,
name: user.calcDisplayname(),
mxContent: user?.avatarUrl,
name: user?.calcDisplayname() ??
summary.participantId.localpart,
userId: selectedRole.userId,
),
),