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

Jump to bottom

Remove YaruBanner.thirdTitle #423

Merged
merged 1 commit into from
Nov 29, 2022
Merged

Remove YaruBanner.thirdTitle #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions example/lib/pages/banner_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ class BannerPage extends StatelessWidget {
for (int i = 0; i < 20; i++)
YaruBanner(
title: Text('YaruBanner $i'),
subtitle: const Text('Description'),
thirdTitle: i.isEven ? const Text('Third line') : null,
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text('Description'),
if (i.isEven) const Text('Third line'),
],
),
icon: Icon(
YaruIcons.weather_clear,
size: 80,
Expand Down
32 changes: 8 additions & 24 deletions lib/src/utilities/yaru_banner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class YaruBanner extends StatelessWidget {
required this.title,
required this.icon,
this.subtitle,
this.thirdTitle,
this.watermarkIcon,
this.iconPadding = const EdgeInsets.only(left: 10),
});
Expand Down Expand Up @@ -41,9 +40,6 @@ class YaruBanner extends StatelessWidget {
/// Optional [Widget] placed as the watermark
final Widget? watermarkIcon;

/// The [Widget] used as the third line.
final Widget? thirdTitle;

@override
Widget build(BuildContext context) {
final borderRadius = BorderRadius.circular(10);
Expand All @@ -67,7 +63,6 @@ class YaruBanner extends StatelessWidget {
iconPadding: iconPadding,
title: title,
subtitle: subtitle,
thirdTitle: thirdTitle,
borderRadius: borderRadius,
color: surfaceTintColor ?? defaultCardColor,
elevation: light ? 4 : 6,
Expand All @@ -92,7 +87,6 @@ class YaruBanner extends StatelessWidget {
iconPadding: iconPadding,
title: title,
subtitle: subtitle,
thirdTitle: thirdTitle,
borderRadius: borderRadius,
color: defaultCardColor,
elevation: light ? 2 : 1,
Expand All @@ -112,7 +106,6 @@ class _Banner extends StatelessWidget {
required this.borderRadius,
this.mouseCursor,
this.subtitle,
this.thirdTitle,
required this.iconPadding,
});

Expand All @@ -123,21 +116,10 @@ class _Banner extends StatelessWidget {
final BorderRadius borderRadius;
final MouseCursor? mouseCursor;
final Widget? subtitle;
final Widget? thirdTitle;
final EdgeInsets iconPadding;

@override
Widget build(BuildContext context) {
final sub = Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
if (subtitle != null) subtitle!,
if (thirdTitle != null) thirdTitle!,
],
);

return Card(
shadowColor: Colors.transparent,
surfaceTintColor: color,
Expand All @@ -151,12 +133,14 @@ class _Banner extends StatelessWidget {
constraints: const BoxConstraints.expand(),
child: YaruTile(
subTitlePadding: EdgeInsets.zero,
subtitle: DefaultTextStyle(
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Theme.of(context).textTheme.bodySmall!.color,
),
child: sub,
),
subtitle: subtitle != null
? DefaultTextStyle(
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Theme.of(context).textTheme.bodySmall!.color,
),
child: subtitle!,
)
: null,
title: DefaultTextStyle(
child: title,
style: Theme.of(context).textTheme.bodyLarge!.copyWith(
Expand Down