Skip to content

Commit 2f4089e

Browse files
theme[nfc]: Remove senderName & recipientHeaderText
Removed `senderName` & `recipientHeaderText` from `MessageListTheme` and used `title` in place of it as per the design guidelines. discussion: zulip#1213 (comment)
1 parent 4b70f9f commit 2f4089e

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
labelTime: const HSLColor.fromAHSL(0.49, 0, 0, 0).toColor(),
3434
dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 46, 0.35, 0.93).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

@@ -57,9 +55,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
5755
dateSeparator: Colors.white.withValues(alpha: 51),
5856
labelTime: const HSLColor.fromAHSL(0.5, 0, 0, 1).toColor(),
5957
dmRecipientHeaderBg: const HSLColor.fromAHSL(1, 0, 0, 0.14).toColor(),
60-
recipientHeaderText: const HSLColor.fromAHSL(0.9, 0, 0, 1).toColor(),
6158
senderBotIcon: const HSLColor.fromAHSL(1, 180, 0.05, 0.5).toColor(),
62-
senderName: const HSLColor.fromAHSL(0.9, 0, 0, 1).toColor(),
6359
streamMessageBgDefault: const HSLColor.fromAHSL(1, 0, 0, 0.11).toColor(),
6460
streamRecipientHeaderChevronRight: Colors.white.withValues(alpha: 0.3),
6561

@@ -80,9 +76,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
8076
required this.dateSeparator,
8177
required this.labelTime,
8278
required this.dmRecipientHeaderBg,
83-
required this.recipientHeaderText,
8479
required this.senderBotIcon,
85-
required this.senderName,
8680
required this.streamMessageBgDefault,
8781
required this.streamRecipientHeaderChevronRight,
8882
required this.unreadMarker,
@@ -103,9 +97,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
10397
final Color dateSeparator;
10498
final Color labelTime;
10599
final Color dmRecipientHeaderBg;
106-
final Color recipientHeaderText;
107100
final Color senderBotIcon;
108-
final Color senderName;
109101
final Color streamMessageBgDefault;
110102
final Color streamRecipientHeaderChevronRight;
111103
final Color unreadMarker;
@@ -117,9 +109,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
117109
Color? dateSeparator,
118110
Color? labelTime,
119111
Color? dmRecipientHeaderBg,
120-
Color? recipientHeaderText,
121112
Color? senderBotIcon,
122-
Color? senderName,
123113
Color? streamMessageBgDefault,
124114
Color? streamRecipientHeaderChevronRight,
125115
Color? unreadMarker,
@@ -130,9 +120,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
130120
dateSeparator: dateSeparator ?? this.dateSeparator,
131121
labelTime: labelTime ?? this.labelTime,
132122
dmRecipientHeaderBg: dmRecipientHeaderBg ?? this.dmRecipientHeaderBg,
133-
recipientHeaderText: recipientHeaderText ?? this.recipientHeaderText,
134123
senderBotIcon: senderBotIcon ?? this.senderBotIcon,
135-
senderName: senderName ?? this.senderName,
136124
streamMessageBgDefault: streamMessageBgDefault ?? this.streamMessageBgDefault,
137125
streamRecipientHeaderChevronRight: streamRecipientHeaderChevronRight ?? this.streamRecipientHeaderChevronRight,
138126
unreadMarker: unreadMarker ?? this.unreadMarker,
@@ -150,9 +138,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
150138
dateSeparator: Color.lerp(dateSeparator, other.dateSeparator, t)!,
151139
labelTime: Color.lerp(labelTime, other.labelTime, t)!,
152140
dmRecipientHeaderBg: Color.lerp(streamMessageBgDefault, other.dmRecipientHeaderBg, t)!,
153-
recipientHeaderText: Color.lerp(recipientHeaderText, other.recipientHeaderText, t)!,
154141
senderBotIcon: Color.lerp(senderBotIcon, other.senderBotIcon, t)!,
155-
senderName: Color.lerp(senderName, other.senderName, t)!,
156142
streamMessageBgDefault: Color.lerp(streamMessageBgDefault, other.streamMessageBgDefault, t)!,
157143
streamRecipientHeaderChevronRight: Color.lerp(streamRecipientHeaderChevronRight, other.streamRecipientHeaderChevronRight, t)!,
158144
unreadMarker: Color.lerp(unreadMarker, other.unreadMarker, t)!,
@@ -1034,7 +1020,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
10341020
iconColor = swatch.iconOnBarBackground;
10351021
} else {
10361022
backgroundColor = messageListTheme.unsubscribedStreamRecipientHeaderBg;
1037-
iconColor = messageListTheme.recipientHeaderText;
1023+
iconColor = designVariables.title;
10381024
}
10391025

10401026
final Widget streamWidget;
@@ -1140,6 +1126,7 @@ class DmRecipientHeader extends StatelessWidget {
11401126
}
11411127

11421128
final messageListTheme = MessageListTheme.of(context);
1129+
final designVariables = DesignVariables.of(context);
11431130

11441131
return GestureDetector(
11451132
onTap: () => Navigator.push(context,
@@ -1155,7 +1142,7 @@ class DmRecipientHeader extends StatelessWidget {
11551142
Padding(
11561143
padding: const EdgeInsets.symmetric(horizontal: 6),
11571144
child: Icon(
1158-
color: messageListTheme.recipientHeaderText,
1145+
color: designVariables.title,
11591146
size: 16,
11601147
ZulipIcons.user)),
11611148
Expanded(
@@ -1169,7 +1156,7 @@ class DmRecipientHeader extends StatelessWidget {
11691156

11701157
TextStyle recipientHeaderTextStyle(BuildContext context) {
11711158
return TextStyle(
1172-
color: MessageListTheme.of(context).recipientHeaderText,
1159+
color: DesignVariables.of(context).title,
11731160
fontSize: 16,
11741161
letterSpacing: proportionalLetterSpacing(context, 0.02, baseFontSize: 16),
11751162
height: (18 / 16),
@@ -1305,7 +1292,7 @@ class MessageWithPossibleSender extends StatelessWidget {
13051292
style: TextStyle(
13061293
fontSize: 18,
13071294
height: (22 / 18),
1308-
color: messageListTheme.senderName,
1295+
color: designVariables.title,
13091296
).merge(weightVariableTextStyle(context, wght: 600)),
13101297
overflow: TextOverflow.ellipsis)),
13111298
if (sender?.isBot ?? false) ...[

lib/widgets/theme.dart

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

0 commit comments

Comments
 (0)