Update the text style of the draft label on conversation tiles

turms-im · Dec 12, 2024 · 1cd1745 · 1cd1745
1 parent 9415f47
commit 1cd1745
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...utter/lib/ui/desktop/pages/home_page/chat_page/sub_navigation_rail/conversation_tile.dart b/...utter/lib/ui/desktop/pages/home_page/chat_page/sub_navigation_rail/conversation_tile.dart
@@ -298,9 +298,9 @@ class _ConversationTileState extends ConsumerState<ConversationTile> {
             TextSpan(
                 text: '[${localizations.draft}]',
                 style: _useBoldText
-                    ? appThemeExtension.conversationTileHighlightedTextStyle
+                    ? appThemeExtension.conversationTileDraftTextStyle
                         .copyWith(fontWeight: _fontWeightBold)
-                    : appThemeExtension.conversationTileHighlightedTextStyle),
+                    : appThemeExtension.conversationTileDraftTextStyle),
             TextSpan(text: draft),
           ]
         : latestMessage == null

diff --git a/turms-chat-demo-flutter/lib/ui/themes/app_theme_extension.dart b/turms-chat-demo-flutter/lib/ui/themes/app_theme_extension.dart
@@ -46,6 +46,7 @@ class AppThemeExtension extends ThemeExtension<AppThemeExtension> {
     required this.tileBackgroundHoveredColor,
     required this.tileBackgroundFocusedColor,
     required this.conversationTileMessageTextStyle,
+    required this.conversationTileDraftTextStyle,
     required this.conversationTileHighlightedTextStyle,
     required this.conversationTileTimestampTextStyle,
     required this.messageAttachmentColor,
@@ -136,6 +137,7 @@ class AppThemeExtension extends ThemeExtension<AppThemeExtension> {
         color: AppColors.gray7,
         fontSize: 12,
       ),
+      conversationTileDraftTextStyle: const TextStyle(color: Colors.red),
       conversationTileHighlightedTextStyle:
           TextStyle(backgroundColor: AppColors.primary.withValues(alpha: 0.3)),
       conversationTileTimestampTextStyle:
@@ -224,6 +226,7 @@ class AppThemeExtension extends ThemeExtension<AppThemeExtension> {
   final Color tileBackgroundFocusedColor;
 
   final TextStyle conversationTileMessageTextStyle;
+  final TextStyle conversationTileDraftTextStyle;
   final TextStyle conversationTileHighlightedTextStyle;
   final TextStyle conversationTileTimestampTextStyle;
 
@@ -283,6 +286,7 @@ class AppThemeExtension extends ThemeExtension<AppThemeExtension> {
     Color? tileBackgroundHoveredColor,
     Color? tileBackgroundFocusedColor,
     TextStyle? conversationTileMessageTextStyle,
+    TextStyle? conversationTileDraftTextStyle,
     TextStyle? conversationTileHighlightedTextStyle,
     TextStyle? conversationTileTimestampTextStyle,
     Color? messageAttachmentColor,
@@ -357,6 +361,8 @@ class AppThemeExtension extends ThemeExtension<AppThemeExtension> {
             tileBackgroundFocusedColor ?? this.tileBackgroundFocusedColor,
         conversationTileMessageTextStyle: conversationTileMessageTextStyle ??
             this.conversationTileMessageTextStyle,
+        conversationTileDraftTextStyle: conversationTileDraftTextStyle ??
+            this.conversationTileDraftTextStyle,
         conversationTileHighlightedTextStyle:
             conversationTileHighlightedTextStyle ??
                 this.conversationTileHighlightedTextStyle,
@@ -473,6 +479,10 @@ class AppThemeExtension extends ThemeExtension<AppThemeExtension> {
           conversationTileMessageTextStyle,
           other.conversationTileMessageTextStyle,
           t)!,
+      conversationTileDraftTextStyle: TextStyle.lerp(
+          conversationTileDraftTextStyle,
+          other.conversationTileDraftTextStyle,
+          t)!,
       conversationTileHighlightedTextStyle: TextStyle.lerp(
           conversationTileHighlightedTextStyle,
           other.conversationTileHighlightedTextStyle,