Skip to content

Commit 013cc28

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 bc735b7 commit 013cc28

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:
6668
const HSLColor.fromAHSL(0.03, 0, 0, 1).toColor(),
@@ -86,6 +88,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
8688
required this.colorCodeBlockBackground,
8789
required this.colorDirectMentionBackground,
8890
required this.colorGlobalTimeBackground,
91+
required this.colorGlobalTimeBorder,
8992
required this.colorMathBlockBorder,
9093
required this.colorMessageMediaContainerBackground,
9194
required this.colorThematicBreak,
@@ -110,6 +113,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
110113
final Color colorCodeBlockBackground;
111114
final Color colorDirectMentionBackground;
112115
final Color colorGlobalTimeBackground;
116+
final Color colorGlobalTimeBorder;
113117
final Color colorMathBlockBorder; // TODO(#46) this won't be needed
114118
final Color colorMessageMediaContainerBackground;
115119
final Color colorThematicBreak;
@@ -160,6 +164,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
160164
Color? colorCodeBlockBackground,
161165
Color? colorDirectMentionBackground,
162166
Color? colorGlobalTimeBackground,
167+
Color? colorGlobalTimeBorder,
163168
Color? colorMathBlockBorder,
164169
Color? colorMessageMediaContainerBackground,
165170
Color? colorThematicBreak,
@@ -174,6 +179,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
174179
colorCodeBlockBackground: colorCodeBlockBackground ?? this.colorCodeBlockBackground,
175180
colorDirectMentionBackground: colorDirectMentionBackground ?? this.colorDirectMentionBackground,
176181
colorGlobalTimeBackground: colorGlobalTimeBackground ?? this.colorGlobalTimeBackground,
182+
colorGlobalTimeBorder: colorGlobalTimeBorder ?? this.colorGlobalTimeBorder,
177183
colorMathBlockBorder: colorMathBlockBorder ?? this.colorMathBlockBorder,
178184
colorMessageMediaContainerBackground: colorMessageMediaContainerBackground ?? this.colorMessageMediaContainerBackground,
179185
colorThematicBreak: colorThematicBreak ?? this.colorThematicBreak,
@@ -195,6 +201,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
195201
colorCodeBlockBackground: Color.lerp(colorCodeBlockBackground, other.colorCodeBlockBackground, t)!,
196202
colorDirectMentionBackground: Color.lerp(colorDirectMentionBackground, other.colorDirectMentionBackground, t)!,
197203
colorGlobalTimeBackground: Color.lerp(colorGlobalTimeBackground, other.colorGlobalTimeBackground, t)!,
204+
colorGlobalTimeBorder: Color.lerp(colorGlobalTimeBorder, other.colorGlobalTimeBorder, t)!,
198205
colorMathBlockBorder: Color.lerp(colorMathBlockBorder, other.colorMathBlockBorder, t)!,
199206
colorMessageMediaContainerBackground: Color.lerp(colorMessageMediaContainerBackground, other.colorMessageMediaContainerBackground, t)!,
200207
colorThematicBreak: Color.lerp(colorThematicBreak, other.colorThematicBreak, t)!,
@@ -1126,7 +1133,6 @@ class GlobalTime extends StatelessWidget {
11261133
final GlobalTimeNode node;
11271134
final TextStyle ambientTextStyle;
11281135

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

11321138
@override
@@ -1140,7 +1146,7 @@ class GlobalTime extends StatelessWidget {
11401146
child: DecoratedBox(
11411147
decoration: BoxDecoration(
11421148
color: contentTheme.colorGlobalTimeBackground,
1143-
border: Border.all(width: 1, color: _borderColor),
1149+
border: Border.all(width: 1, color: contentTheme.colorGlobalTimeBorder),
11441150
borderRadius: BorderRadius.circular(3)),
11451151
child: Padding(
11461152
padding: const EdgeInsets.symmetric(horizontal: 0.2 * kBaseFontSize),

0 commit comments

Comments
 (0)