liquid-development/game-tracker
3
0
Fork 0
Code Issues 16 Pull Requests 6 Actions Releases 1 Activity

Compare commits

base: liquid-development:0567fce02b39824b045586be0d9f6c8e9aae0bb5
Branches Tags
liquid-development:development liquid-development:bug/159-topcenteredmessage-anzeigefehler liquid-development:enhancement/81-readme-vervollstaendigen liquid-development:enhancement/138-neues-navbar-design liquid-development:feature/129-neues-popup-design liquid-development:feature/88-neue-datenbank-struktur liquid-development:feature/118-bearbeiten-und-löschen-von-gruppen liquid-development:main
liquid-development:v.0.0.1-alpha
...
compare: liquid-development:4f0a1eec6d12c28a178e8eeb8bce8a9d1004e31e
Branches Tags
liquid-development:bug/159-topcenteredmessage-anzeigefehler liquid-development:enhancement/81-readme-vervollstaendigen liquid-development:enhancement/138-neues-navbar-design liquid-development:development liquid-development:feature/129-neues-popup-design liquid-development:feature/88-neue-datenbank-struktur liquid-development:feature/118-bearbeiten-und-löschen-von-gruppen liquid-development:main
liquid-development:v.0.0.1-alpha

7 Commits
0567fce02b ... 4f0a1eec6d

Author SHA1 Message Date
mathiskirchner
4f0a1eec6d refactor
Some checks failed
Pull Request Pipeline / test (pull_request) Successful in 2m6s
Details
Pull Request Pipeline / lint (pull_request) Failing after 2m6s
Details
2025-12-21 19:50:34 +01:00
mathiskirchner
24b60bb18b added minimumSkeletonDuration constant and changed future logic 2025-12-21 19:46:59 +01:00
mathiskirchner
c8532adfde changed skeleton duration logic in statistics view and refactored 2025-12-21 15:52:02 +01:00
mathiskirchner
76186787e7 changed futurebuilder logic in player selection 2025-12-21 15:51:24 +01:00
mathiskirchner
f05114a99e removed futurebuilder logic in groups_view 2025-12-21 15:50:39 +01:00
mathiskirchner
d96494f608 Changed futurebuilder logic in groups_view 2025-12-21 15:50:24 +01:00
mathiskirchner
0eaf3d251b added constant minimumSkeletonDuration 2025-12-21 15:49:58 +01:00
7 changed files with 99 additions and 147 deletions
Expand all files Collapse all files

2
lib/core/constants.dart Normal file
View File

@@ -0,0 +1,2 @@
/// Minimum duration of all app skeletons
Duration minimumSkeletonDuration = Duration(milliseconds: 250);

