@@ -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)! ,
@@ -1060,7 +1046,7 @@ class StreamMessageRecipientHeader extends StatelessWidget {
10601046      iconColor =  swatch.iconOnBarBackground;
10611047    } else  {
10621048      backgroundColor =  messageListTheme.unsubscribedStreamRecipientHeaderBg;
1063-       iconColor =  messageListTheme.recipientHeaderText ;
1049+       iconColor =  designVariables.title ;
10641050    }
10651051
10661052    final  Widget  streamWidget;
@@ -1176,6 +1162,7 @@ class DmRecipientHeader extends StatelessWidget {
11761162    }
11771163
11781164    final  messageListTheme =  MessageListTheme .of (context);
1165+     final  designVariables =  DesignVariables .of (context);
11791166
11801167    return  GestureDetector (
11811168      // When already in a DM narrow, disable tap interaction that would just 
@@ -1196,7 +1183,7 @@ class DmRecipientHeader extends StatelessWidget {
11961183              Padding (
11971184                padding:  const  EdgeInsets .symmetric (horizontal:  6 ),
11981185                child:  Icon (
1199-                   color:  messageListTheme.recipientHeaderText ,
1186+                   color:  designVariables.title ,
12001187                  size:  16 ,
12011188                  ZulipIcons .user)),
12021189              Expanded (
@@ -1210,7 +1197,7 @@ class DmRecipientHeader extends StatelessWidget {
12101197
12111198TextStyle  recipientHeaderTextStyle (BuildContext  context) {
12121199  return  TextStyle (
1213-     color:  MessageListTheme .of (context).recipientHeaderText ,
1200+     color:  DesignVariables .of (context).title ,
12141201    fontSize:  16 ,
12151202    letterSpacing:  proportionalLetterSpacing (context, 0.02 , baseFontSize:  16 ),
12161203    height:  (18  /  16 ),
@@ -1346,7 +1333,7 @@ class MessageWithPossibleSender extends StatelessWidget {
13461333                      style:  TextStyle (
13471334                        fontSize:  18 ,
13481335                        height:  (22  /  18 ),
1349-                         color:  messageListTheme.senderName ,
1336+                         color:  designVariables.title ,
13501337                      ).merge (weightVariableTextStyle (context, wght:  600 )),
13511338                      overflow:  TextOverflow .ellipsis)),
13521339                  if  (sender? .isBot ??  false ) ...[
0 commit comments