From 0cce17d27b9e9806be524ecd7313f3644829c0cd Mon Sep 17 00:00:00 2001 From: ggurdin <46800240+ggurdin@users.noreply.github.com> Date: Wed, 5 Feb 2025 09:25:58 -0500 Subject: [PATCH] chore: update reply and link text styling (#1708) --- lib/pages/chat/events/message.dart | 13 +++++++----- lib/pages/chat/events/reply_content.dart | 20 +++++++++++++------ .../activity_plan_message.dart | 5 +---- .../toolbar/widgets/message_audio_card.dart | 9 +-------- .../toolbar/widgets/message_token_text.dart | 6 ++++-- .../toolbar/widgets/overlay_message.dart | 6 +----- 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 8b517ff0b..1c10c6149 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -165,11 +165,14 @@ class Message extends StatelessWidget { // Pangea# : theme.colorScheme.onSurface; - final linkColor = ownMessage - ? theme.brightness == Brightness.light - ? theme.colorScheme.primaryFixed - : theme.colorScheme.onTertiaryContainer - : theme.colorScheme.primary; + // #Pangea + // final linkColor = ownMessage + // ? theme.brightness == Brightness.light + // ? theme.colorScheme.primaryFixed + // : theme.colorScheme.onTertiaryContainer + // : theme.colorScheme.primary; + final linkColor = theme.colorScheme.primary; + // Pangea# final rowMainAxisAlignment = ownMessage ? MainAxisAlignment.end : MainAxisAlignment.start; diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index e5b7f2975..6faa0b184 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -67,7 +67,10 @@ class ReplyContent extends StatelessWidget { overflow: TextOverflow.ellipsis, style: TextStyle( fontWeight: FontWeight.bold, - color: color, + // #Pangea + // color: color, + color: theme.colorScheme.onSurface, + // Pangea# fontSize: fontSize, ), ); @@ -82,11 +85,16 @@ class ReplyContent extends StatelessWidget { overflow: TextOverflow.ellipsis, maxLines: 1, style: TextStyle( - color: theme.brightness == Brightness.dark - ? theme.colorScheme.onSurface - : ownMessage - ? theme.colorScheme.onTertiary - : theme.colorScheme.onSurface, + // #Pangea + // color: theme.brightness == Brightness.dark + // ? theme.colorScheme.onSurface + // : ownMessage + // ? theme.colorScheme.onTertiary + // : theme.colorScheme.onSurface, + color: ownMessage + ? ThemeData.dark().colorScheme.onPrimary + : theme.colorScheme.onSurface, + // Pangea# fontSize: fontSize, ), ), diff --git a/lib/pangea/activity_planner/activity_plan_message.dart b/lib/pangea/activity_planner/activity_plan_message.dart index d9ada9d7c..434bdade0 100644 --- a/lib/pangea/activity_planner/activity_plan_message.dart +++ b/lib/pangea/activity_planner/activity_plan_message.dart @@ -120,10 +120,7 @@ class ActivityPlanMessage extends StatelessWidget { controller: controller, immersionMode: false, timeline: timeline, - linkColor: theme.brightness == - Brightness.light - ? theme.colorScheme.primaryFixed - : theme.colorScheme.onTertiaryContainer, + linkColor: theme.colorScheme.primary, ), if (event.hasAggregatedEvents( timeline, diff --git a/lib/pangea/toolbar/widgets/message_audio_card.dart b/lib/pangea/toolbar/widgets/message_audio_card.dart index 9b0ed2c1b..febce674c 100644 --- a/lib/pangea/toolbar/widgets/message_audio_card.dart +++ b/lib/pangea/toolbar/widgets/message_audio_card.dart @@ -205,14 +205,7 @@ class MessageAudioCardState extends State { chatController: widget.overlayController.widget.chatController, overlayController: widget.overlayController, - linkColor: widget.messageEvent.senderId == - widget.messageEvent.event.room.client.userID - ? Theme.of(context).brightness == Brightness.light - ? Theme.of(context).colorScheme.primaryFixed - : Theme.of(context) - .colorScheme - .onTertiaryContainer - : Theme.of(context).colorScheme.primary, + linkColor: Theme.of(context).colorScheme.primary, ) : const CardErrorWidget( error: "Null audio file in message_audio_card", diff --git a/lib/pangea/toolbar/widgets/message_token_text.dart b/lib/pangea/toolbar/widgets/message_token_text.dart index 0f7dc6aa1..1ca0cfe74 100644 --- a/lib/pangea/toolbar/widgets/message_token_text.dart +++ b/lib/pangea/toolbar/widgets/message_token_text.dart @@ -233,8 +233,9 @@ class MessageTextWidget extends StatelessWidget { backgroundColor: backgroundColor, ), ), - linkStyle: const TextStyle( + linkStyle: TextStyle( decoration: TextDecoration.underline, + color: Theme.of(context).colorScheme.primary, ), onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ); @@ -255,8 +256,9 @@ class MessageTextWidget extends StatelessWidget { text: substring, style: style, options: const LinkifyOptions(humanize: false), - linkStyle: const TextStyle( + linkStyle: TextStyle( decoration: TextDecoration.underline, + color: Theme.of(context).colorScheme.primary, ), onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ); diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart index 4fbd189cb..0abf3da0b 100644 --- a/lib/pangea/toolbar/widgets/overlay_message.dart +++ b/lib/pangea/toolbar/widgets/overlay_message.dart @@ -190,11 +190,7 @@ class OverlayMessage extends StatelessWidget { prevEvent: prevEvent, borderRadius: borderRadius, timeline: timeline, - linkColor: ownMessage - ? theme.brightness == Brightness.light - ? theme.colorScheme.primaryFixed - : theme.colorScheme.onTertiaryContainer - : theme.colorScheme.primary, + linkColor: theme.colorScheme.primary, ), if (event.hasAggregatedEvents( timeline,