Fixes #17

By wrapping each `Text` widget in an `Expandable` widget and aligning the text centrally this issue is fixed as the `Text` widgets that contain the numbers now occoupy the maxiumum possilbe space.
CyberDiscovery · Aug 4, 2018 · 467c0f7 · 467c0f7
1 parent 704d842
commit 467c0f7
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -118,8 +118,6 @@ fabric.properties
 .dart_tool/
 .packages
 .pub/
-# If you're building an application, you may want to check-in your pubspec.lock
-pubspec.lock
 
 # Directory created by dartdoc
 # If you don't generate documentation locally you can remove this line.

diff --git a/lib/widgets/countdown.dart b/lib/widgets/countdown.dart
@@ -64,14 +64,66 @@ class _CountdownState extends State<Countdown> with TickerProviderStateMixin {
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               crossAxisAlignment: CrossAxisAlignment.end,
               children: <Widget>[
-                new Text(times["days"].toString(), style: Theme.of(context).textTheme.headline,),
-                new Text("days", style: Theme.of(context).textTheme.body1,),
-                new Text(times["hours"].toString(), style: Theme.of(context).textTheme.headline,),
-                new Text("hours", style: Theme.of(context).textTheme.body1,),
-                new Text(times["minutes"].toString(), style: Theme.of(context).textTheme.headline,),
-                new Text("minutes", style: Theme.of(context).textTheme.body1,),
-                new Text(times["seconds"].toString(), style: Theme.of(context).textTheme.headline,),
-                new Text("seconds", style: Theme.of(context).textTheme.body1,),
+                new Flexible(
+                  fit: FlexFit.tight,
+                  child: new Text(
+                    times["days"].toString(),
+                    style: Theme.of(context).textTheme.headline,
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+                new Flexible(
+                  fit: FlexFit.loose,
+                  child: new Text(
+                    "days",
+                    style: Theme.of(context).textTheme.body1,
+                  ),
+                ),
+                new Flexible(
+                  fit: FlexFit.tight,
+                  child: new Text(
+                    times["hours"].toString(),
+                    style: Theme.of(context).textTheme.headline,
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+                new Flexible(
+                  fit: FlexFit.loose,
+                  child: new Text(
+                    "hours",
+                    style: Theme.of(context).textTheme.body1,
+                  ),
+                ),
+                new Flexible(
+                  fit: FlexFit.tight,
+                  child: new Text(
+                    times["minutes"].toString(),
+                    style: Theme.of(context).textTheme.headline,
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+                new Flexible(
+                  fit: FlexFit.loose,
+                  child: new Text(
+                    "minutes",
+                    style: Theme.of(context).textTheme.body1,
+                  ),
+                ),
+                new Flexible(
+                  fit: FlexFit.tight,
+                  child: new Text(
+                    times["seconds"].toString(),
+                    style: Theme.of(context).textTheme.headline,
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+                new Flexible(
+                  fit: FlexFit.loose,
+                  child: new Text(
+                    "seconds",
+                    style: Theme.of(context).textTheme.body1,
+                  ),
+                ),
               ],
             ),
           );