@@ -32,9 +32,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
32
32
dateSeparator: Colors .black,
33
33
labelTime: const HSLColor .fromAHSL (0.49 , 0 , 0 , 0 ).toColor (),
34
34
dmRecipientHeaderBg: const HSLColor .fromAHSL (1 , 46 , 0.35 , 0.93 ).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
@@ -57,9 +55,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
57
55
dateSeparator: Colors .white.withValues (alpha: 51 ),
58
56
labelTime: const HSLColor .fromAHSL (0.5 , 0 , 0 , 1 ).toColor (),
59
57
dmRecipientHeaderBg: const HSLColor .fromAHSL (1 , 0 , 0 , 0.14 ).toColor (),
60
- recipientHeaderText: const HSLColor .fromAHSL (0.9 , 0 , 0 , 1 ).toColor (),
61
58
senderBotIcon: const HSLColor .fromAHSL (1 , 180 , 0.05 , 0.5 ).toColor (),
62
- senderName: const HSLColor .fromAHSL (0.9 , 0 , 0 , 1 ).toColor (),
63
59
streamMessageBgDefault: const HSLColor .fromAHSL (1 , 0 , 0 , 0.11 ).toColor (),
64
60
streamRecipientHeaderChevronRight: Colors .white.withValues (alpha: 0.3 ),
65
61
@@ -80,9 +76,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
80
76
required this .dateSeparator,
81
77
required this .labelTime,
82
78
required this .dmRecipientHeaderBg,
83
- required this .recipientHeaderText,
84
79
required this .senderBotIcon,
85
- required this .senderName,
86
80
required this .streamMessageBgDefault,
87
81
required this .streamRecipientHeaderChevronRight,
88
82
required this .unreadMarker,
@@ -103,9 +97,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
103
97
final Color dateSeparator;
104
98
final Color labelTime;
105
99
final Color dmRecipientHeaderBg;
106
- final Color recipientHeaderText;
107
100
final Color senderBotIcon;
108
- final Color senderName;
109
101
final Color streamMessageBgDefault;
110
102
final Color streamRecipientHeaderChevronRight;
111
103
final Color unreadMarker;
@@ -117,9 +109,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
117
109
Color ? dateSeparator,
118
110
Color ? labelTime,
119
111
Color ? dmRecipientHeaderBg,
120
- Color ? recipientHeaderText,
121
112
Color ? senderBotIcon,
122
- Color ? senderName,
123
113
Color ? streamMessageBgDefault,
124
114
Color ? streamRecipientHeaderChevronRight,
125
115
Color ? unreadMarker,
@@ -130,9 +120,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
130
120
dateSeparator: dateSeparator ?? this .dateSeparator,
131
121
labelTime: labelTime ?? this .labelTime,
132
122
dmRecipientHeaderBg: dmRecipientHeaderBg ?? this .dmRecipientHeaderBg,
133
- recipientHeaderText: recipientHeaderText ?? this .recipientHeaderText,
134
123
senderBotIcon: senderBotIcon ?? this .senderBotIcon,
135
- senderName: senderName ?? this .senderName,
136
124
streamMessageBgDefault: streamMessageBgDefault ?? this .streamMessageBgDefault,
137
125
streamRecipientHeaderChevronRight: streamRecipientHeaderChevronRight ?? this .streamRecipientHeaderChevronRight,
138
126
unreadMarker: unreadMarker ?? this .unreadMarker,
@@ -150,9 +138,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
150
138
dateSeparator: Color .lerp (dateSeparator, other.dateSeparator, t)! ,
151
139
labelTime: Color .lerp (labelTime, other.labelTime, t)! ,
152
140
dmRecipientHeaderBg: Color .lerp (streamMessageBgDefault, other.dmRecipientHeaderBg, t)! ,
153
- recipientHeaderText: Color .lerp (recipientHeaderText, other.recipientHeaderText, t)! ,
154
141
senderBotIcon: Color .lerp (senderBotIcon, other.senderBotIcon, t)! ,
155
- senderName: Color .lerp (senderName, other.senderName, t)! ,
156
142
streamMessageBgDefault: Color .lerp (streamMessageBgDefault, other.streamMessageBgDefault, t)! ,
157
143
streamRecipientHeaderChevronRight: Color .lerp (streamRecipientHeaderChevronRight, other.streamRecipientHeaderChevronRight, t)! ,
158
144
unreadMarker: Color .lerp (unreadMarker, other.unreadMarker, t)! ,
@@ -1034,7 +1020,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
1034
1020
iconColor = swatch.iconOnBarBackground;
1035
1021
} else {
1036
1022
backgroundColor = messageListTheme.unsubscribedStreamRecipientHeaderBg;
1037
- iconColor = messageListTheme.recipientHeaderText ;
1023
+ iconColor = designVariables.title ;
1038
1024
}
1039
1025
1040
1026
final Widget streamWidget;
@@ -1140,6 +1126,7 @@ class DmRecipientHeader extends StatelessWidget {
1140
1126
}
1141
1127
1142
1128
final messageListTheme = MessageListTheme .of (context);
1129
+ final designVariables = DesignVariables .of (context);
1143
1130
1144
1131
return GestureDetector (
1145
1132
onTap: () => Navigator .push (context,
@@ -1155,7 +1142,7 @@ class DmRecipientHeader extends StatelessWidget {
1155
1142
Padding (
1156
1143
padding: const EdgeInsets .symmetric (horizontal: 6 ),
1157
1144
child: Icon (
1158
- color: messageListTheme.recipientHeaderText ,
1145
+ color: designVariables.title ,
1159
1146
size: 16 ,
1160
1147
ZulipIcons .user)),
1161
1148
Expanded (
@@ -1169,7 +1156,7 @@ class DmRecipientHeader extends StatelessWidget {
1169
1156
1170
1157
TextStyle recipientHeaderTextStyle (BuildContext context) {
1171
1158
return TextStyle (
1172
- color: MessageListTheme .of (context).recipientHeaderText ,
1159
+ color: DesignVariables .of (context).title ,
1173
1160
fontSize: 16 ,
1174
1161
letterSpacing: proportionalLetterSpacing (context, 0.02 , baseFontSize: 16 ),
1175
1162
height: (18 / 16 ),
@@ -1305,7 +1292,7 @@ class MessageWithPossibleSender extends StatelessWidget {
1305
1292
style: TextStyle (
1306
1293
fontSize: 18 ,
1307
1294
height: (22 / 18 ),
1308
- color: messageListTheme.senderName ,
1295
+ color: designVariables.title ,
1309
1296
).merge (weightVariableTextStyle (context, wght: 600 )),
1310
1297
overflow: TextOverflow .ellipsis)),
1311
1298
if (sender? .isBot ?? false ) ...[
0 commit comments