break change: "AlignmentGeometry" adjust to "Alignment"

fluttercandies · Dec 30, 2023 · 03778c4 · 03778c4
1 parent 107d70f
commit 03778c4
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * fix [#142](https://github.com/fluttercandies/flutter_smart_dialog/issues/142)
 * add checkExist
 * fix [#162](https://github.com/fluttercandies/flutter_smart_dialog/issues/162)
+* break change: "AlignmentGeometry" adjust to "Alignment"
 
 
 # [4.9.0]

diff --git a/docs/Attach Chapter.md b/docs/Attach Chapter.md
@@ -18,7 +18,7 @@ It is not difficult to locate the coordinates of the target widget; but it is ne
 
 ````dart
 void _attachLocation() {
-  attachDialog(BuildContext context, AlignmentGeometry alignment) async {
+  attachDialog(BuildContext context, Alignment alignment) async {
     SmartDialog.showAttach(
       targetContext: context,
       usePenetrate: true,

diff --git a/docs/Dialog Chapter.md b/docs/Dialog Chapter.md
@@ -11,7 +11,7 @@
 ````dart
 void _dialogLocation() async {
   locationDialog({
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     double width = double.infinity,
     double height = double.infinity,
   }) async {
@@ -63,7 +63,7 @@ SmartDialog.show(
 ````dart
 void _dialogStack() async {
   stackDialog({
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required String tag,
     double width = double.infinity,
     double height = double.infinity,

diff --git a/lib/src/compatible/compatible_smart_dialog.dart b/lib/src/compatible/compatible_smart_dialog.dart
@@ -94,7 +94,7 @@ class CompatibleSmartDialog {
   /// false（使用SmartDialog），此参数可彻底解决在弹窗上跳转页面问题
   Future<void> show({
     required Widget widget,
-    AlignmentGeometry? alignmentTemp,
+    Alignment? alignmentTemp,
     bool? clickBgDismissTemp,
     bool? isLoadingTemp,
     bool? isPenetrateTemp,
@@ -244,7 +244,7 @@ class CompatibleSmartDialog {
     required BuildContext? targetContext,
     required Widget widget,
     Offset? target,
-    AlignmentGeometry? alignmentTemp,
+    Alignment? alignmentTemp,
     bool? clickBgDismissTemp,
     bool? isLoadingTemp,
     bool? isPenetrateTemp,

diff --git a/lib/src/compatible/smart_config_compatible.dart b/lib/src/compatible/smart_config_compatible.dart
@@ -31,7 +31,7 @@ class SmartConfigCompatible {
   /// centerLeft：dialog位于屏幕左边，动画默认为位移动画，自左而右，
   ///
   /// centerRight：dialog位于屏幕左边，动画默认为位移动画，自右而左，
-  AlignmentGeometry alignment = Alignment.center;
+  Alignment alignment = Alignment.center;
 
   /// the animation duration can be adjusted by the [animationDuration] param；
   /// default（true），true（use the opacity animation），false（use the scale transition animation）

diff --git a/lib/src/config/smart_config_custom.dart b/lib/src/config/smart_config_custom.dart
@@ -52,7 +52,7 @@ class SmartConfigCustom {
   /// centerLeft：dialog位于屏幕左边，动画默认为位移动画，自左而右
   ///
   /// centerRight：dialog位于屏幕左边，动画默认为位移动画，自右而左
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   /// [animationTime]：The animation time can be set
   ///

diff --git a/lib/src/config/smart_config_loading.dart b/lib/src/config/smart_config_loading.dart
@@ -51,7 +51,7 @@ class SmartConfigLoading {
   /// centerLeft：dialog位于屏幕左边，动画默认为位移动画，自左而右
   ///
   /// centerRight：dialog位于屏幕左边，动画默认为位移动画，自右而左
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   /// [animationTime]：The animation time can be set
   ///

diff --git a/lib/src/config/smart_config_notify.dart b/lib/src/config/smart_config_notify.dart
@@ -50,7 +50,7 @@ class SmartConfigNotify {
   /// centerLeft：dialog位于屏幕左边，动画默认为位移动画，自左而右
   ///
   /// centerRight：dialog位于屏幕左边，动画默认为位移动画，自右而左
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   /// [animationTime]：The animation time can be set
   ///

diff --git a/lib/src/config/smart_config_toast.dart b/lib/src/config/smart_config_toast.dart
@@ -52,7 +52,7 @@ class SmartConfigToast {
   /// centerLeft：dialog位于屏幕左边，动画默认为位移动画，自左而右
   ///
   /// centerRight：dialog位于屏幕左边，动画默认为位移动画，自右而左
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   /// [animationTime]：The animation time can be set
   ///

diff --git a/lib/src/custom/custom_dialog.dart b/lib/src/custom/custom_dialog.dart
@@ -24,7 +24,7 @@ class CustomDialog extends BaseDialog {
 
   Future<T?> show<T>({
     required Widget widget,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,
@@ -98,7 +98,7 @@ class CustomDialog extends BaseDialog {
     required Widget widget,
     required TargetBuilder? targetBuilder,
     required ReplaceBuilder? replaceBuilder,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,

diff --git a/lib/src/custom/custom_loading.dart b/lib/src/custom/custom_loading.dart
@@ -20,7 +20,7 @@ class CustomLoading extends BaseDialog {
 
   Future<T?> showLoading<T>({
     required Widget widget,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool clickMaskDismiss,
     required SmartAnimationType animationType,
     required List<SmartNonAnimationType> nonAnimationTypes,

diff --git a/lib/src/custom/custom_notify.dart b/lib/src/custom/custom_notify.dart
@@ -20,7 +20,7 @@ class CustomNotify extends BaseDialog {
 
   Future<T?> showNotify<T>({
     required Widget widget,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,

diff --git a/lib/src/custom/main_dialog.dart b/lib/src/custom/main_dialog.dart
@@ -29,7 +29,7 @@ class MainDialog {
 
   Future<T?> show<T>({
     required Widget widget,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,
@@ -86,7 +86,7 @@ class MainDialog {
     required Widget widget,
     required TargetBuilder? targetBuilder,
     required ReplaceBuilder? replaceBuilder,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,

diff --git a/lib/src/custom/toast/custom_toast.dart b/lib/src/custom/toast/custom_toast.dart
@@ -20,7 +20,7 @@ class CustomToast extends BaseDialog {
   CustomToast({required SmartOverlayEntry overlayEntry}) : super(overlayEntry);
 
   Future<void> showToast({
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool clickMaskDismiss,
     required SmartAnimationType animationType,
     required List<SmartNonAnimationType> nonAnimationTypes,

diff --git a/lib/src/data/animation_param.dart b/lib/src/data/animation_param.dart
@@ -110,7 +110,7 @@ class AnimationParam {
   });
 
   /// showXxx#alignment
-  AlignmentGeometry alignment;
+  Alignment alignment;
 
   /// showXxx#animationTime
   Duration animationTime;

diff --git a/lib/src/helper/dialog_proxy.dart b/lib/src/helper/dialog_proxy.dart
@@ -88,7 +88,7 @@ class DialogProxy {
 
   Future<T?> show<T>({
     required Widget widget,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,
@@ -145,7 +145,7 @@ class DialogProxy {
 
   Future<T?> showNotify<T>({
     required Widget widget,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,
@@ -195,7 +195,7 @@ class DialogProxy {
     required Widget widget,
     required TargetBuilder? targetBuilder,
     required ReplaceBuilder? replaceBuilder,
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool usePenetrate,
     required bool useAnimation,
     required Duration animationTime,
@@ -258,7 +258,7 @@ class DialogProxy {
   }
 
   Future<T?> showLoading<T>({
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool clickMaskDismiss,
     required SmartAnimationType animationType,
     required List<SmartNonAnimationType> nonAnimationTypes,
@@ -294,7 +294,7 @@ class DialogProxy {
   }
 
   Future<void> showToast({
-    required AlignmentGeometry alignment,
+    required Alignment alignment,
     required bool clickMaskDismiss,
     required SmartAnimationType animationType,
     required List<SmartNonAnimationType> nonAnimationTypes,

diff --git a/lib/src/smart_dialog.dart b/lib/src/smart_dialog.dart
@@ -153,7 +153,7 @@ class SmartDialog {
   static Future<T?> show<T>({
     required WidgetBuilder builder,
     SmartDialogController? controller,
-    AlignmentGeometry? alignment,
+    Alignment? alignment,
     bool? clickMaskDismiss,
     bool? usePenetrate,
     bool? useAnimation,
@@ -383,7 +383,7 @@ class SmartDialog {
     ReplaceBuilder? replaceBuilder,
     SmartDialogController? controller,
     TargetBuilder? targetBuilder,
-    AlignmentGeometry? alignment,
+    Alignment? alignment,
     bool? clickMaskDismiss,
     SmartAnimationType? animationType,
     List<SmartNonAnimationType>? nonAnimationTypes,
@@ -554,7 +554,7 @@ class SmartDialog {
     required NotifyType notifyType,
     WidgetBuilder? builder,
     SmartDialogController? controller,
-    AlignmentGeometry? alignment,
+    Alignment? alignment,
     bool? clickMaskDismiss,
     bool? usePenetrate,
     bool? useAnimation,
@@ -698,7 +698,7 @@ class SmartDialog {
   static Future<T?> showLoading<T>({
     String msg = 'loading...',
     SmartDialogController? controller,
-    AlignmentGeometry? alignment,
+    Alignment? alignment,
     bool? clickMaskDismiss,
     SmartAnimationType? animationType,
     List<SmartNonAnimationType>? nonAnimationTypes,
@@ -829,7 +829,7 @@ class SmartDialog {
     String msg, {
     SmartDialogController? controller,
     Duration? displayTime,
-    AlignmentGeometry? alignment,
+    Alignment? alignment,
     bool? clickMaskDismiss,
     SmartAnimationType? animationType,
     List<SmartNonAnimationType>? nonAnimationTypes,

diff --git a/lib/src/widget/animation/size_animation.dart b/lib/src/widget/animation/size_animation.dart
@@ -10,7 +10,7 @@ class SizeAnimation extends StatelessWidget {
 
   final AnimationController controller;
 
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   final Widget child;
 

diff --git a/lib/src/widget/animation/slide_animation.dart b/lib/src/widget/animation/slide_animation.dart
@@ -8,7 +8,7 @@ class SlideAnimation extends StatefulWidget {
     required this.child,
   }) : super(key: key);
 
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   final Widget child;
 
@@ -44,7 +44,7 @@ class _SlideAnimationState extends State<SlideAnimation>
 
   ///处理下内容widget动画方向
   void _dealContentAnimate() {
-    AlignmentGeometry? alignment = widget.alignment;
+    Alignment? alignment = widget.alignment;
     var offset = const Offset(0, 0);
 
     if (alignment == Alignment.bottomCenter ||

diff --git a/lib/src/widget/attach_dialog_widget.dart b/lib/src/widget/attach_dialog_widget.dart
@@ -80,7 +80,7 @@ class AttachDialogWidget extends StatefulWidget {
   final VoidCallback onMask;
 
   /// 内容控件方向
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   /// 是否穿透背景,交互背景之后控件
   final bool usePenetrate;

diff --git a/lib/src/widget/helper/attach_widget.dart b/lib/src/widget/helper/attach_widget.dart
@@ -39,7 +39,7 @@ class AttachWidget extends StatefulWidget {
 
   final BeforeBuilder? beforeBuilder;
 
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   final Widget originChild;
 
@@ -215,7 +215,7 @@ class _AttachWidgetState extends State<AttachWidget> {
   }
 
   /// 计算attach alignment类型的偏移量
-  double _calculateDx(AlignmentGeometry alignment, Size selfSize) {
+  double _calculateDx(Alignment alignment, Size selfSize) {
     double offset = 0;
     var type = SmartDialog.config.attach.attachAlignmentType;
 

diff --git a/lib/src/widget/smart_dialog_widget.dart b/lib/src/widget/smart_dialog_widget.dart
@@ -42,7 +42,7 @@ class SmartDialogWidget extends StatefulWidget {
   final VoidCallback onMask;
 
   /// 内容控件方向
-  final AlignmentGeometry alignment;
+  final Alignment alignment;
 
   /// 是否穿透背景,交互背景之后控件
   final bool usePenetrate;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description:
   An elegant Flutter Dialog solution,
   Easily implement Toast, Loading and custom Dialog,
   Make the use of the dialog easier!
-version: 4.9.5+2
+version: 4.9.6
 homepage: https://github.com/fluttercandies/flutter_smart_dialog
 # flutter pub publish --server=https://pub.dartlang.org