From 54c793e41773cb7b03fb0356ae20b9f0720da55d Mon Sep 17 00:00:00 2001 From: Kelrap Date: Fri, 14 Nov 2025 10:53:31 -0500 Subject: [PATCH 1/3] Combine 2 padding widgets into 1 --- .../activity_roles_event_widget.dart | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_roles_event_widget.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_roles_event_widget.dart index 5d7fde685..a6e3f3fd9 100644 --- a/lib/pangea/activity_sessions/activity_session_chat/activity_roles_event_widget.dart +++ b/lib/pangea/activity_sessions/activity_session_chat/activity_roles_event_widget.dart @@ -56,28 +56,25 @@ class ActivityRolesEvent extends StatelessWidget { } return Padding( - padding: const EdgeInsets.symmetric(horizontal: 8.0), + padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 4.0), child: Center( - child: Padding( - padding: const EdgeInsets.all(4), - child: Material( - color: theme.colorScheme.surface.withAlpha(128), - borderRadius: BorderRadius.circular(AppConfig.borderRadius / 3), - child: Padding( - padding: const EdgeInsets.symmetric( - horizontal: 8.0, - vertical: 4.0, - ), - child: Text( - "${role.stateEventMessage(displayName, L10n.of(context))}", - textAlign: TextAlign.center, - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 12 * AppConfig.fontSizeFactor, - decoration: - event.redacted ? TextDecoration.lineThrough : null, - ), + child: Material( + color: theme.colorScheme.surface.withAlpha(128), + borderRadius: BorderRadius.circular(AppConfig.borderRadius / 3), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 8.0, + vertical: 4.0, + ), + child: Text( + "${role.stateEventMessage(displayName, L10n.of(context))}", + textAlign: TextAlign.center, + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 12 * AppConfig.fontSizeFactor, + decoration: + event.redacted ? TextDecoration.lineThrough : null, ), ), ), From d92b582cc4835a7db4b52c385cac16e095038f10 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Fri, 14 Nov 2025 11:26:22 -0500 Subject: [PATCH 2/3] Add background to activity summary --- .../activity_user_summaries_widget.dart | 100 ++++++++++-------- 1 file changed, 58 insertions(+), 42 deletions(-) diff --git a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart index 959c404b7..a68777204 100644 --- a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart +++ b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart @@ -28,51 +28,67 @@ class ActivityUserSummaries extends StatelessWidget { final summary = room.activitySummary?.summary; if (summary == null) return const SizedBox(); - return Padding( - padding: const EdgeInsets.all(12.0), - child: Column( - spacing: 4.0, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - L10n.of(context).activityFinishedMessage, - ), - Text( - summary.summary, - textAlign: TextAlign.center, - ), - const Padding( - padding: EdgeInsets.symmetric( - vertical: 8.0, + return Column( + spacing: 4.0, + mainAxisSize: MainAxisSize.min, + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 4.0), + child: Center( + child: Material( + color: Theme.of(context).colorScheme.surface.withAlpha(128), + borderRadius: BorderRadius.circular(AppConfig.borderRadius / 3), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0), + child: Column( + spacing: 4.0, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + L10n.of(context).activityFinishedMessage, + ), + Text( + summary.summary, + textAlign: TextAlign.center, + ), + ], + ), + ), ), ), - ButtonControlledCarouselView( - summary: summary, - controller: controller, + ), + const Padding( + padding: EdgeInsets.symmetric( + vertical: 8.0, ), - // Row( - // mainAxisSize: MainAxisSize.min, - // children: userSummaries.map((p) { - // final user = room.getParticipants().firstWhereOrNull( - // (u) => u.id == p.participantId, - // ); - // final userRole = assignedRoles.values.firstWhere( - // (role) => role.userId == p.participantId, - // ); - // final userRoleInfo = availableRoles[userRole.id]!; - // return ActivityParticipantIndicator( - // availableRole: userRoleInfo, - // assignedRole: userRole, - // avatarUrl: - // userRoleInfo.avatarUrl ?? user?.avatarUrl?.toString(), - // borderRadius: BorderRadius.circular(4), - // selected: controller.highlightedRole?.id == userRole.id, - // onTap: () => controller.highlightRole(userRole), - // ); - // }).toList(), - // ), - ], - ), + ), + ButtonControlledCarouselView( + summary: summary, + controller: controller, + ), + // Row( + // mainAxisSize: MainAxisSize.min, + // children: userSummaries.map((p) { + // final user = room.getParticipants().firstWhereOrNull( + // (u) => u.id == p.participantId, + // ); + // final userRole = assignedRoles.values.firstWhere( + // (role) => role.userId == p.participantId, + // ); + // final userRoleInfo = availableRoles[userRole.id]!; + // return ActivityParticipantIndicator( + // availableRole: userRoleInfo, + // assignedRole: userRole, + // avatarUrl: + // userRoleInfo.avatarUrl ?? user?.avatarUrl?.toString(), + // borderRadius: BorderRadius.circular(4), + // selected: controller.highlightedRole?.id == userRole.id, + // onTap: () => controller.highlightRole(userRole), + // ); + // }).toList(), + // ), + ], ); } } From 283e57b39aa997f32bcb52893a1e3f019c682ad7 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Fri, 14 Nov 2025 11:43:54 -0500 Subject: [PATCH 3/3] Make details dropdown color more consistent with other event backgrounds --- lib/pangea/activity_sessions/activity_summary_widget.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pangea/activity_sessions/activity_summary_widget.dart b/lib/pangea/activity_sessions/activity_summary_widget.dart index b9173f5c2..9f6468602 100644 --- a/lib/pangea/activity_sessions/activity_summary_widget.dart +++ b/lib/pangea/activity_sessions/activity_summary_widget.dart @@ -89,7 +89,7 @@ class ActivitySummary extends StatelessWidget { ), DecoratedBox( decoration: BoxDecoration( - color: theme.colorScheme.surface.withAlpha(220), + color: theme.colorScheme.surface.withAlpha(128), borderRadius: BorderRadius.circular(12.0), ), child: Padding( @@ -101,7 +101,7 @@ class ActivitySummary extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ InkWell( - hoverColor: theme.colorScheme.surfaceTint.withAlpha(200), + hoverColor: theme.colorScheme.surfaceTint.withAlpha(55), onTap: toggleInstructions, child: Column( spacing: 4.0,