Skip to content

Commit 6bb8680

Browse files
theme: Replace senderName & recipientHeaderText with title
The `senderName` & `recipientHeaderText` giving colors to name of sender in each message and left icon + text in the Message Header of both Stream messages and DMs, respectively, have been replaced to a lighter and darker versions in dark and light themes, respectively, using the `title` variable of `DesignVariables`, according to the Figma Design. This specific UI of left icon and text in message header for the DMs doesnt appear in the Figma design, but we use `title` variable because `recipientHeaderText` was used previously for coloring them. Figma: - https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4993-20811&t=vu2wWOBiVb0BB6Vz-0 - https://www.figma.com/design/1JTNtYo9memgW7vV6d0ygq/Zulip-Mobile?node-id=4010-6352&t=9j2mOkL1Pds0XVAE-0 discussion: zulip#1213 (comment)
1 parent b40c51d commit 6bb8680

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

lib/widgets/message_list.dart

+5-18
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
3232
dateSeparator: Colors.black,
3333
dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 46, 0.35, 0.93).toColor(),
3434
labelTime: const HSLColor.fromAHSL(0.49, 0, 0, 0).toColor(),
35-
recipientHeaderText: const HSLColor.fromAHSL(1, 0, 0, 0.15).toColor(),
3635
senderBotIcon: const HSLColor.fromAHSL(1, 180, 0.08, 0.65).toColor(),
37-
senderName: const HSLColor.fromAHSL(1, 0, 0, 0.2).toColor(),
3836
streamMessageBgDefault: Colors.white,
3937
streamRecipientHeaderChevronRight: Colors.black.withValues(alpha: 0.3),
4038

@@ -56,9 +54,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
5654
dateSeparator: Colors.white,
5755
dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 46, 0.15, 0.2).toColor(),
5856
labelTime: const HSLColor.fromAHSL(0.5, 0, 0, 1).toColor(),
59-
recipientHeaderText: const HSLColor.fromAHSL(0.8, 0, 0, 1).toColor(),
6057
senderBotIcon: const HSLColor.fromAHSL(1, 180, 0.05, 0.5).toColor(),
61-
senderName: const HSLColor.fromAHSL(0.85, 0, 0, 1).toColor(),
6258
streamMessageBgDefault: const HSLColor.fromAHSL(1, 0, 0, 0.15).toColor(),
6359
streamRecipientHeaderChevronRight: Colors.white.withValues(alpha: 0.3),
6460

