@@ -32,9 +32,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
32
32
dateSeparator: Colors .black,
33
33
dmRecipientHeaderBg: const HSLColor .fromAHSL (1 , 46 , 0.35 , 0.93 ).toColor (),
34
34
labelTime: const HSLColor .fromAHSL (0.49 , 0 , 0 , 0 ).toColor (),
35
- recipientHeaderText: const HSLColor .fromAHSL (1 , 0 , 0 , 0.15 ).toColor (),
36
35
senderBotIcon: const HSLColor .fromAHSL (1 , 180 , 0.08 , 0.65 ).toColor (),
37
- senderName: const HSLColor .fromAHSL (1 , 0 , 0 , 0.2 ).toColor (),
38
36
streamMessageBgDefault: Colors .white,
39
37
streamRecipientHeaderChevronRight: Colors .black.withValues (alpha: 0.3 ),
40
38
@@ -56,9 +54,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
56
54
dateSeparator: Colors .white,
57
55
dmRecipientHeaderBg: const HSLColor .fromAHSL (1 , 46 , 0.15 , 0.2 ).toColor (),
58
56
labelTime: const HSLColor .fromAHSL (0.5 , 0 , 0 , 1 ).toColor (),
59
- recipientHeaderText: const HSLColor .fromAHSL (0.8 , 0 , 0 , 1 ).toColor (),
60
57
senderBotIcon: const HSLColor .fromAHSL (1 , 180 , 0.05 , 0.5 ).toColor (),
61
- senderName: const HSLColor .fromAHSL (0.85 , 0 , 0 , 1 ).toColor (),
62
58
streamMessageBgDefault: const HSLColor .fromAHSL (1 , 0 , 0 , 0.15 ).toColor (),
63
59
streamRecipientHeaderChevronRight: Colors .white.withValues (alpha: 0.3 ),
64
60
@@ -79,9 +75,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
79
75
required this .dateSeparator,
80
76
required this .dmRecipientHeaderBg,
81
77
required this .labelTime,
82
- required this .recipientHeaderText,
83
78
required this .senderBotIcon,
84
- required this .senderName,
85
79
required this .streamMessageBgDefault,
86
80
required this .streamRecipientHeaderChevronRight,
87
81
required this .unreadMarker,
@@ -102,9 +96,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
102
96
final Color dateSeparator;
103
97
final Color dmRecipientHeaderBg;
104
98
final Color labelTime;
105
- final Color recipientHeaderText;
106
99
final Color senderBotIcon;
107
- final Color senderName;
108
100
final Color streamMessageBgDefault;
109
101
final Color streamRecipientHeaderChevronRight;
110
102
final Color unreadMarker;
@@ -116,9 +108,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
116
108
Color ? dateSeparator,
117
109
Color ? dmRecipientHeaderBg,
118
110
Color ? labelTime,
119
- Color ? recipientHeaderText,
120
111
Color ? senderBotIcon,
121
- Color ? senderName,
122
112
Color ? streamMessageBgDefault,
123
113
Color ? streamRecipientHeaderChevronRight,
124
114
Color ? unreadMarker,
@@ -129,9 +119,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
129
119
dateSeparator: dateSeparator ?? this .dateSeparator,
130
120
dmRecipientHeaderBg: dmRecipientHeaderBg ?? this .dmRecipientHeaderBg,
131
121
labelTime: labelTime ?? this .labelTime,
132
- recipientHeaderText: recipientHeaderText ?? this .recipientHeaderText,
133
122
senderBotIcon: senderBotIcon ?? this .senderBotIcon,
134
- senderName: senderName ?? this .senderName,
135
123
streamMessageBgDefault: streamMessageBgDefault ?? this .streamMessageBgDefault,
136
124
streamRecipientHeaderChevronRight: streamRecipientHeaderChevronRight ?? this .streamRecipientHeaderChevronRight,
137
125
unreadMarker: unreadMarker ?? this .unreadMarker,
@@ -149,9 +137,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
149
137
dateSeparator: Color .lerp (dateSeparator, other.dateSeparator, t)! ,
150
138
dmRecipientHeaderBg: Color .lerp (dmRecipientHeaderBg, other.dmRecipientHeaderBg, t)! ,
151
139
labelTime: Color .lerp (labelTime, other.labelTime, t)! ,
152
- recipientHeaderText: Color .lerp (recipientHeaderText, other.recipientHeaderText, t)! ,
153
140
senderBotIcon: Color .lerp (senderBotIcon, other.senderBotIcon, t)! ,
154
- senderName: Color .lerp (senderName, other.senderName, t)! ,
155
141
streamMessageBgDefault: Color .lerp (streamMessageBgDefault, other.streamMessageBgDefault, t)! ,
156
142
streamRecipientHeaderChevronRight: Color .lerp (streamRecipientHeaderChevronRight, other.streamRecipientHeaderChevronRight, t)! ,
157
143
unreadMarker: Color .lerp (unreadMarker, other.unreadMarker, t)! ,
@@ -1060,7 +1046,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
1060
1046
iconColor = swatch.iconOnBarBackground;
1061
1047
} else {
1062
1048
backgroundColor = messageListTheme.unsubscribedStreamRecipientHeaderBg;
1063
- iconColor = messageListTheme.recipientHeaderText ;
1049
+ iconColor = designVariables.title ;
1064
1050
}
1065
1051
1066
1052
final Widget streamWidget;
@@ -1176,6 +1162,7 @@ class DmRecipientHeader extends StatelessWidget {
1176
1162
}
1177
1163
1178
1164
final messageListTheme = MessageListTheme .of (context);
1165
+ final designVariables = DesignVariables .of (context);
1179
1166
1180
1167
return GestureDetector (
1181
1168
// When already in a DM narrow, disable tap interaction that would just
@@ -1196,7 +1183,7 @@ class DmRecipientHeader extends StatelessWidget {
1196
1183
Padding (
1197
1184
padding: const EdgeInsets .symmetric (horizontal: 6 ),
1198
1185
child: Icon (
1199
- color: messageListTheme.recipientHeaderText ,
1186
+ color: designVariables.title ,
1200
1187
size: 16 ,
1201
1188
ZulipIcons .user)),
1202
1189
Expanded (
@@ -1210,7 +1197,7 @@ class DmRecipientHeader extends StatelessWidget {
1210
1197
1211
1198
TextStyle recipientHeaderTextStyle (BuildContext context) {
1212
1199
return TextStyle (
1213
- color: MessageListTheme .of (context).recipientHeaderText ,
1200
+ color: DesignVariables .of (context).title ,
1214
1201
fontSize: 16 ,
1215
1202
letterSpacing: proportionalLetterSpacing (context, 0.02 , baseFontSize: 16 ),
1216
1203
height: (18 / 16 ),
@@ -1346,7 +1333,7 @@ class MessageWithPossibleSender extends StatelessWidget {
1346
1333
style: TextStyle (
1347
1334
fontSize: 18 ,
1348
1335
height: (22 / 18 ),
1349
- color: messageListTheme.senderName ,
1336
+ color: designVariables.title ,
1350
1337
).merge (weightVariableTextStyle (context, wght: 600 )),
1351
1338
overflow: TextOverflow .ellipsis)),
1352
1339
if (sender? .isBot ?? false ) ...[
0 commit comments