lib/presentation/views/main_menu/match_view/match_view.dart

@@ -24,16 +24,16 @@ class MatchView extends StatefulWidget {
 }
 
 class _MatchViewState extends State<MatchView> {
-  late Future<List<Match>> _gameListFuture;
   late final AppDatabase db;
+  bool isLoading = true;
 
-  late final List<Match> skeletonData = List.filled(
+  List<Match> matches = List.filled(
     4,
     Match(
       name: 'Skeleton Gamename',
       group: Group(
         name: 'Groupname',
-        members: List.generate(5, (index) => Player(name: 'Player')),
+        members: List.filled(5, Player(name: 'Player')),
       ),
       winner: Player(name: 'Player'),
       players: [Player(name: 'Player')],
@@ -44,10 +44,7 @@ class _MatchViewState extends State<MatchView> {
   void initState() {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
-    _gameListFuture = Future.wait([
+    loadGames();
-      db.matchDao.getAllMatches(),
-      Future.delayed(minimumSkeletonDuration),
-    ]).then((results) => results[0] as List<Match>);
   }
 
   @override
@@ -57,67 +54,44 @@ class _MatchViewState extends State<MatchView> {
       body: Stack(
         alignment: Alignment.center,
         children: [
-          FutureBuilder<List<Match>>(
+          AppSkeleton(
-            future: _gameListFuture,
+            enabled: isLoading,
-            builder:
+            child: Visibility(
-                (BuildContext context, AsyncSnapshot<List<Match>> snapshot) {
+              visible: matches.isNotEmpty,
-                  if (snapshot.hasError) {
+              replacement: const Center(
-                    return const Center(
+                child: TopCenteredMessage(
-                      child: TopCenteredMessage(
+                  icon: Icons.report,
-                        icon: Icons.report,
+                  title: 'Info',
-                        title: 'Error',
+                  message: 'No games created yet',
-                        message: 'Game data could not be loaded',
+                ),
-                      ),
+              ),
+              child: ListView.builder(
+                padding: const EdgeInsets.only(bottom: 85),
+                itemCount: matches.length + 1,
+                itemBuilder: (BuildContext context, int index) {
+                  if (index == matches.length) {
+                    return SizedBox(
+                      height: MediaQuery.paddingOf(context).bottom - 80,
                     );
                   }
-                  if (snapshot.connectionState == ConnectionState.done &&
+                  return GameHistoryTile(
-                      (!snapshot.hasData || snapshot.data!.isEmpty)) {
+                    onTap: () async {
-                    return const Center(
+                      Navigator.push(
-                      child: TopCenteredMessage(
+                        context,
-                        icon: Icons.report,
+                        CupertinoPageRoute(
-                        title: 'Info',
+                          fullscreenDialog: true,
-                        message: 'No games created yet',
+                          builder: (context) => GameResultView(
-                      ),
+                            match: matches[index],
-                    );
+                            onWinnerChanged: loadGames,
-                  }
+                          ),
-                  final bool isLoading =
+                        ),
-                      snapshot.connectionState == ConnectionState.waiting;
+                      );
-                  final List<Match> matches =
+                    },
-                      (isLoading ? skeletonData : (snapshot.data ?? [])
+                    match: matches[index],
-                            ..sort(
-                              (a, b) => b.createdAt.compareTo(a.createdAt),
-                            ))
-                          .toList();
-                  return AppSkeleton(
-                    enabled: isLoading,
-                    child: ListView.builder(
-                      padding: const EdgeInsets.only(bottom: 85),
-                      itemCount: matches.length + 1,
-                      itemBuilder: (BuildContext context, int index) {
-                        if (index == matches.length) {
-                          return SizedBox(
-                            height: MediaQuery.paddingOf(context).bottom - 80,
-                          );
-                        }
-                        return GameHistoryTile(
-                          onTap: () async {
-                            Navigator.push(
-                              context,
-                              CupertinoPageRoute(
-                                fullscreenDialog: true,
-                                builder: (context) => GameResultView(
-                                  match: matches[index],
-                                  onWinnerChanged: refreshGameList,
-                                ),
-                              ),
-                            );
-                          },
-                          match: matches[index],
-                        );
-                      },
-                    ),
                   );
                 },
+              ),
+            ),
           ),
           Positioned(
             bottom: MediaQuery.paddingOf(context).bottom,
@@ -129,7 +103,7 @@ class _MatchViewState extends State<MatchView> {
                   context,
                   MaterialPageRoute(
                     builder: (context) =>
-                        CreateMatchView(onWinnerChanged: refreshGameList),
+                        CreateMatchView(onWinnerChanged: loadGames),
                   ),
                 );
               },
@@ -140,9 +114,17 @@ class _MatchViewState extends State<MatchView> {
     );
   }
 
-  void refreshGameList() {
+  void loadGames() {
-    setState(() {
+    Future.wait([
-      _gameListFuture = db.matchDao.getAllMatches();
+      db.matchDao.getAllMatches(),
+      Future.delayed(minimumSkeletonDuration),
+    ]).then((results) {
+      final loadedMatches = results[0] as List<Match>;
+      matches = loadedMatches
+        ..sort((a, b) => b.createdAt.compareTo(a.createdAt));
+      setState(() {
+        isLoading = false;
+      });
     });
   }
 }