remove futurebuilder from match view and refactor
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m10s
Pull Request Pipeline / lint (pull_request) Successful in 2m10s

This commit is contained in:
2025-12-23 23:17:27 +01:00
parent a747d91c5d
commit 7732c6ceb9

View File

@@ -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([
db.matchDao.getAllMatches(),
Future.delayed(minimumSkeletonDuration),
]).then((results) => results[0] as List<Match>);
loadGames();
}
@override
@@ -57,67 +54,44 @@ class _MatchViewState extends State<MatchView> {
body: Stack(
alignment: Alignment.center,
children: [
FutureBuilder<List<Match>>(
future: _gameListFuture,
builder:
(BuildContext context, AsyncSnapshot<List<Match>> snapshot) {
if (snapshot.hasError) {
return const Center(
child: TopCenteredMessage(
icon: Icons.report,
title: 'Error',
message: 'Game data could not be loaded',
),
AppSkeleton(
enabled: isLoading,
child: Visibility(
visible: matches.isNotEmpty,
replacement: const Center(
child: TopCenteredMessage(
icon: Icons.report,
title: 'Info',
message: 'No games created yet',
),
),
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 &&
(!snapshot.hasData || snapshot.data!.isEmpty)) {
return const Center(
child: TopCenteredMessage(
icon: Icons.report,
title: 'Info',
message: 'No games created yet',
),
);
}
final bool isLoading =
snapshot.connectionState == ConnectionState.waiting;
final List<Match> matches =
(isLoading ? skeletonData : (snapshot.data ?? [])
..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],
);
},
),
return GameHistoryTile(
onTap: () async {
Navigator.push(
context,
CupertinoPageRoute(
fullscreenDialog: true,
builder: (context) => GameResultView(
match: matches[index],
onWinnerChanged: loadGames,
),
),
);
},
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() {
setState(() {
_gameListFuture = db.matchDao.getAllMatches();
void loadGames() {
Future.wait([
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;
});
});
}
}