add gravityAnimationEnable property[v1.0.3]

Author: xuyingjun

.idea/workspace.xml

@@ -9,4 +9,8 @@
 
 ## 1.0.2
 
-* add gravity of leftTop,leftBottom,rightTop,rightBottom
+* add gravity of leftTop,leftBottom,rightTop,rightBottom
+
+## 1.0.3
+
+* add gravityAnimationEnable property

CHANGELOG.md

@@ -228,6 +228,7 @@ width|Dialog width|0
 height|Dialog height|Adaptive component height
 duration|Dialog animation time|250 ms
 gravity|Where the dialog appears|center
+gravityAnimationEnable|The dialog appears with the default animation available|false
 margin|The margin of a dialog|EdgeInsets.all(0.0)
 barrierColor|Dialog barrierColor|30% of black
 backgroundColor|Dialog backgroundColor|white

README.md

@@ -226,6 +226,7 @@ width|弹窗宽度|0
 height|弹窗高度|自适应组件高度
 duration|弹窗动画出现的时间|250毫秒
 gravity|弹窗出现的位置|居中
+gravityAnimationEnable|弹窗出现的位置带有的默认动画是否可用|false
 margin|弹窗的外边距|EdgeInsets.all(0.0)
 barrierColor|弹窗外的背景色|30%黑色
 backgroundColor|弹窗内的背景色|白色

README_CN.md

@@ -74,6 +74,9 @@ showAlertDialog(BuildContext context) {
             makeTextButton("pop\nmenu", () {
               YYAlertDialogPopMenu(context);
             }),
+            makeTextButton("custom\nx&y", () {
+              YYAlertDialogCustomXY(context);
+            }),
           ],
         ),
         Text("2、dialog property"),
@@ -231,6 +234,9 @@ showDevelopDialog(BuildContext context) {
                 context,
                 MaterialPageRoute(
                     builder: (context) => Scaffold(
+                          appBar: AppBar(
+                            title: Text("fix dismiss bug"),
+                          ),
                           body: Column(
                             children: <Widget>[
                               makeTextButton("show", () {

example/lib/main.dart

@@ -47,7 +47,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.0.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter

example/pubspec.lock

@@ -102,6 +102,7 @@ YYDialog YYAlertDialogWithDuration(BuildContext context) {
   return YYDialog().build(context)
     ..width = 240
     ..borderRadius = 4.0
+    ..gravityAnimationEnable = true
     ..gravity = Gravity.left
     ..duration = Duration(seconds: 1)
     ..text(
@@ -224,6 +225,7 @@ YYDialog YYAlertDialogWithGravity(
   return YYDialog().build(context)
     ..width = width
     ..gravity = gravity
+    ..gravityAnimationEnable = true
     ..borderRadius = 4.0
     ..text(
       padding: EdgeInsets.all(18.0),
@@ -451,16 +453,36 @@ YYDialog YYAlertDialogPopMenu(BuildContext context) {
     ..barrierColor = Colors.transparent
     ..margin = EdgeInsets.only(top: 80, right: 20)
     ..text(
-      padding: EdgeInsets.fromLTRB(10.0,16.0,10.0,16.0),
+      padding: EdgeInsets.fromLTRB(10.0, 16.0, 10.0, 16.0),
       text: "Edit Libary",
       fontSize: 16.0,
       color: Colors.grey[700],
     )
     ..text(
-      padding:EdgeInsets.fromLTRB(10.0,16.0,10.0,16.0),
+      padding: EdgeInsets.fromLTRB(10.0, 16.0, 10.0, 16.0),
       text: "Read History",
       fontSize: 16.0,
       color: Color(0xFFFF6B2D),
     )
     ..show();
 }
+
+YYDialog YYAlertDialogCustomXY(BuildContext context) {
+  return YYDialog().build(context)
+    ..width = 120
+    ..borderRadius = 8.0
+    ..barrierColor = Colors.transparent
+    ..text(
+      padding: EdgeInsets.fromLTRB(10.0, 16.0, 10.0, 16.0),
+      text: "Edit Libary",
+      fontSize: 16.0,
+      color: Colors.grey[700],
+    )
+    ..text(
+      padding: EdgeInsets.fromLTRB(10.0, 16.0, 10.0, 16.0),
+      text: "Read History",
+      fontSize: 16.0,
+      color: Color(0xFFFF6B2D),
+    )
+    ..show(80.0, 100.0);
+}

lib/components/example/alert_dialog.dart

@@ -15,6 +15,7 @@ class YYDialog {
   double height; //弹窗高度
   Duration duration = Duration(milliseconds: 250); //弹窗动画出现的时间
   Gravity gravity = Gravity.center; //弹窗出现的位置
+  bool gravityAnimationEnable = false; //弹窗出现的位置带有的默认动画是否可用
   Color barrierColor = Colors.black.withOpacity(.3); //弹窗外的背景色
   Color backgroundColor = Colors.white; //弹窗内的背景色
   double borderRadius = 0.0; //弹窗圆角
@@ -214,12 +215,19 @@ class YYDialog {
     );
   }
 
-  void show() {
+  ///  x坐标
+  ///  y坐标
+  void show([x, y]) {
     var mainAxisAlignment = getColumnMainAxisAlignment(gravity);
     var crossAxisAlignment = getColumnCrossAxisAlignment(gravity);
     Size size = MediaQuery.of(context).size;
+    if (x != null && y != null) {
+      gravity = Gravity.leftTop;
+      margin = EdgeInsets.only(left: x, top: y);
+    }
     CustomDialog(
       gravity: gravity,
+      gravityAnimationEnable: gravityAnimationEnable,
       context: context,
       barrierColor: barrierColor,
       animatedFunc: animatedFunc,
@@ -375,6 +383,7 @@ class CustomDialog {
   RouteTransitionsBuilder _transitionsBuilder;
   bool _barrierDismissible;
   Gravity _gravity;
+  bool _gravityAnimationEnable;
   Function _animatedFunc;
 
   CustomDialog({
@@ -384,11 +393,13 @@ class CustomDialog {
     Color barrierColor,
     RouteTransitionsBuilder transitionsBuilder,
     Gravity gravity,
+    bool gravityAnimationEnable,
     Function animatedFunc,
     bool barrierDismissible,
   })  : _child = child,
         _context = context,
         _gravity = gravity,
+        _gravityAnimationEnable = gravityAnimationEnable,
         _duration = duration,
         _barrierColor = barrierColor,
         _animatedFunc = animatedFunc,
@@ -467,10 +478,19 @@ class CustomDialog {
         break;
     }
 
+    //自定义动画
     if (_animatedFunc != null) {
       return _animatedFunc(child, animation);
     }
 
+    //不需要默认动画
+    if (!_gravityAnimationEnable) {
+      custom = Tween<Offset>(
+        begin: Offset(0.0, 0.0),
+        end: Offset(0.0, 0.0),
+      ).animate(animation);
+    }
+
     return SlideTransition(
       position: custom,
       child: child,

lib/flutter_custom_dialog.dart

@@ -1,6 +1,6 @@
 name: flutter_custom_dialog
 description: Semantic dialog
-version: 1.0.2
+version: 1.0.3
 author: AndroidHensen <[email protected]>
 homepage: https://github.com/YYFlutter/flutter-custom-dialog.git