Skip to content

Commit 93e8919

Browse files
committed
(squash) Use our TextWithLink instead of package:styled_text
1 parent c33ee61 commit 93e8919

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

lib/widgets/read_receipts.dart

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:collection/collection.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:styled_text/styled_text.dart';
43

54
import '../api/route/messages.dart';
65
import '../generated/l10n/zulip_localizations.dart';
@@ -129,25 +128,12 @@ class _ReadReceiptsHeader extends StatelessWidget {
129128
color: designVariables.title,
130129
).merge(weightVariableTextStyle(context, wght: 600))),
131130
if (status == FetchStatus.success && receiptCount > 0)
132-
StyledText(
133-
text: zulipLocalizations.actionSheetReadReceiptsReadCount(receiptCount),
134-
tags: {
135-
'z-link': StyledTextActionTag((_, _) {
136-
PlatformActions.launchUrl(context, Uri.parse(ReadReceipts._helpCenterUrl));
137-
},
138-
style: TextStyle(
139-
decoration: TextDecoration.underline,
140-
decorationStyle: TextDecorationStyle.solid,
141-
// We use the default value for this, as there's no obvious
142-
// way to map the thickness value from Figma design as it is
143-
// a percentage of the font size.
144-
decorationThickness: 1,
145-
// decorationOffset: // TODO(upstream #30541)
146-
color: designVariables.link,
147-
decorationColor: designVariables.link),
148-
)},
131+
TextWithLink(
132+
onTap: () => PlatformActions.launchUrl(context,
133+
Uri.parse(ReadReceipts._helpCenterUrl)),
149134
style: TextStyle(fontSize: 17, height: 22 / 17,
150-
color: designVariables.textMessage)),
135+
color: designVariables.textMessage),
136+
markup: zulipLocalizations.actionSheetReadReceiptsReadCount(receiptCount)),
151137
]));
152138
}
153139
}

lib/widgets/text.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,12 @@ class _TextWithLinkState extends State<TextWithLink> {
508508
TextSpan(text: match.group(2), recognizer: _recognizer,
509509
style: TextStyle(
510510
decoration: TextDecoration.underline,
511+
decorationStyle: TextDecorationStyle.solid,
512+
// We use the default value for this, as there's no obvious
513+
// way to map the thickness value from Figma design as it is
514+
// a percentage of the font size.
515+
decorationThickness: 1,
516+
// decorationOffset: // TODO(upstream): https://github.com/flutter/flutter/issues/30541
511517
color: designVariables.link,
512518
decorationColor: designVariables.link)),
513519
TextSpan(text: match.group(3)),

0 commit comments

Comments
 (0)