From 3890117393a6b1105d026abb9922c6367d6a937c Mon Sep 17 00:00:00 2001 From: Gaurav-Kushwaha-1225 Date: Fri, 31 Jan 2025 10:47:32 +0530 Subject: [PATCH] theme: Replace `dateSeparator` with `foreground` Figma: https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4993-20811&t=vu2wWOBiVb0BB6Vz-0 discussion: https://github.com/zulip/zulip-flutter/pull/1213#discussion_r1933008843 Fixes: #1213 --- lib/widgets/message_list.dart | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/widgets/message_list.dart b/lib/widgets/message_list.dart index 9c2ba2dfde..b3b9655be0 100644 --- a/lib/widgets/message_list.dart +++ b/lib/widgets/message_list.dart @@ -29,7 +29,6 @@ import 'theme.dart'; class MessageListTheme extends ThemeExtension { static final light = MessageListTheme._( bgMessageRegular: const HSLColor.fromAHSL(1, 0, 0, 1).toColor(), - dateSeparator: Colors.black, dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 46, 0.35, 0.93).toColor(), labelTime: const HSLColor.fromAHSL(0.49, 0, 0, 0).toColor(), senderBotIcon: const HSLColor.fromAHSL(1, 180, 0.08, 0.65).toColor(), @@ -51,7 +50,6 @@ class MessageListTheme extends ThemeExtension { static final dark = MessageListTheme._( bgMessageRegular: const HSLColor.fromAHSL(1, 0, 0, 0.11).toColor(), - dateSeparator: Colors.white, dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 46, 0.15, 0.2).toColor(), labelTime: const HSLColor.fromAHSL(0.5, 0, 0, 1).toColor(), senderBotIcon: const HSLColor.fromAHSL(1, 180, 0.05, 0.5).toColor(), @@ -72,7 +70,6 @@ class MessageListTheme extends ThemeExtension { MessageListTheme._({ required this.bgMessageRegular, - required this.dateSeparator, required this.dmRecipientHeaderBg, required this.labelTime, required this.senderBotIcon, @@ -93,7 +90,6 @@ class MessageListTheme extends ThemeExtension { } final Color bgMessageRegular; - final Color dateSeparator; final Color dmRecipientHeaderBg; final Color labelTime; final Color senderBotIcon; @@ -105,7 +101,6 @@ class MessageListTheme extends ThemeExtension { @override MessageListTheme copyWith({ Color? bgMessageRegular, - Color? dateSeparator, Color? dmRecipientHeaderBg, Color? labelTime, Color? senderBotIcon, @@ -116,7 +111,6 @@ class MessageListTheme extends ThemeExtension { }) { return MessageListTheme._( bgMessageRegular: bgMessageRegular ?? this.bgMessageRegular, - dateSeparator: dateSeparator ?? this.dateSeparator, dmRecipientHeaderBg: dmRecipientHeaderBg ?? this.dmRecipientHeaderBg, labelTime: labelTime ?? this.labelTime, senderBotIcon: senderBotIcon ?? this.senderBotIcon, @@ -134,7 +128,6 @@ class MessageListTheme extends ThemeExtension { } return MessageListTheme._( bgMessageRegular: Color.lerp(bgMessageRegular, other.bgMessageRegular, t)!, - dateSeparator: Color.lerp(dateSeparator, other.dateSeparator, t)!, dmRecipientHeaderBg: Color.lerp(dmRecipientHeaderBg, other.dmRecipientHeaderBg, t)!, labelTime: Color.lerp(labelTime, other.labelTime, t)!, senderBotIcon: Color.lerp(senderBotIcon, other.senderBotIcon, t)!, @@ -899,8 +892,9 @@ class DateSeparator extends StatelessWidget { const textBottomPadding = 2.0; final messageListTheme = MessageListTheme.of(context); + final designVariables = DesignVariables.of(context); - final line = BorderSide(width: 0, color: messageListTheme.dateSeparator); + final line = BorderSide(width: 0, color: designVariables.foreground); // TODO(#681) use different color for DM messages return ColoredBox(color: messageListTheme.bgMessageRegular,