Merge pull request #3 from SplashByte/dev

version 0.3.1

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.1 [2022-02-26]
+- fixes alignment
+
 ## 0.3.0 [2022-02-26]
 - adds parameters for manipulating size animation
 - enables disabling of size animation for performance reasons

example/pubspec.lock

@@ -49,7 +49,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.2.1"
+    version: "0.3.0"
   fake_async:
     dependency: transitive
     description:

lib/src/cross_fade_widget.dart

@@ -111,18 +111,18 @@ class _CrossFadeState<T> extends State<CrossFade<T>>
     super.initState();
     _todo = [widget.value];
     _opacityController =
-    AnimationController(vsync: this, duration: widget.duration, value: 1.0)
-      ..addStatusListener((status) {
-        if (status == AnimationStatus.completed) {
-          if (_todo.length <= 1) return;
-          _todo.removeAt(0);
-          // rebuild necessary for setting GlobalKeys simultaneously
-          setState(() {});
-          if (_todo.length > 1) {
-            _animateNext();
-          }
-        }
-      });
+        AnimationController(vsync: this, duration: widget.duration, value: 1.0)
+          ..addStatusListener((status) {
+            if (status == AnimationStatus.completed) {
+              if (_todo.length <= 1) return;
+              _todo.removeAt(0);
+              // rebuild necessary for setting GlobalKeys simultaneously
+              setState(() {});
+              if (_todo.length > 1) {
+                _animateNext();
+              }
+            }
+          });
 
     _sizeController = AnimationController(
         vsync: this,
@@ -199,6 +199,7 @@ class _CrossFadeState<T> extends State<CrossFade<T>>
   Widget build(BuildContext context) {
     bool twoActive = _todo.length > 1;
     T current = twoActive ? _todo[1] : _todo[0];
+    T first = _todo[0];
     return LayoutBuilder(
       builder: (context, constraints) => Stack(
         fit: StackFit.passthrough,
@@ -223,8 +224,8 @@ class _CrossFadeState<T> extends State<CrossFade<T>>
                         child: child,
                       ),
                       child: EmptyWidget(
-                          key: _getKey(_todo[0]),
-                          child: widget.builder(context, _todo[0])),
+                          key: _getKey(first),
+                          child: widget.builder(context, first)),
                     ),
                   ),
                 ),
@@ -241,6 +242,7 @@ class _CrossFadeState<T> extends State<CrossFade<T>>
               clipBehavior: widget.clipBehavior,
               duration: widget.sizeDuration ?? widget.duration,
               curve: widget.sizeCurve,
+              alignment: widget.stackAlignment,
               child: AnimatedBuilder(
                 animation: _opacityAnimation,
                 builder: (context, child) => Opacity(

lib/src/widgets/animated_size.dart

@@ -8,13 +8,15 @@ class CustomAnimatedSize extends StatefulWidget {
   final Duration duration;
   final Curve curve;
   final Widget child;
+  final AlignmentGeometry alignment;
 
   const CustomAnimatedSize({
     Key? key,
     this.clipBehavior = Clip.hardEdge,
     required this.duration,
     this.curve = Curves.linear,
     required this.child,
+    this.alignment = Alignment.center,
   }) : super(key: key);
 
   @override
@@ -32,7 +34,8 @@ class _CustomAnimatedSizeState extends State<CustomAnimatedSize> {
       clipBehavior: widget.clipBehavior,
       duration: widget.duration,
       curve: widget.curve,
+      alignment: widget.alignment,
       child: child,
     );
   }
-}
+}

pubspec.yaml

@@ -1,6 +1,6 @@
 name: cross_fade
 description: A widget to apply a crossfade animation between different states and/or widgets.
-version: 0.3.0
+version: 0.3.1
 repository: https://github.com/SplashByte/cross_fade
 
 environment: