Skip to content

Commit fb01562

Browse files
committed
content [nfc]: Add ContentTheme.colorGlobalTimeBorder
The dark and light values come from the web app. This completes the sweep through message-content colors for #95 dark theme. They are all either in ContentTheme with light/dark variants, or still inline but with a comment explaining that they don't need light/dark variants.
1 parent d5afb4a commit fb01562

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

lib/widgets/content.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
3737
colorCodeBlockBackground: const HSLColor.fromAHSL(0.04, 0, 0, 0).toColor(),
3838
colorDirectMentionBackground: const HSLColor.fromAHSL(0.2, 240, 0.7, 0.7).toColor(),
3939
colorGlobalTimeBackground: const HSLColor.fromAHSL(1, 0, 0, 0.93).toColor(),
40+
colorGlobalTimeBorder: const HSLColor.fromAHSL(1, 0, 0, 0.8).toColor(),
4041
colorMathBlockBorder: const HSLColor.fromAHSL(0.15, 240, 0.8, 0.5).toColor(),
4142
colorMessageMediaContainerBackground: const Color.fromRGBO(0, 0, 0, 0.03),
4243
colorThematicBreak: const HSLColor.fromAHSL(1, 0, 0, .87).toColor(),
@@ -61,6 +62,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
6162
colorCodeBlockBackground: const HSLColor.fromAHSL(0.04, 0, 0, 1).toColor(),
6263
colorDirectMentionBackground: const HSLColor.fromAHSL(0.25, 240, 0.52, 0.6).toColor(),
6364
colorGlobalTimeBackground: const HSLColor.fromAHSL(0.2, 0, 0, 0).toColor(),
65+
colorGlobalTimeBorder: const HSLColor.fromAHSL(0.4, 0, 0, 0).toColor(),
6466
colorMathBlockBorder: const HSLColor.fromAHSL(1, 240, 0.4, 0.4).toColor(),
6567
colorMessageMediaContainerBackground: const HSLColor.fromAHSL(0.03, 0, 0, 1).toColor(),
6668
colorThematicBreak: const HSLColor.fromAHSL(1, 0, 0, .87).toColor().withOpacity(0.2),
@@ -84,6 +86,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
8486
required this.colorCodeBlockBackground,
8587
required this.colorDirectMentionBackground,
8688
required this.colorGlobalTimeBackground,
89+
required this.colorGlobalTimeBorder,
8790
required this.colorMathBlockBorder,
8891
required this.colorMessageMediaContainerBackground,
8992
required this.colorThematicBreak,
@@ -108,6 +111,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
108111
final Color colorCodeBlockBackground;
109112
final Color colorDirectMentionBackground;
110113
final Color colorGlobalTimeBackground;
114+
final Color colorGlobalTimeBorder;
111115
final Color colorMathBlockBorder; // TODO(#46) this won't be needed
112116
final Color colorMessageMediaContainerBackground;
113117
final Color colorThematicBreak;
@@ -158,6 +162,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
158162
Color? colorCodeBlockBackground,
159163
Color? colorDirectMentionBackground,
160164
Color? colorGlobalTimeBackground,
165+
Color? colorGlobalTimeBorder,
161166
Color? colorMathBlockBorder,
162167
Color? colorMessageMediaContainerBackground,
163168
Color? colorThematicBreak,
@@ -172,6 +177,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
172177
colorCodeBlockBackground: colorCodeBlockBackground ?? this.colorCodeBlockBackground,
173178
colorDirectMentionBackground: colorDirectMentionBackground ?? this.colorDirectMentionBackground,
174179
colorGlobalTimeBackground: colorGlobalTimeBackground ?? this.colorGlobalTimeBackground,
180+
colorGlobalTimeBorder: colorGlobalTimeBorder ?? this.colorGlobalTimeBorder,
175181
colorMathBlockBorder: colorMathBlockBorder ?? this.colorMathBlockBorder,
176182
colorMessageMediaContainerBackground: colorMessageMediaContainerBackground ?? this.colorMessageMediaContainerBackground,
177183
colorThematicBreak: colorThematicBreak ?? this.colorThematicBreak,
@@ -193,6 +199,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
193199
colorCodeBlockBackground: Color.lerp(colorCodeBlockBackground, other.colorCodeBlockBackground, t)!,
194200
colorDirectMentionBackground: Color.lerp(colorDirectMentionBackground, other.colorDirectMentionBackground, t)!,
195201
colorGlobalTimeBackground: Color.lerp(colorGlobalTimeBackground, other.colorGlobalTimeBackground, t)!,
202+
colorGlobalTimeBorder: Color.lerp(colorGlobalTimeBorder, other.colorGlobalTimeBorder, t)!,
196203
colorMathBlockBorder: Color.lerp(colorMathBlockBorder, other.colorMathBlockBorder, t)!,
197204
colorMessageMediaContainerBackground: Color.lerp(colorMessageMediaContainerBackground, other.colorMessageMediaContainerBackground, t)!,
198205
colorThematicBreak: Color.lerp(colorThematicBreak, other.colorThematicBreak, t)!,
@@ -1124,7 +1131,6 @@ class GlobalTime extends StatelessWidget {
11241131
final GlobalTimeNode node;
11251132
final TextStyle ambientTextStyle;
11261133

1127-
static final _borderColor = const HSLColor.fromAHSL(1, 0, 0, 0.8).toColor();
11281134
static final _dateFormat = DateFormat('EEE, MMM d, y, h:mm a'); // TODO(intl): localize date
11291135

11301136
@override
@@ -1138,7 +1144,7 @@ class GlobalTime extends StatelessWidget {
11381144
child: DecoratedBox(
11391145
decoration: BoxDecoration(
11401146
color: contentTheme.colorGlobalTimeBackground,
1141-
border: Border.all(width: 1, color: _borderColor),
1147+
border: Border.all(width: 1, color: contentTheme.colorGlobalTimeBorder),
11421148
borderRadius: BorderRadius.circular(3)),
11431149
child: Padding(
11441150
padding: const EdgeInsets.symmetric(horizontal: 0.2 * kBaseFontSize),

0 commit comments

Comments
 (0)