diff --git a/lib/pangea/activity_sessions/activity_participant_indicator.dart b/lib/pangea/activity_sessions/activity_participant_indicator.dart index 4cbc37fe6..c5871e820 100644 --- a/lib/pangea/activity_sessions/activity_participant_indicator.dart +++ b/lib/pangea/activity_sessions/activity_participant_indicator.dart @@ -71,11 +71,11 @@ class ActivityParticipantIndicator extends StatelessWidget { size: 60.0, userId: userId, miniIcon: - room != null && userId == BotName.byEnvironment + room != null && user?.id == BotName.byEnvironment ? BotSettingsLanguageIcon(user: user!) : null, presenceOffset: - room != null && userId == BotName.byEnvironment + room != null && user?.id == BotName.byEnvironment ? const Offset(0, 0) : null, ) diff --git a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart index fa2a52513..39db710db 100644 --- a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart +++ b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart @@ -202,14 +202,11 @@ class ButtonControlledCarouselView extends StatelessWidget { ], ), Flexible( - child: SingleChildScrollView( - child: Text( - p.displayFeedback( - user?.calcDisplayname() ?? - p.participantId.localpart ?? - p.participantId, - ), - style: const TextStyle(fontSize: 14.0), + child: _SummaryText( + text: p.displayFeedback( + user?.calcDisplayname() ?? + p.participantId.localpart ?? + p.participantId, ), ), ), @@ -340,3 +337,38 @@ class SuperlativeTile extends StatelessWidget { ); } } + +class _SummaryText extends StatefulWidget { + final String text; + const _SummaryText({ + required this.text, + }); + + @override + State<_SummaryText> createState() => _SummaryTextState(); +} + +class _SummaryTextState extends State<_SummaryText> { + final ScrollController _scrollController = ScrollController(); + + @override + void dispose() { + _scrollController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Scrollbar( + controller: _scrollController, + thumbVisibility: true, + child: SingleChildScrollView( + controller: _scrollController, + child: Text( + widget.text, + style: const TextStyle(fontSize: 14.0), + ), + ), + ); + } +}