@@ -79,9 +75,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
7975
required this.dateSeparator,
8076
required this.dmRecipientHeaderBg,
8177
required this.labelTime,
82-
required this.recipientHeaderText,
8378
required this.senderBotIcon,
84-
required this.senderName,
8579
required this.streamMessageBgDefault,
8680
required this.streamRecipientHeaderChevronRight,
8781
required this.unreadMarker,
@@ -102,9 +96,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
10296
final Color dateSeparator;
10397
final Color dmRecipientHeaderBg;
10498
final Color labelTime;
105-
final Color recipientHeaderText;
10699
final Color senderBotIcon;
107-
final Color senderName;
108100
final Color streamMessageBgDefault;
109101
final Color streamRecipientHeaderChevronRight;
110102
final Color unreadMarker;
@@ -116,9 +108,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
116108
Color? dateSeparator,
117109
Color? dmRecipientHeaderBg,
118110
Color? labelTime,
119-
Color? recipientHeaderText,
120111
Color? senderBotIcon,
121-
Color? senderName,
122112
Color? streamMessageBgDefault,
123113
Color? streamRecipientHeaderChevronRight,
124114
Color? unreadMarker,
@@ -129,9 +119,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
129119
dateSeparator: dateSeparator ?? this.dateSeparator,
130120
dmRecipientHeaderBg: dmRecipientHeaderBg ?? this.dmRecipientHeaderBg,
131121
labelTime: labelTime ?? this.labelTime,
132-
recipientHeaderText: recipientHeaderText ?? this.recipientHeaderText,
133122
senderBotIcon: senderBotIcon ?? this.senderBotIcon,
134-
senderName: senderName ?? this.senderName,
135123
streamMessageBgDefault: streamMessageBgDefault ?? this.streamMessageBgDefault,
136124
streamRecipientHeaderChevronRight: streamRecipientHeaderChevronRight ?? this.streamRecipientHeaderChevronRight,
137125
unreadMarker: unreadMarker ?? this.unreadMarker,
@@ -149,9 +137,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
149137
dateSeparator: Color.lerp(dateSeparator, other.dateSeparator, t)!,
150138
dmRecipientHeaderBg: Color.lerp(dmRecipientHeaderBg, other.dmRecipientHeaderBg, t)!,
151139
labelTime: Color.lerp(labelTime, other.labelTime, t)!,
152-
recipientHeaderText: Color.lerp(recipientHeaderText, other.recipientHeaderText, t)!,
153140
senderBotIcon: Color.lerp(senderBotIcon, other.senderBotIcon, t)!,
154-
senderName: Color.lerp(senderName, other.senderName, t)!,
155141
streamMessageBgDefault: Color.lerp(streamMessageBgDefault, other.streamMessageBgDefault, t)!,
156142
streamRecipientHeaderChevronRight: Color.lerp(streamRecipientHeaderChevronRight, other.streamRecipientHeaderChevronRight, t)!,
157143
unreadMarker: Color.lerp(unreadMarker, other.unreadMarker, t)!,
@@ -1062,7 +1048,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
10621048
iconColor = swatch.iconOnBarBackground;
10631049
} else {
10641050
backgroundColor = messageListTheme.unsubscribedStreamRecipientHeaderBg;
1065-
iconColor = messageListTheme.recipientHeaderText;
1051+
iconColor = designVariables.title;
10661052
}
10671053

10681054
final Widget streamWidget;
@@ -1178,6 +1164,7 @@ class DmRecipientHeader extends StatelessWidget {
11781164
}
11791165

11801166
final messageListTheme = MessageListTheme.of(context);
1167+
final designVariables = DesignVariables.of(context);
11811168

11821169
return GestureDetector(
11831170
// When already in a DM narrow, disable tap interaction that would just
@@ -1198,7 +1185,7 @@ class DmRecipientHeader extends StatelessWidget {
11981185
Padding(
11991186
padding: const EdgeInsets.symmetric(horizontal: 6),
12001187
child: Icon(
1201-
color: messageListTheme.recipientHeaderText,
1188+
color: designVariables.title,
12021189
size: 16,
12031190
ZulipIcons.user)),
12041191
Expanded(
@@ -1212,7 +1199,7 @@ class DmRecipientHeader extends StatelessWidget {
12121199

12131200
TextStyle recipientHeaderTextStyle(BuildContext context) {
12141201
return TextStyle(
1215-
color: MessageListTheme.of(context).recipientHeaderText,
1202+
color: DesignVariables.of(context).title,
12161203
fontSize: 16,
12171204
letterSpacing: proportionalLetterSpacing(context, 0.02, baseFontSize: 16),
12181205
height: (18 / 16),
@@ -1348,7 +1335,7 @@ class MessageWithPossibleSender extends StatelessWidget {
13481335
style: TextStyle(
13491336
fontSize: 18,
13501337
height: (22 / 18),
1351-
color: messageListTheme.senderName,
1338+
color: designVariables.title,
13521339
).merge(weightVariableTextStyle(context, wght: 600)),
13531340
overflow: TextOverflow.ellipsis)),
13541341
if (sender?.isBot ?? false) ...[

lib/widgets/theme.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
194194
labelMenuButton: const Color(0xffffffff).withValues(alpha: 0.85),
195195
mainBackground: const Color(0xff1d1d1d),
196196
textInput: const Color(0xffffffff).withValues(alpha: 0.9),
197-
title: const Color(0xffffffff),
197+
title: const Color(0xffffffff).withValues(alpha: 0.9),
198198
bgSearchInput: const Color(0xff313131),
199199
textMessage: const Color(0xffffffff).withValues(alpha: 0.8),
200200
channelColorSwatches: ChannelColorSwatches.dark,

0 commit comments

Comments
 (0)