Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

content: Handle link previews #1049

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/widgets/content.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
colorTableCellBorder: const HSLColor.fromAHSL(1, 0, 0, 0.80).toColor(),
colorTableHeaderBackground: const HSLColor.fromAHSL(1, 0, 0, 0.93).toColor(),
colorThematicBreak: const HSLColor.fromAHSL(1, 0, 0, .87).toColor(),
colorLink: const HSLColor.fromAHSL(1, 200, 1, 0.4).toColor(),
textStylePlainParagraph: _plainParagraphCommon(context).copyWith(
color: const HSLColor.fromAHSL(1, 0, 0, 0.15).toColor(),
debugLabel: 'ContentTheme.textStylePlainParagraph'),
Expand Down Expand Up @@ -84,6 +85,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
colorTableCellBorder: const HSLColor.fromAHSL(1, 0, 0, 0.33).toColor(),
colorTableHeaderBackground: const HSLColor.fromAHSL(0.5, 0, 0, 0).toColor(),
colorThematicBreak: const HSLColor.fromAHSL(1, 0, 0, .87).toColor().withValues(alpha: 0.2),
colorLink: const HSLColor.fromAHSL(1, 200, 1, 0.4).toColor(), // the same as light in Web
textStylePlainParagraph: _plainParagraphCommon(context).copyWith(
color: const HSLColor.fromAHSL(1, 0, 0, 0.85).toColor(),
debugLabel: 'ContentTheme.textStylePlainParagraph'),
Expand Down Expand Up @@ -116,6 +118,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
required this.colorTableCellBorder,
required this.colorTableHeaderBackground,
required this.colorThematicBreak,
required this.colorLink,
required this.textStylePlainParagraph,
required this.textStyleEmoji,
required this.codeBlockTextStyles,
Expand Down Expand Up @@ -148,6 +151,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
final Color colorTableCellBorder;
final Color colorTableHeaderBackground;
final Color colorThematicBreak;
final Color colorLink;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: keep in alphabetical order (here and elsewhere in class definition)


/// The complete [TextStyle] we use for plain, unstyled paragraphs.
///
Expand Down Expand Up @@ -208,6 +212,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
Color? colorTableCellBorder,
Color? colorTableHeaderBackground,
Color? colorThematicBreak,
Color? colorLink,
TextStyle? textStylePlainParagraph,
TextStyle? textStyleEmoji,
CodeBlockTextStyles? codeBlockTextStyles,
Expand All @@ -230,6 +235,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
colorTableCellBorder: colorTableCellBorder ?? this.colorTableCellBorder,
colorTableHeaderBackground: colorTableHeaderBackground ?? this.colorTableHeaderBackground,
colorThematicBreak: colorThematicBreak ?? this.colorThematicBreak,
colorLink: colorLink ?? this.colorLink,
textStylePlainParagraph: textStylePlainParagraph ?? this.textStylePlainParagraph,
textStyleEmoji: textStyleEmoji ?? this.textStyleEmoji,
codeBlockTextStyles: codeBlockTextStyles ?? this.codeBlockTextStyles,
Expand Down Expand Up @@ -259,6 +265,7 @@ class ContentTheme extends ThemeExtension<ContentTheme> {
colorTableCellBorder: Color.lerp(colorTableCellBorder, other.colorTableCellBorder, t)!,
colorTableHeaderBackground: Color.lerp(colorTableHeaderBackground, other.colorTableHeaderBackground, t)!,
colorThematicBreak: Color.lerp(colorThematicBreak, other.colorThematicBreak, t)!,
colorLink: Color.lerp(colorLink, other.colorLink, t)!,
textStylePlainParagraph: TextStyle.lerp(textStylePlainParagraph, other.textStylePlainParagraph, t)!,
textStyleEmoji: TextStyle.lerp(textStyleEmoji, other.textStyleEmoji, t)!,
codeBlockTextStyles: CodeBlockTextStyles.lerp(codeBlockTextStyles, other.codeBlockTextStyles, t),
Expand Down Expand Up @@ -1030,7 +1037,7 @@ class _InlineContentBuilder {
_pushRecognizer(recognizer);
final result = _buildNodes(node.nodes,
// Web has the same color in light and dark mode.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove this comment; it would be easy for it to become wrong if the light/dark variants start to be different. Also you've already left a comment with the same meaning on the dark variant.

style: TextStyle(color: const HSLColor.fromAHSL(1, 200, 1, 0.4).toColor()));
style: TextStyle(color: ContentTheme.of(_context!).colorLink));
_popRecognizer();
return result;

Expand Down