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.

Sign up for GitHub

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

fix: Use YaruInfoBox for notification boxes #1010

Merged
merged 2 commits into from
Dec 11, 2024
Merged

fix: Use YaruInfoBox for notification boxes #1010

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b70adf
Use YaruInfoBox for notification boxes
ashuntu Dec 10, 2024
2d03b1d
Make links the same color as surrounding text
ashuntu Dec 10, 2024
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
54 changes: 10 additions & 44 deletions gui/packages/ubuntupro/lib/pages/subscription_status/subscription_status_widgets.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,62 +30,28 @@
textTheme: theme.textTheme.copyWith(
bodyMedium: theme.textTheme.bodyMedium?.copyWith(
fontWeight: FontWeight.w100,
color: YaruColors.jet,
),
),
),
).copyWith(
a: const TextStyle(
a: TextStyle(
decoration: TextDecoration.underline,
color: YaruColors.jet,
color: theme.colorScheme.onSurface,
CarlosNihelton marked this conversation as resolved.
Show resolved Hide resolved
),
);

return LandingPage(
centered: true,
children: [
Container(
padding: const EdgeInsets.all(16.0),
decoration: BoxDecoration(
border:
Border.all(color: YaruColors.of(context).success, width: 1.0),
color: YaruColors.of(context)
.success
.copyWith(lightness: 0.94, saturation: 0.56),
borderRadius: const BorderRadius.all(Radius.circular(4.0)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(
Icons.check_circle_outline_outlined,
color: YaruColors.of(context).success,
size: 24.0,
),
const SizedBox(width: 8.0),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
lang.subscriptionIsActive,
style: theme.textTheme.bodyLarge!.copyWith(
fontWeight: FontWeight.bold,
color: YaruColors.darkJet,
),
),
const SizedBox(height: 4.0),
MarkdownBody(
data: caption,
onTapLink: (_, href, __) => launchUrlString(href!),
styleSheet: linkStyle,
),
],
),
),
],
const SizedBox(height: 16.0),
YaruInfoBox(
title: Text(lang.subscriptionIsActive),
subtitle: MarkdownBody(
data: caption,
onTapLink: (_, href, __) => launchUrlString(href!),

Check warning on line 51 in gui/packages/ubuntupro/lib/pages/subscription_status/subscription_status_widgets.dart

View check run for this annotation

Codecov / codecov/patch

gui/packages/ubuntupro/lib/pages/subscription_status/subscription_status_widgets.dart#L51 

Added line #L51 was not covered by tests
styleSheet: linkStyle,
),
yaruInfoType: YaruInfoType.success,
),
if (actionButtons != null)
Center(
Expand Down
Loading