@@ -31,9 +31,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
3131 dateSeparator: Colors .black,
3232 dmRecipientHeaderBg: const HSLColor .fromAHSL (1 , 46 , 0.35 , 0.93 ).toColor (),
3333 labelTime: const HSLColor .fromAHSL (0.49 , 0 , 0 , 0 ).toColor (),
34- recipientHeaderText: const HSLColor .fromAHSL (1 , 0 , 0 , 0.15 ).toColor (),
3534 senderBotIcon: const HSLColor .fromAHSL (1 , 180 , 0.08 , 0.65 ).toColor (),
36- senderName: const HSLColor .fromAHSL (1 , 0 , 0 , 0.2 ).toColor (),
3735 streamMessageBgDefault: Colors .white,
3836 streamRecipientHeaderChevronRight: Colors .black.withValues (alpha: 0.3 ),
3937
@@ -55,9 +53,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
5553 dateSeparator: Colors .white,
5654 dmRecipientHeaderBg: const HSLColor .fromAHSL (1 , 46 , 0.15 , 0.2 ).toColor (),
5755 labelTime: const HSLColor .fromAHSL (0.5 , 0 , 0 , 1 ).toColor (),
58- recipientHeaderText: const HSLColor .fromAHSL (0.8 , 0 , 0 , 1 ).toColor (),
5956 senderBotIcon: const HSLColor .fromAHSL (1 , 180 , 0.05 , 0.5 ).toColor (),
60- senderName: const HSLColor .fromAHSL (0.85 , 0 , 0 , 1 ).toColor (),
6157 streamMessageBgDefault: const HSLColor .fromAHSL (1 , 0 , 0 , 0.15 ).toColor (),
6258 streamRecipientHeaderChevronRight: Colors .white.withValues (alpha: 0.3 ),
6359
@@ -78,9 +74,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
7874 required this .dateSeparator,
7975 required this .dmRecipientHeaderBg,
8076 required this .labelTime,
81- required this .recipientHeaderText,
8277 required this .senderBotIcon,
83- required this .senderName,
8478 required this .streamMessageBgDefault,
8579 required this .streamRecipientHeaderChevronRight,
8680 required this .unreadMarker,
@@ -101,9 +95,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
10195 final Color dateSeparator;
10296 final Color dmRecipientHeaderBg;
10397 final Color labelTime;
104- final Color recipientHeaderText;
10598 final Color senderBotIcon;
106- final Color senderName;
10799 final Color streamMessageBgDefault;
108100 final Color streamRecipientHeaderChevronRight;
109101 final Color unreadMarker;
@@ -115,9 +107,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
115107 Color ? dateSeparator,
116108 Color ? dmRecipientHeaderBg,
117109 Color ? labelTime,
118- Color ? recipientHeaderText,
119110 Color ? senderBotIcon,
120- Color ? senderName,
121111 Color ? streamMessageBgDefault,
122112 Color ? streamRecipientHeaderChevronRight,
123113 Color ? unreadMarker,
@@ -128,9 +118,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
128118 dateSeparator: dateSeparator ?? this .dateSeparator,
129119 dmRecipientHeaderBg: dmRecipientHeaderBg ?? this .dmRecipientHeaderBg,
130120 labelTime: labelTime ?? this .labelTime,
131- recipientHeaderText: recipientHeaderText ?? this .recipientHeaderText,
132121 senderBotIcon: senderBotIcon ?? this .senderBotIcon,
133- senderName: senderName ?? this .senderName,
134122 streamMessageBgDefault: streamMessageBgDefault ?? this .streamMessageBgDefault,
135123 streamRecipientHeaderChevronRight: streamRecipientHeaderChevronRight ?? this .streamRecipientHeaderChevronRight,
136124 unreadMarker: unreadMarker ?? this .unreadMarker,
@@ -148,9 +136,7 @@ class MessageListTheme extends ThemeExtension<MessageListTheme> {
148136 dateSeparator: Color .lerp (dateSeparator, other.dateSeparator, t)! ,
149137 dmRecipientHeaderBg: Color .lerp (streamMessageBgDefault, other.dmRecipientHeaderBg, t)! ,
150138 labelTime: Color .lerp (labelTime, other.labelTime, t)! ,
151- recipientHeaderText: Color .lerp (recipientHeaderText, other.recipientHeaderText, t)! ,
152139 senderBotIcon: Color .lerp (senderBotIcon, other.senderBotIcon, t)! ,
153- senderName: Color .lerp (senderName, other.senderName, t)! ,
154140 streamMessageBgDefault: Color .lerp (streamMessageBgDefault, other.streamMessageBgDefault, t)! ,
155141 streamRecipientHeaderChevronRight: Color .lerp (streamRecipientHeaderChevronRight, other.streamRecipientHeaderChevronRight, t)! ,
156142 unreadMarker: Color .lerp (unreadMarker, other.unreadMarker, t)! ,
@@ -1037,7 +1023,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
10371023 iconColor = swatch.iconOnBarBackground;
10381024 } else {
10391025 backgroundColor = messageListTheme.unsubscribedStreamRecipientHeaderBg;
1040- iconColor = messageListTheme.recipientHeaderText ;
1026+ iconColor = designVariables.title ;
10411027 }
10421028
10431029 final Widget streamWidget;
@@ -1142,6 +1128,7 @@ class DmRecipientHeader extends StatelessWidget {
11421128 }
11431129
11441130 final messageListTheme = MessageListTheme .of (context);
1131+ final designVariables = DesignVariables .of (context);
11451132
11461133 return GestureDetector (
11471134 onTap: () => Navigator .push (context,
@@ -1157,7 +1144,7 @@ class DmRecipientHeader extends StatelessWidget {
11571144 Padding (
11581145 padding: const EdgeInsets .symmetric (horizontal: 6 ),
11591146 child: Icon (
1160- color: messageListTheme.recipientHeaderText ,
1147+ color: designVariables.title ,
11611148 size: 16 ,
11621149 ZulipIcons .user)),
11631150 Expanded (
@@ -1171,7 +1158,7 @@ class DmRecipientHeader extends StatelessWidget {
11711158
11721159TextStyle recipientHeaderTextStyle (BuildContext context) {
11731160 return TextStyle (
1174- color: MessageListTheme .of (context).recipientHeaderText ,
1161+ color: DesignVariables .of (context).title ,
11751162 fontSize: 16 ,
11761163 letterSpacing: proportionalLetterSpacing (context, 0.02 , baseFontSize: 16 ),
11771164 height: (18 / 16 ),
@@ -1307,7 +1294,7 @@ class MessageWithPossibleSender extends StatelessWidget {
13071294 style: TextStyle (
13081295 fontSize: 18 ,
13091296 height: (22 / 18 ),
1310- color: messageListTheme.senderName ,
1297+ color: designVariables.title ,
13111298 ).merge (weightVariableTextStyle (context, wght: 600 )),
13121299 overflow: TextOverflow .ellipsis)),
13131300 if (sender? .isBot ?? false ) ...[
0 commit comments