Skip to content

Feat add nullable check on animation #167

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

Merged
koukibadr merged 2 commits into from
Jun 7, 2025
Merged

Feat add nullable check on animation #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b56def
feat: add nullable check on dialog animation
koukibadr Jun 7, 2025
fea6ff7
feat: add nullable check on dialog animation
koukibadr Jun 7, 2025
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
2 changes: 0 additions & 2 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ class ExampleApp extends StatelessWidget {
ElegantNotification(
width: 360,
position: Alignment.centerRight,
animation: AnimationType.fromRight,
stackedOptions: StackedOptions(
key: 'top',
type: StackedType.same,
Expand Down Expand Up @@ -220,7 +219,6 @@ class ExampleApp extends StatelessWidget {
ElegantNotification.info(
width: 360,
position: Alignment.bottomLeft,
animation: AnimationType.fromLeft,
title: const Text('Info'),
description: const Text(
'This account will be updated once you exit',
Expand Down
182 changes: 109 additions & 73 deletions lib/elegant_notification.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ElegantNotification extends StatefulWidget {
this.onCloseButtonPressed,
this.onProgressFinished,
this.position = Alignment.topRight,
this.animation = AnimationType.fromRight,
this.animation,
this.animationDuration = const Duration(milliseconds: 600),
this.iconSize = defaultIconSize,
this.action,
Expand Down Expand Up @@ -77,7 +77,7 @@ class ElegantNotification extends StatefulWidget {
this.iconSize = defaultIconSize,
this.icon,
this.position = Alignment.topRight,
this.animation = AnimationType.fromRight,
this.animation,
this.animationDuration = const Duration(milliseconds: 600),
this.showProgressIndicator = true,
this.action,
Expand Down Expand Up @@ -124,7 +124,7 @@ class ElegantNotification extends StatefulWidget {
this.icon,
this.iconSize = defaultIconSize,
this.position = Alignment.topRight,
this.animation = AnimationType.fromRight,
this.animation,
this.animationDuration = const Duration(milliseconds: 600),
this.showProgressIndicator = true,
this.action,
Expand Down Expand Up @@ -171,7 +171,7 @@ class ElegantNotification extends StatefulWidget {
this.icon,
this.iconSize = defaultIconSize,
this.position = Alignment.topRight,
this.animation = AnimationType.fromRight,
this.animation,
this.animationDuration = const Duration(milliseconds: 600),
this.showProgressIndicator = true,
this.action,
Expand Down Expand Up @@ -314,7 +314,7 @@ class ElegantNotification extends StatefulWidget {
/// }
/// ```
/// default value `fromLeft`
final AnimationType animation;
final AnimationType? animation;

/// The duration of the animation
/// Default value `Duration(milliseconds: 600)`
Expand Down Expand Up @@ -476,12 +476,13 @@ class ElegantNotification extends StatefulWidget {
}

/// Dismiss the notification
Future<void> dismiss() {
void dismiss() {
_closeTimer.cancel();
return _slideController.reverse().then((value) {
onDismiss?.call();
closeOverlay();
});
if (animation != null) {
_slideController.reverse();
}
onDismiss?.call();
closeOverlay();
}

int get stackOverlaysLength => overlayManager.overlays.keys
Expand All @@ -500,6 +501,23 @@ class ElegantNotification extends StatefulWidget {
OverlayEntry _overlayEntryBuilder() {
return OverlayEntry(
builder: (context) {
// if (animation == null) {
// return AnimatedScale(
// duration: const Duration(
// milliseconds: 300,
// ),
// scale: overlayHelper.getScale(
// stackedItemPosition,
// stackOverlaysLength,
// ),
// alignment: Alignment.bottomCenter,
// child: Material(
// color: Colors.transparent,
// child: SafeArea(child: this),
// ),
// );
// }

return AnimatedPositioned(
duration: const Duration(milliseconds: 300),
left: overlayHelper.alignmentToLeftPos() +
Expand Down Expand Up @@ -544,7 +562,9 @@ class ElegantNotificationState extends State<ElegantNotification>
if (widget.autoDismiss) {
widget._closeTimer = createClosingTimer();
}
_initializeAnimation();
if (widget.animation != null) {
_initializeAnimation();
}
animatedProgressBar = AnimatedProgressBar(
foregroundColor: widget.progressIndicatorColor,
duration: widget.toastDuration,
Expand All @@ -555,13 +575,18 @@ class ElegantNotificationState extends State<ElegantNotification>
Timer createClosingTimer({Duration? duration}) {
stopwatch.start();
return Timer(duration ?? widget.toastDuration, () {
widget._slideController.reverse();
widget._slideController.addListener(() {
if (widget._slideController.isDismissed) {
widget.onProgressFinished?.call();
widget.closeOverlay();
}
});
if (widget.animation != null) {
widget._slideController.reverse();
widget._slideController.addListener(() {
if (widget._slideController.isDismissed) {
widget.onProgressFinished?.call();
widget.closeOverlay();
}
});
} else {
widget.onProgressFinished?.call();
widget.closeOverlay();
}
});
}

Expand Down Expand Up @@ -653,7 +678,9 @@ class ElegantNotificationState extends State<ElegantNotification>
if (widget.autoDismiss) {
widget._closeTimer.cancel();
}
widget._slideController.reverse();
if (widget.animation != null) {
widget._slideController.reverse();
}
widget.onDismiss?.call();
widget.closeOverlay();
}
Expand All @@ -665,63 +692,70 @@ class ElegantNotificationState extends State<ElegantNotification>

@override
Widget build(BuildContext context) {
if (widget.animation == null) {
return renderElegantNotification();
}
return SlideTransition(
position: widget._offsetAnimation,
child: Dismissible(
key: widget.uniqueKey,
direction: widget.isDismissable
? widget.dismissDirection
: DismissDirection.none,
onDismissed: (direction) {
widget.onDismiss?.call();
widget.closeOverlay();
},
child: InkWell(
onTap: widget.onNotificationPressed,
onLongPress: onLongPressTriggered,
child: Container(
width: widget.width ?? MediaQuery.of(context).size.width * 0.7,
height: widget.height ?? MediaQuery.of(context).size.height * 0.12,
decoration: BoxDecoration(
borderRadius: widget.borderRadius ?? BorderRadius.circular(5.0),
border: widget.border,
color: widget.background,
boxShadow: [
widget.shadow ?? const BoxShadow(),
],
),
child: Column(
children: [
Expanded(
child: ToastContent(
title: widget.title,
description: widget.description,
notificationType: widget._notificationType,
icon: widget.icon,
displayCloseButton: widget.displayCloseButton,
closeButton: widget.closeButton,
onCloseButtonPressed: _closeNotification,
iconSize: widget.iconSize,
action: widget.action,
verticalDividerColor: widget.verticalDividerColor,
verticalDividerWidth: widget.verticalDividerWidth,
),
child: renderElegantNotification(),
);
}

Widget renderElegantNotification() {
return Dismissible(
key: widget.uniqueKey,
direction: widget.isDismissable
? widget.dismissDirection
: DismissDirection.none,
onDismissed: (direction) {
widget.onDismiss?.call();
widget.closeOverlay();
},
child: InkWell(
onTap: widget.onNotificationPressed,
onLongPress: onLongPressTriggered,
child: Container(
width: widget.width ?? MediaQuery.of(context).size.width * 0.7,
height: widget.height ?? MediaQuery.of(context).size.height * 0.12,
decoration: BoxDecoration(
borderRadius: widget.borderRadius ?? BorderRadius.circular(5.0),
border: widget.border,
color: widget.background,
boxShadow: [
widget.shadow ?? const BoxShadow(),
],
),
child: Column(
children: [
Expanded(
child: ToastContent(
title: widget.title,
description: widget.description,
notificationType: widget._notificationType,
icon: widget.icon,
displayCloseButton: widget.displayCloseButton,
closeButton: widget.closeButton,
onCloseButtonPressed: _closeNotification,
iconSize: widget.iconSize,
action: widget.action,
verticalDividerColor: widget.verticalDividerColor,
verticalDividerWidth: widget.verticalDividerWidth,
),
if (widget.showProgressIndicator)
Padding(
padding: widget.progressBarPadding ??
EdgeInsets.only(
left: widget.borderRadius?.bottomLeft.x ?? 0,
right: widget.borderRadius?.bottomRight.x ?? 0,
),
child: SizedBox(
width: widget.progressBarWidth,
height: widget.progressBarHeight,
child: animatedProgressBar,
),
),
if (widget.showProgressIndicator)
Padding(
padding: widget.progressBarPadding ??
EdgeInsets.only(
left: widget.borderRadius?.bottomLeft.x ?? 0,
right: widget.borderRadius?.bottomRight.x ?? 0,
),
child: SizedBox(
width: widget.progressBarWidth,
height: widget.progressBarHeight,
child: animatedProgressBar,
),
],
),
),
],
),
),
),
Expand All @@ -730,7 +764,9 @@ class ElegantNotificationState extends State<ElegantNotification>

@override
void dispose() {
widget._slideController.dispose();
if (widget.animation != null) {
widget._slideController.dispose();
}
if (widget.autoDismiss) {
widget._closeTimer.cancel();
}
Expand Down