9
lib/presentation/views/main_menu/group_view/groups_view.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:game_tracker/core/constants.dart';
import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/core/custom_theme.dart';
import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/database.dart';
import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/group.dart';
@@ -34,10 +35,10 @@ class _GroupsViewState extends State<GroupsView> {
void initState() { void initState() {
super.initState(); super.initState();
db = Provider.of<AppDatabase>(context, listen: false); db = Provider.of<AppDatabase>(context, listen: false);
_allGroupsFuture = Future.delayed( _allGroupsFuture = Future.wait([
const Duration(milliseconds: 250), db.groupDao.getAllGroups(),
() => db.groupDao.getAllGroups(), Future.delayed(minimumSkeletonDuration),
); ]).then((results) => results[0] as List<Group>);
} }
@override @override

191
lib/presentation/views/main_menu/home_view.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:game_tracker/core/constants.dart';
import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/database.dart';
import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/group.dart';
import 'package:game_tracker/data/dto/match.dart'; import 'package:game_tracker/data/dto/match.dart';
@@ -18,12 +19,10 @@ class HomeView extends StatefulWidget {
} }
class _HomeViewState extends State<HomeView> { class _HomeViewState extends State<HomeView> {
late Future<int> _matchCountFuture;
late Future<int> _groupCountFuture;
late Future<List<Match>> _recentMatchesFuture;
bool isLoading = true; bool isLoading = true;
int matchCount = 0;
late final List<Match> skeletonData = List.filled( int groupCount = 0;
List<Match> recentMatches = List.filled(
2, 2,
Match( Match(
name: 'Skeleton Match', name: 'Skeleton Match',
@@ -39,19 +38,24 @@ class _HomeViewState extends State<HomeView> {
); );
@override @override
initState() { void initState() {
super.initState(); super.initState();
final db = Provider.of<AppDatabase>(context, listen: false); final db = Provider.of<AppDatabase>(context, listen: false);
_matchCountFuture = db.matchDao.getMatchCount();
_groupCountFuture = db.groupDao.getGroupCount();
_recentMatchesFuture = db.matchDao.getAllMatches();
Future.wait([ Future.wait([
_matchCountFuture, db.matchDao.getMatchCount(),
_groupCountFuture, db.groupDao.getGroupCount(),
_recentMatchesFuture, db.matchDao.getAllMatches(),
]).then((_) async { Future.delayed(minimumSkeletonDuration),
await Future.delayed(const Duration(milliseconds: 250)); ]).then((results) {
matchCount = results[0] as int;
groupCount = results[1] as int;
recentMatches = results[2] as List<Match>;
recentMatches =
(recentMatches..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
.take(2)
.toList();
if (mounted) { if (mounted) {
setState(() { setState(() {
isLoading = false; isLoading = false;
@@ -73,38 +77,20 @@ class _HomeViewState extends State<HomeView> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
FutureBuilder<int>( QuickInfoTile(
future: _matchCountFuture, width: constraints.maxWidth * 0.45,
builder: (context, snapshot) { height: constraints.maxHeight * 0.15,
final int count = (snapshot.hasData) title: 'Matches',
? snapshot.data! icon: Icons.groups_rounded,
: 0; value: matchCount,
return QuickInfoTile(
width: constraints.maxWidth * 0.45,
height: constraints.maxHeight * 0.15,
title: 'Matches',
icon: Icons.groups_rounded,
value: count,
);
},
), ),
SizedBox(width: constraints.maxWidth * 0.05), SizedBox(width: constraints.maxWidth * 0.05),
FutureBuilder<int>( QuickInfoTile(
future: _groupCountFuture, width: constraints.maxWidth * 0.45,
builder: (context, snapshot) { height: constraints.maxHeight * 0.15,
final int count = title: 'Groups',
(snapshot.connectionState == ConnectionState.done && icon: Icons.groups_rounded,
snapshot.hasData) value: groupCount,
? snapshot.data!
: 0;
return QuickInfoTile(
width: constraints.maxWidth * 0.45,
height: constraints.maxHeight * 0.15,
title: 'Groups',
icon: Icons.groups_rounded,
value: count,
);
},
), ),
], ],
), ),
@@ -116,80 +102,48 @@ class _HomeViewState extends State<HomeView> {
icon: Icons.timer, icon: Icons.timer,
content: Padding( content: Padding(
padding: const EdgeInsets.symmetric(horizontal: 40.0), padding: const EdgeInsets.symmetric(horizontal: 40.0),
child: FutureBuilder( child: Visibility(
future: _recentMatchesFuture, visible: !isLoading,
builder: replacement: const Center(
( heightFactor: 12,
BuildContext context, child: Text('No recent games available.'),
AsyncSnapshot<List<Match>> snapshot, ),
) { child: Column(
if (snapshot.hasError) { mainAxisAlignment: MainAxisAlignment.start,
return const Center( crossAxisAlignment: CrossAxisAlignment.start,
heightFactor: 4, children: [
child: Text( MatchTile(
'Error while loading recent matches.', matchTitle: recentMatches[0].name,
), game: 'Winner',
); ruleset: 'Ruleset',
} players: _getPlayerText(recentMatches[0]),
final List<Match> matches = winner: recentMatches[0].winner == null
(isLoading ? 'Match in progress...'
? skeletonData : recentMatches[0].winner!.name,
: (snapshot.data ?? []) ),
..sort( const Padding(
(a, b) => b.createdAt.compareTo( padding: EdgeInsets.symmetric(vertical: 8.0),
a.createdAt, child: Divider(),
), ),
)) if (recentMatches.length > 1) ...[
.take(2) MatchTile(
.toList(); matchTitle: recentMatches[1].name,
if (matches.isNotEmpty) { game: 'Winner',
return Column( ruleset: 'Ruleset',
mainAxisAlignment: MainAxisAlignment.start, players: _getPlayerText(recentMatches[1]),
crossAxisAlignment: CrossAxisAlignment.start, winner: recentMatches[1].winner == null
children: [ ? 'Game in progress...'
MatchTile( : recentMatches[1].winner!.name,
matchTitle: matches[0].name, ),
game: 'Winner', const SizedBox(height: 8),
ruleset: 'Ruleset', ] else ...[
players: _getPlayerText(matches[0]), const Center(
winner: matches[0].winner == null heightFactor: 4,
? 'Match in progress...' child: Text('No second game available.'),
: matches[0].winner!.name, ),
), ],
const Padding( ],
padding: EdgeInsets.symmetric( ),
vertical: 8.0,
),
child: Divider(),
),
if (matches.length > 1) ...[
MatchTile(
matchTitle: matches[1].name,
game: 'Winner',
ruleset: 'Ruleset',
players: _getPlayerText(matches[1]),
winner: matches[1].winner == null
? 'Game in progress...'
: matches[1].winner!.name,
),
const SizedBox(height: 8),
] else ...[
const Center(
heightFactor: 4,
child: Text(
'No second game available.',
),
),
],
],
);
} else {
return const Center(
heightFactor: 12,
child: Text('No recent games available.'),
);
}
},
), ),
), ),
), ),
@@ -199,7 +153,6 @@ class _HomeViewState extends State<HomeView> {
title: 'Quick Create', title: 'Quick Create',
icon: Icons.add_box_rounded, icon: Icons.add_box_rounded,
content: Column( content: Column(
spacing: 8,
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,

14
lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
View File

@@ -28,12 +28,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
/// Reference to the app database /// Reference to the app database
late final AppDatabase db; late final AppDatabase db;
/// Futures to load all groups and players from the database
late Future<List<Group>> _allGroupsFuture;
/// Future to load all players from the database
late Future<List<Player>> _allPlayersFuture;
/// Controller for the game name input field /// Controller for the game name input field
final TextEditingController _gameNameController = TextEditingController(); final TextEditingController _gameNameController = TextEditingController();
@@ -107,10 +101,10 @@ class _CreateMatchViewState extends State<CreateMatchView> {
db = Provider.of<AppDatabase>(context, listen: false); db = Provider.of<AppDatabase>(context, listen: false);
_allGroupsFuture = db.groupDao.getAllGroups(); Future.wait([
_allPlayersFuture = db.playerDao.getAllPlayers(); db.groupDao.getAllGroups(),
db.playerDao.getAllPlayers(),
Future.wait([_allGroupsFuture, _allPlayersFuture]).then((result) async { ]).then((result) async {
groupsList = result[0] as List<Group>; groupsList = result[0] as List<Group>;
playerList = result[1] as List<Player>; playerList = result[1] as List<Player>;
}); });

9
lib/presentation/views/main_menu/match_view/match_view.dart
View File

@@ -2,6 +2,7 @@ import 'dart:core' hide Match;
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:game_tracker/core/constants.dart';
import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/core/custom_theme.dart';
import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/database.dart';
import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/group.dart';
@@ -43,10 +44,10 @@ class _MatchViewState extends State<MatchView> {
void initState() { void initState() {
super.initState(); super.initState();
db = Provider.of<AppDatabase>(context, listen: false); db = Provider.of<AppDatabase>(context, listen: false);
_gameListFuture = Future.delayed( _gameListFuture = Future.wait([
const Duration(milliseconds: 250), db.matchDao.getAllMatches(),
() => db.matchDao.getAllMatches(), Future.delayed(minimumSkeletonDuration),
); ]).then((results) => results[0] as List<Match>);
} }
@override @override

12
lib/presentation/views/main_menu/statistics_view.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:game_tracker/core/constants.dart';
import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/database.dart';
import 'package:game_tracker/data/dto/match.dart'; import 'package:game_tracker/data/dto/match.dart';
import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/data/dto/player.dart';
@@ -14,8 +15,6 @@ class StatisticsView extends StatefulWidget {
} }
class _StatisticsViewState extends State<StatisticsView> { class _StatisticsViewState extends State<StatisticsView> {
late Future<List<Match>> _matchesFuture;
late Future<List<Player>> _playersFuture;
List<(String, int)> winCounts = List.filled(6, ('Skeleton Player', 1)); List<(String, int)> winCounts = List.filled(6, ('Skeleton Player', 1));
List<(String, int)> matchCounts = List.filled(6, ('Skeleton Player', 1)); List<(String, int)> matchCounts = List.filled(6, ('Skeleton Player', 1));
List<(String, double)> winRates = List.filled(6, ('Skeleton Player', 1)); List<(String, double)> winRates = List.filled(6, ('Skeleton Player', 1));
@@ -25,11 +24,12 @@ class _StatisticsViewState extends State<StatisticsView> {
void initState() { void initState() {
super.initState(); super.initState();
final db = Provider.of<AppDatabase>(context, listen: false); final db = Provider.of<AppDatabase>(context, listen: false);
_matchesFuture = db.matchDao.getAllMatches();
_playersFuture = db.playerDao.getAllPlayers();
Future.wait([_matchesFuture, _playersFuture]).then((results) async { Future.wait([
await Future.delayed(const Duration(milliseconds: 250)); db.matchDao.getAllMatches(),
db.playerDao.getAllPlayers(),
Future.delayed(minimumSkeletonDuration),
]).then((results) async {
final matches = results[0] as List<Match>; final matches = results[0] as List<Match>;
final players = results[1] as List<Player>; final players = results[1] as List<Player>;
winCounts = _calculateWinsForAllPlayers(matches, players); winCounts = _calculateWinsForAllPlayers(matches, players);

9
lib/presentation/widgets/player_selection.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:game_tracker/core/constants.dart';
import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/core/custom_theme.dart';
import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/database.dart';
import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/data/dto/player.dart';
@@ -46,10 +47,10 @@ class _PlayerSelectionState extends State<PlayerSelection> {
} }
void loadPlayerList() { void loadPlayerList() {
_allPlayersFuture = Future.delayed( _allPlayersFuture = Future.wait([
const Duration(milliseconds: 250), db.playerDao.getAllPlayers(),
() => db.playerDao.getAllPlayers(), Future.delayed(minimumSkeletonDuration),
); ]).then((results) => results[0] as List<Player>);
suggestedPlayers = skeletonData; suggestedPlayers = skeletonData;
_allPlayersFuture.then((loadedPlayers) { _allPlayersFuture.then((loadedPlayers) {
setState(() { setState(() {