Skip to content

Commit 3a70e61

Browse files
committed
subscription_list: Place dark-theme color for MutedUnreadBadge, from web
Thanks to Greg for the reminder that this needed attention: https://chat.zulip.org/#narrow/stream/48-mobile/topic/dark.20theme/near/1936853 This is pretty low-contrast in dark mode, but as with many of our UI elements, we'll adjust as necessary when we have a design from Vlad.
1 parent b08ebc8 commit 3a70e61

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

lib/widgets/theme.dart

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
126126
groupDmConversationIconBg: const Color(0x33808080),
127127
loginOrDivider: const Color(0xffdedede),
128128
loginOrDividerText: const Color(0xff575757),
129+
mutedUnreadBadge: const HSLColor.fromAHSL(0.5, 0, 0, 0.8).toColor(),
129130
sectionCollapseIcon: const Color(0x7f1e2e48),
130131
star: const HSLColor.fromAHSL(0.5, 47, 1, 0.41).toColor(),
131132
subscriptionListHeaderLine: const HSLColor.fromAHSL(0.2, 240, 0.1, 0.5).toColor(),
@@ -158,6 +159,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
158159
groupDmConversationIconBg: const Color(0x33cccccc),
159160
loginOrDivider: const Color(0xff424242),
160161
loginOrDividerText: const Color(0xffa8a8a8),
162+
mutedUnreadBadge: const HSLColor.fromAHSL(0.5, 0, 0, 0.3).toColor(),
161163
// TODO(design-dark) need proper dark-theme color (this is ad hoc)
162164
sectionCollapseIcon: const Color(0x7fb6c8e2),
163165
// TODO(design-dark) unchanged in dark theme?
@@ -190,6 +192,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
190192
required this.groupDmConversationIconBg,
191193
required this.loginOrDivider,
192194
required this.loginOrDividerText,
195+
required this.mutedUnreadBadge,
193196
required this.sectionCollapseIcon,
194197
required this.star,
195198
required this.subscriptionListHeaderLine,
@@ -231,6 +234,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
231234
final Color groupDmConversationIconBg;
232235
final Color loginOrDivider; // TODO(design-dark) need proper dark-theme color (this is ad hoc)
233236
final Color loginOrDividerText; // TODO(design-dark) need proper dark-theme color (this is ad hoc)
237+
final Color mutedUnreadBadge;
234238
final Color sectionCollapseIcon;
235239
final Color star;
236240
final Color subscriptionListHeaderLine;
@@ -259,6 +263,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
259263
Color? groupDmConversationIconBg,
260264
Color? loginOrDivider,
261265
Color? loginOrDividerText,
266+
Color? mutedUnreadBadge,
262267
Color? sectionCollapseIcon,
263268
Color? star,
264269
Color? subscriptionListHeaderLine,
@@ -286,6 +291,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
286291
groupDmConversationIconBg: groupDmConversationIconBg ?? this.groupDmConversationIconBg,
287292
loginOrDivider: loginOrDivider ?? this.loginOrDivider,
288293
loginOrDividerText: loginOrDividerText ?? this.loginOrDividerText,
294+
mutedUnreadBadge: mutedUnreadBadge ?? this.mutedUnreadBadge,
289295
sectionCollapseIcon: sectionCollapseIcon ?? this.sectionCollapseIcon,
290296
star: star ?? this.star,
291297
subscriptionListHeaderLine: subscriptionListHeaderLine ?? this.subscriptionListHeaderLine,
@@ -320,6 +326,7 @@ class DesignVariables extends ThemeExtension<DesignVariables> {
320326
groupDmConversationIconBg: Color.lerp(groupDmConversationIconBg, other.groupDmConversationIconBg, t)!,
321327
loginOrDivider: Color.lerp(loginOrDivider, other.loginOrDivider, t)!,
322328
loginOrDividerText: Color.lerp(loginOrDividerText, other.loginOrDividerText, t)!,
329+
mutedUnreadBadge: Color.lerp(mutedUnreadBadge, other.mutedUnreadBadge, t)!,
323330
sectionCollapseIcon: Color.lerp(sectionCollapseIcon, other.sectionCollapseIcon, t)!,
324331
star: Color.lerp(star, other.star, t)!,
325332
subscriptionListHeaderLine: Color.lerp(subscriptionListHeaderLine, other.subscriptionListHeaderLine, t)!,

lib/widgets/unread_count_badge.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ class MutedUnreadBadge extends StatelessWidget {
6363

6464
@override
6565
Widget build(BuildContext context) {
66+
final designVariables = DesignVariables.of(context);
6667
return Container(
6768
width: 8,
6869
height: 8,
6970
margin: const EdgeInsetsDirectional.only(end: 3),
7071
decoration: BoxDecoration(
71-
color: const HSLColor.fromAHSL(0.5, 0, 0, 0.8).toColor(),
72+
color: designVariables.mutedUnreadBadge,
7273
shape: BoxShape.circle));
7374
}
7475
}

0 commit comments

Comments
 (0)