Merge pull request #102 from Viktoriaschule/fix/loading-bumping

Fix loading bumping size of list group
Viktoriaschule · Feb 27, 2020 · dbcca7c · dbcca7c
2 parents f79f263 + 85ed181
commit dbcca7c
Showing 1 changed file with 51 additions and 37 deletions.
diff --git a/lib/widgets/list_group.dart b/lib/widgets/list_group.dart
@@ -94,47 +94,61 @@ class _ListGroupState extends Interactor<ListGroup>
       child: Column(
         children: [
           Container(
-            margin: EdgeInsets.only(bottom: 10),
-            padding: EdgeInsets.only(top: 15, left: 20, right: 10),
-            child: Row(
-              children: <Widget>[
-                Expanded(
-                  child: Text(
-                    widget.title,
-                    style: TextStyle(
-                      fontWeight: FontWeight.w100,
-                      color: ThemeWidget.of(context).textColor,
-                      fontSize: 18,
-                    ),
-                  ),
-                ),
-                Container(
-                  width: 31,
-                  child: AnimatedCrossFade(
-                    duration: Duration(milliseconds: 100),
-                    firstChild: Container(
-                      margin: EdgeInsets.all(5.5),
-                      child: CustomCircularProgressIndicator(
-                        height: 20,
-                        width: 20,
+            padding: EdgeInsets.only(left: 20, right: 10),
+            child: ConstrainedBox(
+              constraints: BoxConstraints(minHeight: 31),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Container(
+                      margin: EdgeInsets.only(top: 10),
+                      child: Text(
+                        widget.title,
+                        style: TextStyle(
+                          fontWeight: FontWeight.w100,
+                          color: ThemeWidget.of(context).textColor,
+                          fontSize: 18,
+                        ),
                       ),
                     ),
-                    secondChild: widget.counter > 0
-                        ? Text(
-                            '+${widget.counter}',
-                            style: TextStyle(
-                              fontWeight: FontWeight.w100,
-                              color: ThemeWidget.of(context).textColor,
-                              fontSize: 18,
+                  ),
+                  Container(
+                    margin: EdgeInsets.only(top: 10),
+                    width: 31,
+                    height: 31,
+                    child: Stack(
+                      children: [
+                        AnimatedOpacity(
+                          duration: Duration(milliseconds: 100),
+                          opacity:
+                              widget.loadingKeys != null && _isLoading ? 1 : 0,
+                          child: Center(
+                            child: CustomCircularProgressIndicator(
+                              height: 20,
+                              width: 20,
                             ),
-                          )
-                        : Container(),
-                    crossFadeState: widget.loadingKeys != null && _isLoading
-                        ? CrossFadeState.showFirst
-                        : CrossFadeState.showSecond,
+                          ),
+                        ),
+                        AnimatedOpacity(
+                          duration: Duration(milliseconds: 100),
+                          opacity:
+                              widget.loadingKeys != null && _isLoading ? 0 : 1,
+                          child: Center(
+                            child: Text(
+                              '+${widget.counter}',
+                              style: TextStyle(
+                                fontWeight: FontWeight.w100,
+                                color: ThemeWidget.of(context).textColor,
+                                fontSize: 18,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
           ),
           ...widget.children,