Skip to content

Commit 879c441

Browse files
theme: Replace dateSeparatorText and messageTimestamp with labelTime
Figma: https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4993-20811&t=QCuXEn8bYVbf4Fli-0 discussion: #1213 (comment)
1 parent f809514 commit 879c441

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

lib/widgets/message_list.dart

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ import 'theme.dart';
2929
class MessageListTheme extends ThemeExtension<MessageListTheme> {
3030
static final light = MessageListTheme._(
3131
dateSeparator: Colors.black,
32-
dateSeparatorText: const HSLColor.fromAHSL(0.75, 0, 0, 0.15).toColor(),
3332
dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 46, 0.35, 0.93).toColor(),
34-
messageTimestamp: const HSLColor.fromAHSL(0.8, 0, 0, 0.2).toColor(),
33+
labelTime: const HSLColor.fromAHSL(0.49, 0, 0, 0).toColor(),
3534
recipientHeaderText: const HSLColor.fromAHSL(1, 0, 0, 0.15).toColor(),
3635
senderBotIcon: const HSLColor.fromAHSL(1, 180, 0.08, 0.65).toColor(),
3736
senderName: const HSLColor.fromAHSL(1, 0, 0, 0.2).toColor(),
@@ -54,9 +53,8 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
5453

5554
static final dark = MessageListTheme._(
5655
dateSeparator: Colors.white,
57-
dateSeparatorText: const HSLColor.fromAHSL(0.75, 0, 0, 1).toColor(),
5856
dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 46, 0.15, 0.2).toColor(),
59-
messageTimestamp: const HSLColor.fromAHSL(0.8, 0, 0, 0.85).toColor(),
57+
labelTime: const HSLColor.fromAHSL(0.5, 0, 0, 1).toColor(),
6058
recipientHeaderText: const HSLColor.fromAHSL(0.8, 0, 0, 1).toColor(),
6159
senderBotIcon: const HSLColor.fromAHSL(1, 180, 0.05, 0.5).toColor(),
6260
senderName: const HSLColor.fromAHSL(0.85, 0, 0, 1).toColor(),
@@ -78,9 +76,8 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
7876

7977
MessageListTheme._({
8078
required this.dateSeparator,
81-
required this.dateSeparatorText,
8279
required this.dmRecipientHeaderBg,
83-
required this.messageTimestamp,
80+
required this.labelTime,
8481
required this.recipientHeaderText,
8582
required this.senderBotIcon,
8683
required this.senderName,
@@ -102,9 +99,8 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
10299
}
103100

104101
final Color dateSeparator;
105-
final Color dateSeparatorText;
106102
final Color dmRecipientHeaderBg;
107-
final Color messageTimestamp;
103+
final Color labelTime;
108104
final Color recipientHeaderText;
109105
final Color senderBotIcon;
110106
final Color senderName;
@@ -117,9 +113,8 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
117113
@override
118114
MessageListTheme copyWith({
119115
Color? dateSeparator,
120-
Color? dateSeparatorText,
121116
Color? dmRecipientHeaderBg,
122-
Color? messageTimestamp,
117+
Color? labelTime,
123118
Color? recipientHeaderText,
124119
Color? senderBotIcon,
125120
Color? senderName,
@@ -131,9 +126,8 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
131126
}) {
132127
return MessageListTheme._(
133128
dateSeparator: dateSeparator ?? this.dateSeparator,
134-
dateSeparatorText: dateSeparatorText ?? this.dateSeparatorText,
135129
dmRecipientHeaderBg: dmRecipientHeaderBg ?? this.dmRecipientHeaderBg,
136-
messageTimestamp: messageTimestamp ?? this.messageTimestamp,
130+
labelTime: labelTime ?? this.labelTime,
137131
recipientHeaderText: recipientHeaderText ?? this.recipientHeaderText,
138132
senderBotIcon: senderBotIcon ?? this.senderBotIcon,
139133
senderName: senderName ?? this.senderName,
@@ -152,9 +146,8 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
152146
}
153147
return MessageListTheme._(
154148
dateSeparator: Color.lerp(dateSeparator, other.dateSeparator, t)!,
155-
dateSeparatorText: Color.lerp(dateSeparatorText, other.dateSeparatorText, t)!,
156149
dmRecipientHeaderBg: Color.lerp(streamMessageBgDefault, other.dmRecipientHeaderBg, t)!,
157-
messageTimestamp: Color.lerp(messageTimestamp, other.messageTimestamp, t)!,
150+
labelTime: Color.lerp(labelTime, other.labelTime, t)!,
158151
recipientHeaderText: Color.lerp(recipientHeaderText, other.recipientHeaderText, t)!,
159152
senderBotIcon: Color.lerp(senderBotIcon, other.senderBotIcon, t)!,
160153
senderName: Color.lerp(senderName, other.senderName, t)!,
@@ -1222,7 +1215,7 @@ class DateText extends StatelessWidget {
12221215
final zulipLocalizations = ZulipLocalizations.of(context);
12231216
return Text(
12241217
style: TextStyle(
1225-
color: messageListTheme.dateSeparatorText,
1218+
color: messageListTheme.labelTime,
12261219
fontSize: fontSize,
12271220
height: height,
12281221
// This is equivalent to css `all-small-caps`, see:
@@ -1329,7 +1322,7 @@ class MessageWithPossibleSender extends StatelessWidget {
13291322
const SizedBox(width: 4),
13301323
Text(time,
13311324
style: TextStyle(
1332-
color: messageListTheme.messageTimestamp,
1325+
color: messageListTheme.labelTime,
13331326
fontSize: 16,
13341327
height: (18 / 16),
13351328
fontFeatures: const [FontFeature.enable('c2sc'), FontFeature.enable('smcp')],

0 commit comments

Comments
 (0)