From 2ad57fb69bdb4218ac47c23d18b3d902814f27f2 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 22 May 2025 12:43:38 -0400 Subject: [PATCH 1/3] For user replies in dark mode, make replied message sender name darker for readability --- lib/pages/chat/events/reply_content.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 82584bafd..372948cd4 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -1,9 +1,8 @@ +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; class ReplyContent extends StatelessWidget { @@ -69,7 +68,9 @@ class ReplyContent extends StatelessWidget { fontWeight: FontWeight.bold, // #Pangea // color: color, - color: theme.colorScheme.onSurface, + color: ownMessage && theme.brightness == Brightness.dark + ? theme.colorScheme.tertiaryContainer + : theme.colorScheme.onSurface, // Pangea# fontSize: fontSize, ), From 9d84082ac85ff814f06f27cb9d2d853e07e81ac1 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 22 May 2025 12:53:25 -0400 Subject: [PATCH 2/3] Darken decoration bar left of reply on light background --- lib/pages/chat/events/reply_content.dart | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 372948cd4..24421c9cb 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -31,10 +31,16 @@ class ReplyContent extends StatelessWidget { timeline != null ? replyEvent.getDisplayEvent(timeline) : replyEvent; final fontSize = AppConfig.messageFontSize * AppConfig.fontSizeFactor; final color = theme.brightness == Brightness.dark - ? theme.colorScheme.onTertiaryContainer - : ownMessage + // Pangea# + ? ownMessage ? theme.colorScheme.tertiaryContainer - : theme.colorScheme.tertiary; + : theme.colorScheme.onTertiaryContainer + : theme.colorScheme.tertiary; + // ? theme.colorScheme.onTertiaryContainer + // : ownMessage + // ? theme.colorScheme.tertiaryContainer + // : theme.colorScheme.tertiary; + // Pangea# return Material( color: Colors.transparent, From b5b06dea4076aa33f3cfb79ea56abcb6418751cd Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 22 May 2025 13:46:18 -0400 Subject: [PATCH 3/3] chore: formatting --- lib/pages/chat/events/reply_content.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 24421c9cb..be8d67198 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -1,8 +1,9 @@ -import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; +import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart'; import '../../../config/app_config.dart'; class ReplyContent extends StatelessWidget {