Skip to content

Commit 752648f

Browse files
1 parent c94e0e2 commit 752648f

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

lib/widgets/message_list.dart

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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(streamMessageBgDefault, 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)!,
@@ -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;
@@ -1152,6 +1138,7 @@ class DmRecipientHeader extends StatelessWidget {
11521138
}
11531139

11541140
final messageListTheme = MessageListTheme.of(context);
1141+
final designVariables = DesignVariables.of(context);
11551142

11561143
return GestureDetector(
11571144
// When already in a DM narrow, disable tap interaction that would just
@@ -1172,7 +1159,7 @@ class DmRecipientHeader extends StatelessWidget {
11721159
Padding(
11731160
padding: const EdgeInsets.symmetric(horizontal: 6),
11741161
child: Icon(
1175-
color: messageListTheme.recipientHeaderText,
1162+
color: designVariables.title,
11761163
size: 16,
11771164
ZulipIcons.user)),
11781165
Expanded(
@@ -1186,7 +1173,7 @@ class DmRecipientHeader extends StatelessWidget {
11861173

11871174
TextStyle recipientHeaderTextStyle(BuildContext context) {
11881175
return TextStyle(
1189-
color: MessageListTheme.of(context).recipientHeaderText,
1176+
color: DesignVariables.of(context).title,
11901177
fontSize: 16,
11911178
letterSpacing: proportionalLetterSpacing(context, 0.02, baseFontSize: 16),
11921179
height: (18 / 16),
@@ -1322,7 +1309,7 @@ class MessageWithPossibleSender extends StatelessWidget {
13221309
style: TextStyle(
13231310
fontSize: 18,
13241311
height: (22 / 18),
1325-
color: messageListTheme.senderName,
1312+
color: designVariables.title,
13261313
).merge(weightVariableTextStyle(context, wght: 600)),
13271314
overflow: TextOverflow.ellipsis)),
13281315
if (sender?.isBot ?? false) ...[

lib/widgets/theme.dart

Lines changed: 1 addition & 1 deletion
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)