From 0c9a44a26ee553f769804146aa121b37457eb7af Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Fri, 28 Feb 2025 11:15:27 -0500
Subject: [PATCH] chore: link visibility (#1988)

---
 lib/pages/chat/events/message.dart            |  4 +++-
 .../toolbar/widgets/message_token_text.dart   | 24 +++++++++----------
 .../toolbar/widgets/overlay_message.dart      |  4 +++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index b9843f77c..912e5146a 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -173,7 +173,9 @@ class Message extends StatelessWidget {
     //     : theme.colorScheme.primary;
     final linkColor = theme.brightness == Brightness.light
         ? theme.colorScheme.primary
-        : theme.colorScheme.onPrimary;
+        : ownMessage
+            ? theme.colorScheme.onPrimary
+            : theme.colorScheme.onSurface;
     // Pangea#
 
     final rowMainAxisAlignment =
diff --git a/lib/pangea/toolbar/widgets/message_token_text.dart b/lib/pangea/toolbar/widgets/message_token_text.dart
index c6587d4f2..3738b9530 100644
--- a/lib/pangea/toolbar/widgets/message_token_text.dart
+++ b/lib/pangea/toolbar/widgets/message_token_text.dart
@@ -189,6 +189,15 @@ class MessageTextWidget extends StatelessWidget {
         (messageAnalyticsEntry!.hasHiddenWordActivity ||
             messageAnalyticsEntry!.hasMessageMeaningActivity);
 
+    final theme = Theme.of(context);
+    final ownMessage =
+        pangeaMessageEvent.senderId == Matrix.of(context).client.userID;
+    final linkColor = theme.brightness == Brightness.light
+        ? theme.colorScheme.primary
+        : ownMessage
+            ? theme.colorScheme.onPrimary
+            : theme.colorScheme.onSurface;
+
     return RichText(
       softWrap: softWrap ?? true,
       maxLines: maxLines,
@@ -270,10 +279,7 @@ class MessageTextWidget extends StatelessWidget {
                             style: style,
                             linkStyle: TextStyle(
                               decoration: TextDecoration.underline,
-                              color: Theme.of(context).brightness ==
-                                      Brightness.light
-                                  ? Theme.of(context).colorScheme.primary
-                                  : Theme.of(context).colorScheme.onPrimary,
+                              color: linkColor,
                             ),
                             onOpen: (url) =>
                                 UrlLauncher(context, url.url).launchUrl(),
@@ -287,10 +293,7 @@ class MessageTextWidget extends StatelessWidget {
                           ),
                           linkStyle: TextStyle(
                             decoration: TextDecoration.underline,
-                            color:
-                                Theme.of(context).brightness == Brightness.light
-                                    ? Theme.of(context).colorScheme.primary
-                                    : Theme.of(context).colorScheme.onPrimary,
+                            color: linkColor,
                           ),
                           onOpen: (url) =>
                               UrlLauncher(context, url.url).launchUrl(),
@@ -301,10 +304,7 @@ class MessageTextWidget extends StatelessWidget {
                             style: style,
                             linkStyle: TextStyle(
                               decoration: TextDecoration.underline,
-                              color: Theme.of(context).brightness ==
-                                      Brightness.light
-                                  ? Theme.of(context).colorScheme.primary
-                                  : Theme.of(context).colorScheme.onPrimary,
+                              color: linkColor,
                             ),
                             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 d477537c2..3da471de9 100644
--- a/lib/pangea/toolbar/widgets/overlay_message.dart
+++ b/lib/pangea/toolbar/widgets/overlay_message.dart
@@ -192,7 +192,9 @@ class OverlayMessage extends StatelessWidget {
                 timeline: timeline,
                 linkColor: theme.brightness == Brightness.light
                     ? theme.colorScheme.primary
-                    : theme.colorScheme.onPrimary,
+                    : ownMessage
+                        ? theme.colorScheme.onPrimary
+                        : theme.colorScheme.onSurface,
               ),
               if (event.hasAggregatedEvents(
                 timeline,