From 349ff948defb9b668d6783511fcdadd048a09a20 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 9 Jan 2026 19:50:44 +0100 Subject: [PATCH 01/16] Modified match tile --- .../main_menu/match_view/match_view.dart | 29 ++++++++++--------- .../widgets/tiles/match_tile.dart | 12 ++++++-- pubspec.yaml | 7 +---- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/lib/presentation/views/main_menu/match_view/match_view.dart b/lib/presentation/views/main_menu/match_view/match_view.dart index 45b957f..108b592 100644 --- a/lib/presentation/views/main_menu/match_view/match_view.dart +++ b/lib/presentation/views/main_menu/match_view/match_view.dart @@ -78,20 +78,23 @@ class _MatchViewState extends State { height: MediaQuery.paddingOf(context).bottom - 20, ); } - return MatchTile( - onTap: () async { - Navigator.push( - context, - CupertinoPageRoute( - fullscreenDialog: true, - builder: (context) => MatchResultView( - match: matches[index], - onWinnerChanged: loadGames, + return Padding( + padding: const EdgeInsets.only(bottom: 12.0), + child: MatchTile( + onTap: () async { + Navigator.push( + context, + CupertinoPageRoute( + fullscreenDialog: true, + builder: (context) => MatchResultView( + match: matches[index], + onWinnerChanged: loadGames, + ), ), - ), - ); - }, - match: matches[index], + ); + }, + match: matches[index], + ), ); }, ), diff --git a/lib/presentation/widgets/tiles/match_tile.dart b/lib/presentation/widgets/tiles/match_tile.dart index 55d81c3..21e24c0 100644 --- a/lib/presentation/widgets/tiles/match_tile.dart +++ b/lib/presentation/widgets/tiles/match_tile.dart @@ -11,7 +11,12 @@ import 'package:intl/intl.dart'; /// - [match]: The match data to be displayed. /// - [onTap]: The callback invoked when the tile is tapped. class MatchTile extends StatefulWidget { - const MatchTile({super.key, required this.match, required this.onTap}); + const MatchTile({ + super.key, + required this.match, + required this.onTap, + this.width, + }); /// The match data to be displayed. final Match match; @@ -19,6 +24,8 @@ class MatchTile extends StatefulWidget { /// The callback invoked when the tile is tapped. final VoidCallback onTap; + final double? width; + @override State createState() => _MatchTileState(); } @@ -41,7 +48,8 @@ class _MatchTileState extends State { return GestureDetector( onTap: widget.onTap, child: Container( - margin: CustomTheme.tileMargin, + margin: EdgeInsets.zero, + width: widget.width, padding: const EdgeInsets.all(12), decoration: BoxDecoration( color: CustomTheme.boxColor, diff --git a/pubspec.yaml b/pubspec.yaml index e79ca17..993ef78 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.1+21 +version: 0.0.1+23 environment: sdk: ^3.8.1 @@ -9,11 +9,6 @@ environment: dependencies: flutter: sdk: flutter - material_symbols_icons: ^4.2815.1 - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.8 drift: ^2.27.0 drift_flutter: ^0.2.4 path_provider: ^2.1.5 From a9d2325eee9c9f4ed4ab83cb0d8367bc864df987 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 9 Jan 2026 19:50:51 +0100 Subject: [PATCH 02/16] Implemented match tile in home view --- .../views/main_menu/home_view.dart | 132 +++++++++++------- 1 file changed, 84 insertions(+), 48 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 170adb4..0761f08 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -5,10 +5,11 @@ import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/match.dart'; import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/l10n/generated/app_localizations.dart'; +import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart'; import 'package:game_tracker/presentation/widgets/app_skeleton.dart'; import 'package:game_tracker/presentation/widgets/buttons/quick_create_button.dart'; import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart'; -import 'package:game_tracker/presentation/widgets/tiles/match_summary_tile.dart'; +import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart'; import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart'; import 'package:provider/provider.dart'; @@ -86,6 +87,38 @@ class _HomeViewState extends State { ], ), Padding( + padding: const EdgeInsets.only(top: 8.0), + child: MatchTile( + width: constraints.maxWidth * 0.95, + match: recentMatches[0], + onTap: () { + Navigator.of(context).push( + MaterialPageRoute( + fullscreenDialog: true, + builder: (context) => + MatchResultView(match: recentMatches[0]), + ), + ); + }, + ), + ), + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: MatchTile( + width: constraints.maxWidth * 0.95, + match: recentMatches[1], + onTap: () { + Navigator.of(context).push( + MaterialPageRoute( + fullscreenDialog: true, + builder: (context) => + MatchResultView(match: recentMatches[1]), + ), + ); + }, + ), + ), + /*Padding( padding: const EdgeInsets.symmetric(vertical: 16.0), child: InfoTile( width: constraints.maxWidth * 0.95, @@ -156,53 +189,56 @@ class _HomeViewState extends State { ), ), ), - ), - InfoTile( - width: constraints.maxWidth * 0.95, - title: loc.quick_create, - icon: Icons.add_box_rounded, - content: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - QuickCreateButton( - text: 'Category 1', - onPressed: () {}, - ), - QuickCreateButton( - text: 'Category 2', - onPressed: () {}, - ), - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - QuickCreateButton( - text: 'Category 3', - onPressed: () {}, - ), - QuickCreateButton( - text: 'Category 4', - onPressed: () {}, - ), - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - QuickCreateButton( - text: 'Category 5', - onPressed: () {}, - ), - QuickCreateButton( - text: 'Category 6', - onPressed: () {}, - ), - ], - ), - ], + ),*/ + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: InfoTile( + width: constraints.maxWidth * 0.95, + title: loc.quick_create, + icon: Icons.add_box_rounded, + content: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton( + text: 'Category 1', + onPressed: () {}, + ), + QuickCreateButton( + text: 'Category 2', + onPressed: () {}, + ), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton( + text: 'Category 3', + onPressed: () {}, + ), + QuickCreateButton( + text: 'Category 4', + onPressed: () {}, + ), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton( + text: 'Category 5', + onPressed: () {}, + ), + QuickCreateButton( + text: 'Category 6', + onPressed: () {}, + ), + ], + ), + ], + ), ), ), ], From 3d510d5b3d5ea1efccdc40030da73a839adeeb67 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 9 Jan 2026 20:04:10 +0100 Subject: [PATCH 03/16] Implemented compact mode for match tiles --- .../views/main_menu/home_view.dart | 2 + .../widgets/tiles/match_tile.dart | 63 ++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 0761f08..6599b98 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -89,6 +89,7 @@ class _HomeViewState extends State { Padding( padding: const EdgeInsets.only(top: 8.0), child: MatchTile( + compact: true, width: constraints.maxWidth * 0.95, match: recentMatches[0], onTap: () { @@ -105,6 +106,7 @@ class _HomeViewState extends State { Padding( padding: const EdgeInsets.only(top: 8.0), child: MatchTile( + compact: true, width: constraints.maxWidth * 0.95, match: recentMatches[1], onTap: () { diff --git a/lib/presentation/widgets/tiles/match_tile.dart b/lib/presentation/widgets/tiles/match_tile.dart index 21e24c0..59ee0b9 100644 --- a/lib/presentation/widgets/tiles/match_tile.dart +++ b/lib/presentation/widgets/tiles/match_tile.dart @@ -10,12 +10,15 @@ import 'package:intl/intl.dart'; /// creation date, associated group, winner, and players. /// - [match]: The match data to be displayed. /// - [onTap]: The callback invoked when the tile is tapped. +/// - [width]: Optional width for the tile. +/// - [compact]: Whether to display the tile in a compact mode class MatchTile extends StatefulWidget { const MatchTile({ super.key, required this.match, required this.onTap, this.width, + this.compact = false, }); /// The match data to be displayed. @@ -24,8 +27,12 @@ class MatchTile extends StatefulWidget { /// The callback invoked when the tile is tapped. final VoidCallback onTap; + /// Optional width for the tile. final double? width; + /// Whether to display the tile in a compact mode + final bool compact; + @override State createState() => _MatchTileState(); } @@ -88,7 +95,22 @@ class _MatchTileState extends State { const SizedBox(width: 6), Expanded( child: Text( - group.name, + '${group.name}${widget.match.players != null ? ' + ${widget.match.players?.length}' : ''}', + style: const TextStyle(fontSize: 14, color: Colors.grey), + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + const SizedBox(height: 12), + ] else if (widget.compact) ...[ + Row( + children: [ + const Icon(Icons.person, size: 16, color: Colors.grey), + const SizedBox(width: 6), + Expanded( + child: Text( + '${widget.match.players!.length} ${loc.players}', style: const TextStyle(fontSize: 14, color: Colors.grey), overflow: TextOverflow.ellipsis, ), @@ -135,9 +157,46 @@ class _MatchTileState extends State { ), ), const SizedBox(height: 12), + ] else ...[ + Container( + padding: const EdgeInsets.symmetric( + vertical: 8, + horizontal: 12, + ), + decoration: BoxDecoration( + color: Colors.amber.withValues(alpha: 0.1), + borderRadius: BorderRadius.circular(8), + border: Border.all( + color: Colors.amber.withValues(alpha: 0.3), + width: 1, + ), + ), + child: Row( + children: [ + const Icon( + Icons.watch_later, + size: 20, + color: Colors.amber, + ), + const SizedBox(width: 8), + Expanded( + child: Text( + loc.match_in_progress, + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.w600, + color: CustomTheme.textColor, + ), + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + ), + const SizedBox(height: 12), ], - if (_allPlayers.isNotEmpty) ...[ + if (_allPlayers.isNotEmpty && widget.compact == false) ...[ Text( loc.players, style: const TextStyle( From afb7a5f1d4c18be253b15b6acb2d8187b9ae9b00 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 9 Jan 2026 20:15:50 +0100 Subject: [PATCH 04/16] MatchTiles only show when recent games are available --- .../views/main_menu/home_view.dart | 66 ++++++++++--------- pubspec.yaml | 2 +- 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 6599b98..a94eae4 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -86,40 +86,42 @@ class _HomeViewState extends State { ), ], ), - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: MatchTile( - compact: true, - width: constraints.maxWidth * 0.95, - match: recentMatches[0], - onTap: () { - Navigator.of(context).push( - MaterialPageRoute( - fullscreenDialog: true, - builder: (context) => - MatchResultView(match: recentMatches[0]), - ), - ); - }, + if (recentMatches.isNotEmpty) + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: MatchTile( + compact: true, + width: constraints.maxWidth * 0.95, + match: recentMatches[0], + onTap: () { + Navigator.of(context).push( + MaterialPageRoute( + fullscreenDialog: true, + builder: (context) => + MatchResultView(match: recentMatches[0]), + ), + ); + }, + ), ), - ), - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: MatchTile( - compact: true, - width: constraints.maxWidth * 0.95, - match: recentMatches[1], - onTap: () { - Navigator.of(context).push( - MaterialPageRoute( - fullscreenDialog: true, - builder: (context) => - MatchResultView(match: recentMatches[1]), - ), - ); - }, + if (recentMatches.length > 1) + Padding( + padding: const EdgeInsets.only(top: 8.0), + child: MatchTile( + compact: true, + width: constraints.maxWidth * 0.95, + match: recentMatches[1], + onTap: () { + Navigator.of(context).push( + MaterialPageRoute( + fullscreenDialog: true, + builder: (context) => + MatchResultView(match: recentMatches[1]), + ), + ); + }, + ), ), - ), /*Padding( padding: const EdgeInsets.symmetric(vertical: 16.0), child: InfoTile( diff --git a/pubspec.yaml b/pubspec.yaml index 993ef78..835cabf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.1+23 +version: 0.0.1+43 environment: sdk: ^3.8.1 From 644728a9dfffb7d0c1ec26f77379a475fe9d49a5 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 9 Jan 2026 20:18:52 +0100 Subject: [PATCH 05/16] Removed unneccesary code --- .../views/main_menu/home_view.dart | 92 ------------------- pubspec.yaml | 2 +- 2 files changed, 1 insertion(+), 93 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index a94eae4..c9825c8 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -122,78 +122,6 @@ class _HomeViewState extends State { }, ), ), - /*Padding( - padding: const EdgeInsets.symmetric(vertical: 16.0), - child: InfoTile( - width: constraints.maxWidth * 0.95, - title: loc.recent_matches, - icon: Icons.timer, - content: Padding( - padding: const EdgeInsets.symmetric(horizontal: 40.0), - child: Visibility( - visible: !isLoading && loadedRecentMatches.isNotEmpty, - replacement: Center( - heightFactor: 12, - child: Text( - AppLocalizations.of( - context, - ).no_recent_matches_available, - ), - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - MatchSummaryTile( - matchTitle: recentMatches[0].name, - game: 'Winner', - ruleset: 'Ruleset', - players: _getPlayerText( - recentMatches[0], - context, - ), - winner: recentMatches[0].winner == null - ? AppLocalizations.of( - context, - ).match_in_progress - : recentMatches[0].winner!.name, - ), - const Padding( - padding: EdgeInsets.symmetric(vertical: 8.0), - child: Divider(), - ), - if (loadedRecentMatches.length > 1) ...[ - MatchSummaryTile( - matchTitle: recentMatches[1].name, - game: 'Winner', - ruleset: 'Ruleset', - players: _getPlayerText( - recentMatches[1], - context, - ), - winner: recentMatches[1].winner == null - ? AppLocalizations.of( - context, - ).match_in_progress - : recentMatches[1].winner!.name, - ), - const SizedBox(height: 8), - ] else ...[ - Center( - heightFactor: 5.35, - child: Text( - AppLocalizations.of( - context, - ).no_second_match_available, - ), - ), - ], - ], - ), - ), - ), - ), - ),*/ Padding( padding: const EdgeInsets.only(top: 8.0), child: InfoTile( @@ -271,11 +199,6 @@ class _HomeViewState extends State { ..sort((a, b) => b.createdAt.compareTo(a.createdAt))) .take(2) .toList(); - if (loadedRecentMatches.length < 2) { - recentMatches.add( - Match(name: 'Dummy Match', winner: null, group: null, players: null), - ); - } if (mounted) { setState(() { isLoading = false; @@ -283,19 +206,4 @@ class _HomeViewState extends State { } }); } - - /// Generates a text representation of the players in the match. - /// If the match has a group, it returns the group name and the number of additional players. - /// If there is no group, it returns the count of players. - String _getPlayerText(Match game, context) { - final loc = AppLocalizations.of(context); - if (game.group == null) { - final playerCount = game.players?.length ?? 0; - return loc.players_count(playerCount); - } - if (game.players == null || game.players!.isEmpty) { - return game.group!.name; - } - return '${game.group!.name} + ${game.players!.length}'; - } } diff --git a/pubspec.yaml b/pubspec.yaml index 835cabf..5887957 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.1+43 +version: 0.0.2+47 environment: sdk: ^3.8.1 From 2c4cef76d8fb0e8fe96ecd6b7213fd1235467500 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Fri, 9 Jan 2026 23:55:29 +0100 Subject: [PATCH 06/16] Reimplemented info tile & match tile into it --- .../views/main_menu/home_view.dart | 80 ++++++++++--------- pubspec.yaml | 2 +- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index c9825c8..118c0e1 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -34,7 +34,7 @@ class _HomeViewState extends State { /// Recent matches to display, initially filled with skeleton matches List recentMatches = List.filled( - 2, + 3, Match( name: 'Skeleton Match', group: Group( @@ -44,7 +44,6 @@ class _HomeViewState extends State { Player(name: 'Skeleton Player 2'), ], ), - winner: Player(name: 'Skeleton Player 1'), ), ); @@ -86,44 +85,46 @@ class _HomeViewState extends State { ), ], ), - if (recentMatches.isNotEmpty) - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: MatchTile( - compact: true, - width: constraints.maxWidth * 0.95, - match: recentMatches[0], - onTap: () { - Navigator.of(context).push( - MaterialPageRoute( - fullscreenDialog: true, - builder: (context) => - MatchResultView(match: recentMatches[0]), - ), - ); - }, - ), - ), - if (recentMatches.length > 1) - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: MatchTile( - compact: true, - width: constraints.maxWidth * 0.95, - match: recentMatches[1], - onTap: () { - Navigator.of(context).push( - MaterialPageRoute( - fullscreenDialog: true, - builder: (context) => - MatchResultView(match: recentMatches[1]), - ), - ); - }, - ), - ), Padding( - padding: const EdgeInsets.only(top: 8.0), + padding: const EdgeInsets.symmetric(vertical: 16.0), + child: InfoTile( + width: constraints.maxWidth * 0.95, + title: loc.recent_matches, + icon: Icons.history_rounded, + content: Column( + children: [ + if (recentMatches.isNotEmpty) + for (Match match in recentMatches) + Padding( + padding: const EdgeInsets.symmetric( + vertical: 6.0, + ), + child: MatchTile( + compact: true, + width: constraints.maxWidth * 0.9, + match: match, + onTap: () { + Navigator.of(context).push( + MaterialPageRoute( + fullscreenDialog: true, + builder: (context) => + MatchResultView(match: match), + ), + ); + }, + ), + ) + else + Center( + heightFactor: 5, + child: Text(loc.no_recent_matches_available), + ), + ], + ), + ), + ), + Padding( + padding: EdgeInsets.zero, child: InfoTile( width: constraints.maxWidth * 0.95, title: loc.quick_create, @@ -173,6 +174,7 @@ class _HomeViewState extends State { ), ), ), + SizedBox(height: MediaQuery.paddingOf(context).bottom), ], ), ), diff --git a/pubspec.yaml b/pubspec.yaml index 5887957..2474f78 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.2+47 +version: 0.0.2+57 environment: sdk: ^3.8.1 From 1be86bc3c5ec15ffd4d030a9906728cc4d950aa2 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 13:57:46 +0100 Subject: [PATCH 07/16] Added theme box design --- lib/presentation/widgets/tiles/match_tile.dart | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/presentation/widgets/tiles/match_tile.dart b/lib/presentation/widgets/tiles/match_tile.dart index 59ee0b9..88ae1f1 100644 --- a/lib/presentation/widgets/tiles/match_tile.dart +++ b/lib/presentation/widgets/tiles/match_tile.dart @@ -58,11 +58,7 @@ class _MatchTileState extends State { margin: EdgeInsets.zero, width: widget.width, padding: const EdgeInsets.all(12), - decoration: BoxDecoration( - color: CustomTheme.boxColor, - border: Border.all(color: CustomTheme.boxBorder), - borderRadius: BorderRadius.circular(12), - ), + decoration: CustomTheme.standardBoxDecoration, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ From d22855fc1a2d3a109a1e645fdbf005723d74364c Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 13:57:54 +0100 Subject: [PATCH 08/16] Fixed match view tile width --- .../main_menu/match_view/match_view.dart | 33 ++++++++++--------- pubspec.yaml | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lib/presentation/views/main_menu/match_view/match_view.dart b/lib/presentation/views/main_menu/match_view/match_view.dart index 108b592..a0b88d0 100644 --- a/lib/presentation/views/main_menu/match_view/match_view.dart +++ b/lib/presentation/views/main_menu/match_view/match_view.dart @@ -78,22 +78,25 @@ class _MatchViewState extends State { height: MediaQuery.paddingOf(context).bottom - 20, ); } - return Padding( - padding: const EdgeInsets.only(bottom: 12.0), - child: MatchTile( - onTap: () async { - Navigator.push( - context, - CupertinoPageRoute( - fullscreenDialog: true, - builder: (context) => MatchResultView( - match: matches[index], - onWinnerChanged: loadGames, + return Center( + child: Padding( + padding: const EdgeInsets.only(bottom: 12.0), + child: MatchTile( + width: MediaQuery.sizeOf(context).width * 0.95, + onTap: () async { + Navigator.push( + context, + CupertinoPageRoute( + fullscreenDialog: true, + builder: (context) => MatchResultView( + match: matches[index], + onWinnerChanged: loadGames, + ), ), - ), - ); - }, - match: matches[index], + ); + }, + match: matches[index], + ), ), ); }, diff --git a/pubspec.yaml b/pubspec.yaml index 2474f78..ff49b8d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.2+57 +version: 0.0.2+70 environment: sdk: ^3.8.1 From 595cf6ead07a7548fd1e073518ab30e55568eb65 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 14:20:09 +0100 Subject: [PATCH 09/16] Changed skeleton data from 3 to 2 tiles --- lib/presentation/views/main_menu/home_view.dart | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 118c0e1..29da229 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -34,7 +34,7 @@ class _HomeViewState extends State { /// Recent matches to display, initially filled with skeleton matches List recentMatches = List.filled( - 3, + 2, Match( name: 'Skeleton Match', group: Group( diff --git a/pubspec.yaml b/pubspec.yaml index ff49b8d..1255a27 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.2+70 +version: 0.0.2+73 environment: sdk: ^3.8.1 From c4f67498827285fabe69a72ae8ea47f6b17faf7f Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 15:13:56 +0100 Subject: [PATCH 10/16] Fixed state issue in home view --- lib/presentation/views/main_menu/home_view.dart | 5 +++-- pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 29da229..f59831c 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -103,14 +103,15 @@ class _HomeViewState extends State { compact: true, width: constraints.maxWidth * 0.9, match: match, - onTap: () { - Navigator.of(context).push( + onTap: () async { + await Navigator.of(context).push( MaterialPageRoute( fullscreenDialog: true, builder: (context) => MatchResultView(match: match), ), ); + loadHomeViewData(); }, ), ) diff --git a/pubspec.yaml b/pubspec.yaml index 1255a27..2e4273b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.2+73 +version: 0.0.2+75 environment: sdk: ^3.8.1 From 830a64b5dda0767b0b26de73893195888513a6bd Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 15:15:52 +0100 Subject: [PATCH 11/16] Small changes --- lib/presentation/views/main_menu/match_view/match_view.dart | 6 ++++-- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/presentation/views/main_menu/match_view/match_view.dart b/lib/presentation/views/main_menu/match_view/match_view.dart index 94dbb77..ecfa9ca 100644 --- a/lib/presentation/views/main_menu/match_view/match_view.dart +++ b/lib/presentation/views/main_menu/match_view/match_view.dart @@ -1,4 +1,5 @@ import 'dart:core' hide Match; + import 'package:flutter/material.dart'; import 'package:game_tracker/core/adaptive_page_route.dart'; import 'package:game_tracker/core/constants.dart'; @@ -111,8 +112,9 @@ class _MatchViewState extends State { Navigator.push( context, adaptivePageRoute( - builder: (context) => - CreateMatchView(onWinnerChanged: loadGames)) + builder: (context) => + CreateMatchView(onWinnerChanged: loadGames), + ), ); }, ), diff --git a/pubspec.yaml b/pubspec.yaml index 2e4273b..629a028 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.2+75 +version: 0.0.2+92 environment: sdk: ^3.8.1 From 1c07346aaf8fec6a17e4567606a03446c36efddc Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 15:16:09 +0100 Subject: [PATCH 12/16] Updated version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 629a028..b6f2ed3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.2+92 +version: 0.0.3+92 environment: sdk: ^3.8.1 From 2ef8eb65346f66aa67ac53fa56ff0fe31062f71f Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 15:53:31 +0100 Subject: [PATCH 13/16] Made winner field non final --- lib/data/dto/match.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/data/dto/match.dart b/lib/data/dto/match.dart index fcb4dae..9570f66 100644 --- a/lib/data/dto/match.dart +++ b/lib/data/dto/match.dart @@ -9,7 +9,7 @@ class Match { final String name; final List? players; final Group? group; - final Player? winner; + Player? winner; Match({ String? id, From 2ef671884d4cfd30b60fa48b6b22351105a387e8 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 15:54:11 +0100 Subject: [PATCH 14/16] New method for specific winner refreshing --- .../views/main_menu/home_view.dart | 18 ++++++++++++++++-- pubspec.yaml | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index f59831c..1b07839 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -111,7 +111,7 @@ class _HomeViewState extends State { MatchResultView(match: match), ), ); - loadHomeViewData(); + await updatedWinnerinRecentMatches(match.id); }, ), ) @@ -186,7 +186,7 @@ class _HomeViewState extends State { /// Loads the data for the HomeView from the database. /// This includes the match count, group count, and recent matches. - void loadHomeViewData() { + Future loadHomeViewData() async { final db = Provider.of(context, listen: false); Future.wait([ db.matchDao.getMatchCount(), @@ -209,4 +209,18 @@ class _HomeViewState extends State { } }); } + + /// Updates the winner information for a specific match in the recent matches list. + Future updatedWinnerinRecentMatches(String matchId) async { + final db = Provider.of(context, listen: false); + final winner = await db.matchDao.getWinner(matchId: matchId); + print('Winner for match $matchId: ${winner?.name}'); + + final matchIndex = recentMatches.indexWhere((match) => match.id == matchId); + if (matchIndex != -1) { + setState(() { + recentMatches[matchIndex].winner = winner; + }); + } + } } diff --git a/pubspec.yaml b/pubspec.yaml index b6f2ed3..7ace12f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.3+92 +version: 0.0.3+93 environment: sdk: ^3.8.1 From d34990ed50b537fdeefd07f7e6ca0cd9eac2bc95 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 15:54:41 +0100 Subject: [PATCH 15/16] Removed print --- lib/presentation/views/main_menu/home_view.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 1b07839..29d6d67 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -214,8 +214,6 @@ class _HomeViewState extends State { Future updatedWinnerinRecentMatches(String matchId) async { final db = Provider.of(context, listen: false); final winner = await db.matchDao.getWinner(matchId: matchId); - print('Winner for match $matchId: ${winner?.name}'); - final matchIndex = recentMatches.indexWhere((match) => match.id == matchId); if (matchIndex != -1) { setState(() { From f2a4327166f26107f6ac39743eedc8626d9ff1bf Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 10 Jan 2026 15:55:19 +0100 Subject: [PATCH 16/16] Implemented adaptive page route --- lib/presentation/views/main_menu/home_view.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 29d6d67..affbe92 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:game_tracker/core/adaptive_page_route.dart'; import 'package:game_tracker/core/constants.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; @@ -105,7 +106,7 @@ class _HomeViewState extends State { match: match, onTap: () async { await Navigator.of(context).push( - MaterialPageRoute( + adaptivePageRoute( fullscreenDialog: true, builder: (context) => MatchResultView(match: match),