Merge branch 'player-list'

[lmno.games] / flutterempires / lib / main.dart

diff --git a/flutterempires/lib/main.dart b/flutterempires/lib/main.dart
index 3cb887278f5c497a3ebd9fd939baa7a7475983f8..64d8bf057591cad6e02f85b9c21844bef19e0eb3 100644 (file)
--- a/flutterempires/lib/main.dart
+++ b/flutterempires/lib/main.dart
@@ -110,43 +110,23 @@ class _MyHomePageState extends State<MyHomePage> {
                 ),
               ),
               Spacer(flex: 1),
-              FutureBuilder<Player>(
-                future: futurePlayer,
-                builder: (context, snapshot) {
-                  if (snapshot.hasData) {
-                    return Text(snapshot.data.name);
-                  } else if (snapshot.hasError) {
-                    return Text("${snapshot.error}");
-                  }
-                  return CircularProgressIndicator();
-                },
-              ),
-              Spacer(flex: 1),
-              FutureBuilder<List<Player>>(
-                future: allPlayers,
-                builder: (context, snapshot) {
-                  if (snapshot.hasData) {
-                    return Text(snapshot.data.length.toString());
-                  } else if (snapshot.hasError) {
-                    return Text("${snapshot.error}");
-                  }
-                  // By default, show a loading spinner.
-                  return CircularProgressIndicator();
-                },
-              ),
               Expanded(
-                flex: 10,
+                flex: 20,
                 child: FutureBuilder<List<Player>>(
                     future: allPlayers,
                     builder: (context, snapshot) {
                       if (snapshot.hasData) {
-                        return ListView.builder(
-                            itemCount: snapshot.data.length,
-                            itemBuilder: (context, index) {
-                              return ListTile(
-                                  title: Text(
-                                      snapshot.data[index].name.toString()));
-                            });
+                        if (snapshot.data.length == 0) {
+                          return Text('No players yet');
+                        } else {
+                          return ListView.builder(
+                              itemCount: snapshot.data.length,
+                              itemBuilder: (context, index) {
+                                return ListTile(
+                                    title: Text(
+                                        snapshot.data[index].name.toString()));
+                              });
+                        }
                       } else if (snapshot.hasError) {
                         return Text("${snapshot.error}");
                       }