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

feat: [DX-1901] Add onPressed to Alert and Banners #634

Merged
merged 1 commit into from
Jun 27, 2024
Merged

feat: [DX-1901] Add onPressed to Alert and Banners #634

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 35 additions & 28 deletions optimus/lib/src/feedback/alert.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class OptimusAlert extends StatelessWidget {
this.icon,
this.link,
this.onDismissed,
this.onPressed,
this.variant = OptimusFeedbackVariant.info,
});

Expand All @@ -38,6 +39,9 @@ class OptimusAlert extends StatelessWidget {
/// icon.
final OptimusFeedbackVariant variant;

/// An optional callback to be called when the alert is pressed.
final VoidCallback? onPressed;

bool get _isExpanded => description != null || link != null;

double _getPadding(BuildContext context) =>
Expand All @@ -58,35 +62,38 @@ class OptimusAlert extends StatelessWidget {

return Padding(
padding: EdgeInsets.all(padding),
child: ConstrainedBox(
constraints: BoxConstraints(maxWidth: alertWidth),
child: Stack(
children: [
_AlertContent(
icon: icon,
variant: variant,
title: title,
description: description,
linkText: link?.text,
onLinkPressed: () {
link?.onPressed();
OptimusAlertOverlay.of(context)?.remove(this);
},
dismissible: onDismissed != null,
),
if (onDismissed != null)
Positioned(
top: _isExpanded ? tokens.spacing200 : tokens.spacing0,
right: tokens.spacing200,
bottom: _isExpanded ? null : tokens.spacing0,
child: FeedbackDismissButton(
onDismissed: () {
onDismissed?.call();
OptimusAlertOverlay.of(context)?.remove(this);
},
),
child: GestureDetector(
onTap: onPressed,
child: ConstrainedBox(
constraints: BoxConstraints(maxWidth: alertWidth),
child: Stack(
children: [
_AlertContent(
icon: icon,
variant: variant,
title: title,
description: description,
linkText: link?.text,
onLinkPressed: () {
link?.onPressed();
OptimusAlertOverlay.of(context)?.remove(this);
},
dismissible: onDismissed != null,
),
],
if (onDismissed != null)
Positioned(
top: _isExpanded ? tokens.spacing200 : tokens.spacing0,
right: tokens.spacing200,
bottom: _isExpanded ? null : tokens.spacing0,
child: FeedbackDismissButton(
onDismissed: () {
onDismissed?.call();
OptimusAlertOverlay.of(context)?.remove(this);
},
),
),
],
),
),
),
);
Expand Down
94 changes: 51 additions & 43 deletions optimus/lib/src/feedback/banner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class OptimusBanner extends StatelessWidget {
this.variant = OptimusFeedbackVariant.info,
this.hasIcon = false,
this.description,
this.onPressed,
this.isDismissible = false,
this.onDismiss,
});
Expand Down Expand Up @@ -53,59 +54,66 @@ class OptimusBanner extends StatelessWidget {
/// Called when close button is pressed (if [isDismissible] == true).
final VoidCallback? onDismiss;

/// An optional callback when the banner is pressed.
final VoidCallback? onPressed;

bool get _isExpanded => description != null;

@override
Widget build(BuildContext context) {
final tokens = context.tokens;

return DecoratedBox(
decoration: BoxDecoration(
color: variant.backgroundColor(tokens),
borderRadius: BorderRadius.all(tokens.borderRadius100),
),
child: Stack(
children: [
Padding(
padding: EdgeInsets.all(tokens.spacing200),
child: Row(
crossAxisAlignment: _isExpanded
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
if (hasIcon)
Padding(
padding: EdgeInsets.only(right: tokens.spacing200),
child: FeedbackIcon(variant: variant),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: isDismissible
? EdgeInsets.only(right: tokens.spacing200)
: EdgeInsets.zero,
child: FeedbackTitle(title: title),
),
if (description case final description?)
return GestureDetector(
onTap: onPressed,
child: DecoratedBox(
decoration: BoxDecoration(
color: variant.backgroundColor(tokens),
borderRadius: BorderRadius.all(tokens.borderRadius100),
),
child: Stack(
children: [
Padding(
padding: EdgeInsets.all(tokens.spacing200),
child: Row(
crossAxisAlignment: _isExpanded
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
if (hasIcon)
Padding(
padding: EdgeInsets.only(right: tokens.spacing200),
child: FeedbackIcon(variant: variant),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.only(top: tokens.spacing50),
child: FeedbackDescription(description: description),
padding: isDismissible
? EdgeInsets.only(right: tokens.spacing200)
: EdgeInsets.zero,
child: FeedbackTitle(title: title),
),
],
if (description case final description?)
Padding(
padding: EdgeInsets.only(top: tokens.spacing50),
child:
FeedbackDescription(description: description),
),
],
),
),
),
],
),
),
if (isDismissible)
Positioned(
top: tokens.spacing200,
right: tokens.spacing200,
child: FeedbackDismissButton(onDismissed: onDismiss),
],
),
),
],
if (isDismissible)
Positioned(
top: tokens.spacing200,
right: tokens.spacing200,
child: FeedbackDismissButton(onDismissed: onDismiss),
),
],
),
),
);
}
Expand Down
77 changes: 42 additions & 35 deletions optimus/lib/src/feedback/system_wide_banner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class OptimusSystemWideBanner extends StatelessWidget {
this.link,
this.description,
this.variant = OptimusFeedbackVariant.info,
this.onPressed,
});

/// Content of the banner.
Expand All @@ -42,50 +43,56 @@ class OptimusSystemWideBanner extends StatelessWidget {
/// Controls background color.
final OptimusFeedbackVariant variant;

/// An optional callback to be called when the banner is pressed.
final VoidCallback? onPressed;

bool get _isExpanded => description != null || link != null;

@override
Widget build(BuildContext context) {
final tokens = context.tokens;

return DecoratedBox(
decoration: BoxDecoration(color: variant.backgroundColor(tokens)),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: tokens.spacing100,
vertical: tokens.spacing200,
),
child: Row(
crossAxisAlignment: _isExpanded
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
FeedbackIcon(variant: variant),
Expanded(
child: Padding(
padding: EdgeInsets.only(left: tokens.spacing150),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
FeedbackTitle(title: title),
if (description case final description?)
Padding(
padding: EdgeInsets.only(top: tokens.spacing50),
child: FeedbackDescription(description: description),
),
if (link case final link?)
Padding(
padding: EdgeInsets.only(top: tokens.spacing50),
child: FeedbackLink(
text: link.text,
onPressed: link.onPressed,
return GestureDetector(
onTap: onPressed,
child: DecoratedBox(
decoration: BoxDecoration(color: variant.backgroundColor(tokens)),
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: tokens.spacing100,
vertical: tokens.spacing200,
),
child: Row(
crossAxisAlignment: _isExpanded
? CrossAxisAlignment.start
: CrossAxisAlignment.center,
children: [
FeedbackIcon(variant: variant),
Expanded(
child: Padding(
padding: EdgeInsets.only(left: tokens.spacing150),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
FeedbackTitle(title: title),
if (description case final description?)
Padding(
padding: EdgeInsets.only(top: tokens.spacing50),
child: FeedbackDescription(description: description),
),
if (link case final link?)
Padding(
padding: EdgeInsets.only(top: tokens.spacing50),
child: FeedbackLink(
text: link.text,
onPressed: link.onPressed,
),
),
),
],
],
),
),
),
),
],
],
),
),
),
);
Expand Down
Loading