temporarily removed group_match_test.dart

Reviewed-on: #149
Reviewed-by: Mathis Kirchner <mathis.kirchner.mk@gmail.com>

lib/core/adaptive_page_route.dart

@@ -0,0 +1,19 @@
+import 'dart:io';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+Route<T> adaptivePageRoute<T>({
+  required Widget Function(BuildContext) builder,
+  bool fullscreenDialog = false,
+}) {
+  if (Platform.isIOS) {
+    return CupertinoPageRoute<T>(
+      builder: builder,
+      fullscreenDialog: fullscreenDialog,
+    );
+  }
+  return MaterialPageRoute<T>(
+    builder: builder,
+    fullscreenDialog: fullscreenDialog,
+  );
+}

lib/data/dao/game_dao.dart

@@ -0,0 +1,179 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/db/tables/game_table.dart';
+import 'package:game_tracker/data/dto/game.dart';
+
+part 'game_dao.g.dart';
+
+@DriftAccessor(tables: [GameTable])
+class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
+  GameDao(super.db);
+
+  /// Retrieves all games from the database.
+  Future<List<Game>> getAllGames() async {
+    final query = select(gameTable);
+    final result = await query.get();
+    return result
+        .map(
+          (row) => Game(
+            id: row.id,
+            name: row.name,
+            ruleset: row.ruleset,
+            description: row.description,
+            color: row.color != null ? int.tryParse(row.color!) : null,
+            icon: row.icon,
+            createdAt: row.createdAt,
+          ),
+        )
+        .toList();
+  }
+
+  /// Retrieves a [Game] by its [gameId].
+  Future<Game> getGameById({required String gameId}) async {
+    final query = select(gameTable)..where((g) => g.id.equals(gameId));
+    final result = await query.getSingle();
+    return Game(
+      id: result.id,
+      name: result.name,
+      ruleset: result.ruleset,
+      description: result.description,
+      color: result.color != null ? int.tryParse(result.color!) : null,
+      icon: result.icon,
+      createdAt: result.createdAt,
+    );
+  }
+
+  /// Adds a new [game] to the database.
+  /// If a game with the same ID already exists, no action is taken.
+  /// Returns `true` if the game was added, `false` otherwise.
+  Future<bool> addGame({required Game game}) async {
+    if (!await gameExists(gameId: game.id)) {
+      await into(gameTable).insert(
+        GameTableCompanion.insert(
+          id: game.id,
+          name: game.name,
+          ruleset: game.ruleset ?? '',
+          description: Value(game.description),
+          color: Value(game.color?.toString()),
+          icon: Value(game.icon),
+          createdAt: game.createdAt,
+        ),
+        mode: InsertMode.insertOrReplace,
+      );
+      return true;
+    }
+    return false;
+  }
+
+  /// Adds multiple [games] to the database in a batch operation.
+  /// Uses insertOrIgnore to avoid overwriting existing games.
+  Future<bool> addGamesAsList({required List<Game> games}) async {
+    if (games.isEmpty) return false;
+
+    await db.batch(
+      (b) => b.insertAll(
+        gameTable,
+        games
+            .map(
+              (game) => GameTableCompanion.insert(
+                id: game.id,
+                name: game.name,
+                ruleset: game.ruleset ?? '',
+                description: Value(game.description),
+                color: Value(game.color?.toString()),
+                icon: Value(game.icon),
+                createdAt: game.createdAt,
+              ),
+            )
+            .toList(),
+        mode: InsertMode.insertOrIgnore,
+      ),
+    );
+
+    return true;
+  }
+
+  /// Deletes the game with the given [gameId] from the database.
+  /// Returns `true` if the game was deleted, `false` if the game did not exist.
+  Future<bool> deleteGame({required String gameId}) async {
+    final query = delete(gameTable)..where((g) => g.id.equals(gameId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Checks if a game with the given [gameId] exists in the database.
+  /// Returns `true` if the game exists, `false` otherwise.
+  Future<bool> gameExists({required String gameId}) async {
+    final query = select(gameTable)..where((g) => g.id.equals(gameId));
+    final result = await query.getSingleOrNull();
+    return result != null;
+  }
+
+  /// Updates the name of the game with the given [gameId] to [newName].
+  Future<void> updateGameName({
+    required String gameId,
+    required String newName,
+  }) async {
+    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
+      GameTableCompanion(name: Value(newName)),
+    );
+  }
+
+  /// Updates the ruleset of the game with the given [gameId].
+  Future<void> updateGameRuleset({
+    required String gameId,
+    required String newRuleset,
+  }) async {
+    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
+      GameTableCompanion(ruleset: Value(newRuleset)),
+    );
+  }
+
+  /// Updates the description of the game with the given [gameId].
+  Future<void> updateGameDescription({
+    required String gameId,
+    required String? newDescription,
+  }) async {
+    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
+      GameTableCompanion(description: Value(newDescription)),
+    );
+  }
+
+  /// Updates the color of the game with the given [gameId].
+  Future<void> updateGameColor({
+    required String gameId,
+    required int? newColor,
+  }) async {
+    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
+      GameTableCompanion(color: Value(newColor?.toString())),
+    );
+  }
+
+  /// Updates the icon of the game with the given [gameId].
+  Future<void> updateGameIcon({
+    required String gameId,
+    required String? newIcon,
+  }) async {
+    await (update(gameTable)..where((g) => g.id.equals(gameId))).write(
+      GameTableCompanion(icon: Value(newIcon)),
+    );
+  }
+
+  /// Retrieves the total count of games in the database.
+  Future<int> getGameCount() async {
+    final count =
+        await (selectOnly(gameTable)..addColumns([gameTable.id.count()]))
+            .map((row) => row.read(gameTable.id.count()))
+            .getSingle();
+    return count ?? 0;
+  }
+
+  /// Deletes all games from the database.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> deleteAllGames() async {
+    final query = delete(gameTable);
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+}
+

lib/data/dao/game_dao.g.dart

@@ -0,0 +1,8 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'game_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$GameDaoMixin on DatabaseAccessor<AppDatabase> {
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+}

lib/data/dao/group_dao.dart

@@ -23,6 +23,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
         return Group(
           id: groupData.id,
           name: groupData.name,
+          description: groupData.description,
           members: members,
           createdAt: groupData.createdAt,
         );
@@ -42,6 +43,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     return Group(
       id: result.id,
       name: result.name,
+      description: result.description,
       members: members,
       createdAt: result.createdAt,
     );
@@ -56,6 +58,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
           GroupTableCompanion.insert(
             id: group.id,
             name: group.name,
+            description: Value(group.description),
             createdAt: group.createdAt,
           ),
           mode: InsertMode.insertOrReplace,
@@ -105,6 +108,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                 (group) => GroupTableCompanion.insert(
                   id: group.id,
                   name: group.name,
+                  description: Value(group.description),
                   createdAt: group.createdAt,
                 ),
               )
@@ -132,6 +136,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
+                    description: Value(p.description),
                     createdAt: p.createdAt,
                   ),
                 )

lib/data/dao/group_match_dao.dart

@@ -1,98 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/group_match_table.dart';
-import 'package:game_tracker/data/dto/group.dart';
-
-part 'group_match_dao.g.dart';
-
-@DriftAccessor(tables: [GroupMatchTable])
-class GroupMatchDao extends DatabaseAccessor<AppDatabase>
-    with _$GroupMatchDaoMixin {
-  GroupMatchDao(super.db);
-
-  /// Associates a group with a match by inserting a record into the
-  /// [GroupMatchTable].
-  Future<void> addGroupToMatch({
-    required String matchId,
-    required String groupId,
-  }) async {
-    if (await matchHasGroup(matchId: matchId)) {
-      throw Exception('Match already has a group');
-    }
-    await into(groupMatchTable).insert(
-      GroupMatchTableCompanion.insert(groupId: groupId, matchId: matchId),
-      mode: InsertMode.insertOrIgnore,
-    );
-  }
-
-  /// Retrieves the [Group] associated with the given [matchId].
-  /// Returns `null` if no group is found.
-  Future<Group?> getGroupOfMatch({required String matchId}) async {
-    final result = await (select(
-      groupMatchTable,
-    )..where((g) => g.matchId.equals(matchId))).getSingleOrNull();
-
-    if (result == null) {
-      return null;
-    }
-
-    final group = await db.groupDao.getGroupById(groupId: result.groupId);
-    return group;
-  }
-
-  /// Checks if there is a group associated with the given [matchId].
-  /// Returns `true` if there is a group, otherwise `false`.
-  Future<bool> matchHasGroup({required String matchId}) async {
-    final count =
-        await (selectOnly(groupMatchTable)
-              ..where(groupMatchTable.matchId.equals(matchId))
-              ..addColumns([groupMatchTable.groupId.count()]))
-            .map((row) => row.read(groupMatchTable.groupId.count()))
-            .getSingle();
-    return (count ?? 0) > 0;
-  }
-
-  /// Checks if a specific group is associated with a specific match.
-  /// Returns `true` if the group is in the match, otherwise `false`.
-  Future<bool> isGroupInMatch({
-    required String matchId,
-    required String groupId,
-  }) async {
-    final count =
-        await (selectOnly(groupMatchTable)
-              ..where(
-                groupMatchTable.matchId.equals(matchId) &
-                    groupMatchTable.groupId.equals(groupId),
-              )
-              ..addColumns([groupMatchTable.groupId.count()]))
-            .map((row) => row.read(groupMatchTable.groupId.count()))
-            .getSingle();
-    return (count ?? 0) > 0;
-  }
-
-  /// Removes the association of a group from a match based on [groupId] and
-  /// [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> removeGroupFromMatch({
-    required String matchId,
-    required String groupId,
-  }) async {
-    final query = delete(groupMatchTable)
-      ..where((g) => g.matchId.equals(matchId) & g.groupId.equals(groupId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Updates the group associated with a match to [newGroupId] based on
-  /// [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateGroupOfMatch({
-    required String matchId,
-    required String newGroupId,
-  }) async {
-    final updatedRows =
-        await (update(groupMatchTable)..where((g) => g.matchId.equals(matchId)))
-            .write(GroupMatchTableCompanion(groupId: Value(newGroupId)));
-    return updatedRows > 0;
-  }
-}

lib/data/dao/group_match_dao.g.dart

@@ -1,10 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'group_match_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$GroupMatchDaoMixin on DatabaseAccessor<AppDatabase> {
-  $GroupTableTable get groupTable => attachedDatabase.groupTable;
-  $MatchTableTable get matchTable => attachedDatabase.matchTable;
-  $GroupMatchTableTable get groupMatchTable => attachedDatabase.groupMatchTable;
-}

lib/data/dao/match_dao.dart

@@ -1,13 +1,17 @@
 import 'package:drift/drift.dart';
 import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/db/tables/game_table.dart';
+import 'package:game_tracker/data/db/tables/group_table.dart';
 import 'package:game_tracker/data/db/tables/match_table.dart';
+import 'package:game_tracker/data/db/tables/player_match_table.dart';
+import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
 
 part 'match_dao.g.dart';
 
-@DriftAccessor(tables: [MatchTable])
+@DriftAccessor(tables: [MatchTable, GameTable, GroupTable, PlayerMatchTable])
 class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   MatchDao(super.db);
 
@@ -18,20 +22,22 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
 
     return Future.wait(
       result.map((row) async {
-        final group = await db.groupMatchDao.getGroupOfMatch(matchId: row.id);
+        final game = await db.gameDao.getGameById(gameId: row.gameId);
+        Group? group;
+        if (row.groupId != null) {
+          group = await db.groupDao.getGroupById(groupId: row.groupId!);
+        }
         final players = await db.playerMatchDao.getPlayersOfMatch(
           matchId: row.id,
         );
-        final winner = row.winnerId != null
-            ? await db.playerDao.getPlayerById(playerId: row.winnerId!)
-            : null;
         return Match(
           id: row.id,
-          name: row.name,
+          name: row.name ?? '',
+          game: game,
           group: group,
           players: players,
+          notes: row.notes,
           createdAt: row.createdAt,
-          winner: winner,
         );
       }),
     );
@@ -42,100 +48,110 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     final query = select(matchTable)..where((g) => g.id.equals(matchId));
     final result = await query.getSingle();
 
+    final game = await db.gameDao.getGameById(gameId: result.gameId);
+
+    Group? group;
+    if (result.groupId != null) {
+      group = await db.groupDao.getGroupById(groupId: result.groupId!);
+    }
+
     List<Player>? players;
     if (await db.playerMatchDao.matchHasPlayers(matchId: matchId)) {
       players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
     }
-    Group? group;
-    if (await db.groupMatchDao.matchHasGroup(matchId: matchId)) {
-      group = await db.groupMatchDao.getGroupOfMatch(matchId: matchId);
-    }
-    Player? winner;
-    if (result.winnerId != null) {
-      winner = await db.playerDao.getPlayerById(playerId: result.winnerId!);
-    }
 
     return Match(
       id: result.id,
-      name: result.name,
+      name: result.name ?? '',
-      players: players,
+      game: game,
       group: group,
-      winner: winner,
+      players: players,
+      notes: result.notes,
       createdAt: result.createdAt,
     );
   }
 
-  /// Adds a new [Match] to the database. Also adds players and group
+  /// Adds a new [Match] to the database. Also adds players associations.
-  /// associations. This method assumes that the players and groups added to
+  /// This method assumes that the game and group (if any) are already present
-  /// this match are already present in the database.
+  /// in the database.
   Future<void> addMatch({required Match match}) async {
+    if (match.game == null) {
+      throw ArgumentError('Match must have a game associated with it');
+    }
+
     await db.transaction(() async {
       await into(matchTable).insert(
         MatchTableCompanion.insert(
           id: match.id,
-          name: match.name,
+          gameId: match.game!.id,
-          winnerId: Value(match.winner?.id),
+          groupId: Value(match.group?.id),
+          name: Value(match.name),
+          notes: Value(match.notes),
           createdAt: match.createdAt,
         ),
         mode: InsertMode.insertOrReplace,
       );
 
       if (match.players != null) {
-        for (final p in match.players ?? []) {
+        for (final p in match.players!) {
           await db.playerMatchDao.addPlayerToMatch(
             matchId: match.id,
             playerId: p.id,
           );
         }
       }
-
-      if (match.group != null) {
-        await db.groupMatchDao.addGroupToMatch(
-          matchId: match.id,
-          groupId: match.group!.id,
-        );
-      }
     });
   }
 
-  /// Adds multiple [Match]s to the database in a batch operation.
+  /// Adds multiple [Match]es to the database in a batch operation.
   /// Also adds associated players and groups if they exist.
   /// If the [matches] list is empty, the method returns immediately.
-  /// This Method should only be used to import matches from a different device.
+  /// This method should only be used to import matches from a different device.
   Future<void> addMatchAsList({required List<Match> matches}) async {
     if (matches.isEmpty) return;
     await db.transaction(() async {
-      // Add all matches in batch
+      // Add all games first (deduplicated)
+      final uniqueGames = <String, Game>{};
+      for (final match in matches) {
+        if (match.game != null) {
+          uniqueGames[match.game!.id] = match.game!;
+        }
+      }
+
+      if (uniqueGames.isNotEmpty) {
         await db.batch(
           (b) => b.insertAll(
-          matchTable,
+            db.gameTable,
-          matches
+            uniqueGames.values
                 .map(
-                (match) => MatchTableCompanion.insert(
+                  (game) => GameTableCompanion.insert(
-                  id: match.id,
+                    id: game.id,
-                  name: match.name,
+                    name: game.name,
-                  createdAt: match.createdAt,
+                    ruleset: game.ruleset ?? '',
-                  winnerId: Value(match.winner?.id),
+                    description: Value(game.description),
+                    color: Value(game.color?.toString()),
+                    icon: Value(game.icon),
+                    createdAt: game.createdAt,
                   ),
                 )
                 .toList(),
-          mode: InsertMode.insertOrReplace,
+            mode: InsertMode.insertOrIgnore,
           ),
         );
+      }
 
       // Add all groups of the matches in batch
-      // Using insertOrIgnore to avoid overwriting existing groups (which would
-      // trigger cascade deletes on player_group associations)
       await db.batch(
         (b) => b.insertAll(
           db.groupTable,
           matches
               .where((match) => match.group != null)
               .map(
-                (matches) => GroupTableCompanion.insert(
+                (match) => GroupTableCompanion.insert(
-                  id: matches.group!.id,
+                  id: match.group!.id,
-                  name: matches.group!.name,
+                  name: match.group!.name,
-                  createdAt: matches.group!.createdAt,
+                  description: Value(match.group!.description),
+                  createdAt: match.group!.createdAt,
                 ),
               )
               .toList(),
@@ -143,6 +159,27 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         ),
       );
 
+      // Add all matches in batch
+      await db.batch(
+        (b) => b.insertAll(
+          matchTable,
+          matches
+              .where((match) => match.game != null)
+              .map(
+                (match) => MatchTableCompanion.insert(
+                  id: match.id,
+                  gameId: match.game!.id,
+                  groupId: Value(match.group?.id),
+                  name: Value(match.name),
+                  notes: Value(match.notes),
+                  createdAt: match.createdAt,
+                ),
+              )
+              .toList(),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
+
       // Add all players of the matches in batch (unique)
       final uniquePlayers = <String, Player>{};
       for (final match in matches) {
@@ -160,8 +197,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       }
 
       if (uniquePlayers.isNotEmpty) {
-        // Using insertOrIgnore to avoid triggering cascade deletes on
-        // player_group/player_match associations when players already exist
         await db.batch(
           (b) => b.insertAll(
             db.playerTable,
@@ -170,6 +205,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
+                    description: Value(p.description),
                     createdAt: p.createdAt,
                   ),
                 )
@@ -183,12 +219,13 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       await db.batch((b) {
         for (final match in matches) {
           if (match.players != null) {
-            for (final p in match.players ?? []) {
+            for (final p in match.players!) {
               b.insert(
                 db.playerMatchTable,
                 PlayerMatchTableCompanion.insert(
                   matchId: match.id,
                   playerId: p.id,
+                  score: 0,
                 ),
                 mode: InsertMode.insertOrIgnore,
               );
@@ -214,22 +251,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
           }
         }
       });
-
-      // Add all group-match associations in batch
-      await db.batch((b) {
-        for (final match in matches) {
-          if (match.group != null) {
-            b.insert(
-              db.groupMatchTable,
-              GroupMatchTableCompanion.insert(
-                matchId: match.id,
-                groupId: match.group!.id,
-              ),
-              mode: InsertMode.insertOrIgnore,
-            );
-          }
-        }
-      });
     });
   }
 
@@ -266,52 +287,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     return rowsAffected > 0;
   }
 
-  /// Sets the winner of the match with the given [matchId] to the player with
+  /// Updates the notes of the match with the given [matchId].
-  /// the given [winnerId].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> setWinner({
+  Future<bool> updateMatchNotes({
     required String matchId,
-    required String winnerId,
+    required String? notes,
   }) async {
     final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
-      MatchTableCompanion(winnerId: Value(winnerId)),
+      MatchTableCompanion(notes: Value(notes)),
     );
     return rowsAffected > 0;
   }
 
-  /// Retrieves the winner of the match with the given [matchId].
+  /// Changes the name of the match with the given [matchId] to [newName].
-  /// Returns the [Player] who won the match, or `null` if no winner is set.
-  Future<Player?> getWinner({required String matchId}) async {
-    final query = select(matchTable)..where((g) => g.id.equals(matchId));
-    final result = await query.getSingleOrNull();
-    if (result == null || result.winnerId == null) {
-      return null;
-    }
-    final winner = await db.playerDao.getPlayerById(playerId: result.winnerId!);
-    return winner;
-  }
-
-  /// Removes the winner of the match with the given [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> removeWinner({required String matchId}) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      const MatchTableCompanion(winnerId: Value(null)),
-    );
-    return rowsAffected > 0;
-  }
-
-  /// Checks if the match with the given [matchId] has a winner set.
-  /// Returns `true` if a winner is set, otherwise `false`.
-  Future<bool> hasWinner({required String matchId}) async {
-    final query = select(matchTable)
-      ..where((g) => g.id.equals(matchId) & g.winnerId.isNotNull());
-    final result = await query.getSingleOrNull();
-    return result != null;
-  }
-
-  /// Changes the title of the match with the given [matchId] to [newName].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
   Future<bool> updateMatchName({
     required String matchId,
@@ -323,4 +312,67 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     );
     return rowsAffected > 0;
   }
+
+  /// Updates the game of the match with the given [matchId].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateMatchGame({
+    required String matchId,
+    required String gameId,
+  }) async {
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
+    final rowsAffected = await query.write(
+      MatchTableCompanion(gameId: Value(gameId)),
+    );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the group of the match with the given [matchId].
+  /// Pass null to remove the group association.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateMatchGroup({
+    required String matchId,
+    required String? groupId,
+  }) async {
+    final query = update(matchTable)..where((g) => g.id.equals(matchId));
+    final rowsAffected = await query.write(
+      MatchTableCompanion(groupId: Value(groupId)),
+    );
+    return rowsAffected > 0;
+  }
+
+  // ============================================================
+  // TEMPORARY: Winner methods - these are stubs and do not persist data
+  // TODO: Implement proper winner handling
+  // ============================================================
+
+  /// TEMPORARY: Checks if a match has a winner.
+  /// Currently returns true if the match has any players.
+  Future<bool> hasWinner({required String matchId}) async {
+    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
+    return players?.isNotEmpty ?? false;
+  }
+
+  /// TEMPORARY: Gets the winner of a match.
+  /// Currently returns the first player in the match's player list.
+  Future<Player?> getWinner({required String matchId}) async {
+    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
+    return (players?.isNotEmpty ?? false) ? players!.first : null;
+  }
+
+  /// TEMPORARY: Sets the winner of a match.
+  /// Currently does nothing - winner is not persisted.
+  Future<bool> setWinner({
+    required String matchId,
+    required String winnerId,
+  }) async {
+    // TODO: Implement winner persistence
+    return true;
+  }
+
+  /// TEMPORARY: Removes the winner of a match.
+  /// Currently does nothing - winner is not persisted.
+  Future<bool> removeWinner({required String matchId}) async {
+    // TODO: Implement winner persistence
+    return true;
+  }
 }

lib/data/dao/match_dao.g.dart

@@ -4,5 +4,11 @@ part of 'match_dao.dart';
 
 // ignore_for_file: type=lint
 mixin _$MatchDaoMixin on DatabaseAccessor<AppDatabase> {
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  $TeamTableTable get teamTable => attachedDatabase.teamTable;
+  $PlayerMatchTableTable get playerMatchTable =>
+      attachedDatabase.playerMatchTable;
 }

lib/data/dao/player_dao.dart

@@ -15,7 +15,12 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     final result = await query.get();
     return result
         .map(
-          (row) => Player(id: row.id, name: row.name, createdAt: row.createdAt),
+          (row) => Player(
+            id: row.id,
+            name: row.name,
+            description: row.description,
+            createdAt: row.createdAt,
+          ),
         )
         .toList();
   }
@@ -27,6 +32,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     return Player(
       id: result.id,
       name: result.name,
+      description: result.description,
       createdAt: result.createdAt,
     );
   }
@@ -40,6 +46,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
         PlayerTableCompanion.insert(
           id: player.id,
           name: player.name,
+          description: Value(player.description),
           createdAt: player.createdAt,
         ),
         mode: InsertMode.insertOrReplace,
@@ -63,6 +70,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
               (player) => PlayerTableCompanion.insert(
                 id: player.id,
                 name: player.name,
+                description: Value(player.description),
                 createdAt: player.createdAt,
               ),
             )

lib/data/dao/player_match_dao.dart

@@ -1,23 +1,31 @@
 import 'package:drift/drift.dart';
 import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/db/tables/player_match_table.dart';
+import 'package:game_tracker/data/db/tables/team_table.dart';
 import 'package:game_tracker/data/dto/player.dart';
 
 part 'player_match_dao.g.dart';
 
-@DriftAccessor(tables: [PlayerMatchTable])
+@DriftAccessor(tables: [PlayerMatchTable, TeamTable])
 class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     with _$PlayerMatchDaoMixin {
   PlayerMatchDao(super.db);
 
   /// Associates a player with a match by inserting a record into the
-  /// [PlayerMatchTable].
+  /// [PlayerMatchTable]. Optionally associates with a team and sets initial score.
   Future<void> addPlayerToMatch({
     required String matchId,
     required String playerId,
+    String? teamId,
+    int score = 0,
   }) async {
     await into(playerMatchTable).insert(
-      PlayerMatchTableCompanion.insert(playerId: playerId, matchId: matchId),
+      PlayerMatchTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        teamId: Value(teamId),
+        score: score,
+      ),
       mode: InsertMode.insertOrIgnore,
     );
   }
@@ -38,6 +46,50 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     return players;
   }
 
+  /// Retrieves a player's score for a specific match.
+  /// Returns null if the player is not in the match.
+  Future<int?> getPlayerScore({
+    required String matchId,
+    required String playerId,
+  }) async {
+    final result = await (select(playerMatchTable)
+          ..where(
+            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
+          ))
+        .getSingleOrNull();
+    return result?.score;
+  }
+
+  /// Updates the score for a player in a match.
+  /// Returns `true` if the update was successful, otherwise `false`.
+  Future<bool> updatePlayerScore({
+    required String matchId,
+    required String playerId,
+    required int newScore,
+  }) async {
+    final rowsAffected = await (update(playerMatchTable)
+          ..where(
+            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
+          ))
+        .write(PlayerMatchTableCompanion(score: Value(newScore)));
+    return rowsAffected > 0;
+  }
+
+  /// Updates the team for a player in a match.
+  /// Returns `true` if the update was successful, otherwise `false`.
+  Future<bool> updatePlayerTeam({
+    required String matchId,
+    required String playerId,
+    required String? teamId,
+  }) async {
+    final rowsAffected = await (update(playerMatchTable)
+          ..where(
+            (p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
+          ))
+        .write(PlayerMatchTableCompanion(teamId: Value(teamId)));
+    return rowsAffected > 0;
+  }
+
   /// Checks if there are any players associated with the given [matchId].
   /// Returns `true` if there are players, otherwise `false`.
   Future<bool> matchHasPlayers({required String matchId}) async {
@@ -114,6 +166,7 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
               (id) => PlayerMatchTableCompanion.insert(
                 playerId: id,
                 matchId: matchId,
+                score: 0,
               ),
             )
             .toList();
@@ -127,4 +180,23 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
       }
     });
   }
+
+  /// Retrieves all players in a specific team for a match.
+  Future<List<Player>> getPlayersInTeam({
+    required String matchId,
+    required String teamId,
+  }) async {
+    final result = await (select(playerMatchTable)
+          ..where(
+            (p) => p.matchId.equals(matchId) & p.teamId.equals(teamId),
+          ))
+        .get();
+
+    if (result.isEmpty) return [];
+
+    final futures = result.map(
+      (row) => db.playerDao.getPlayerById(playerId: row.playerId),
+    );
+    return Future.wait(futures);
+  }
 }

lib/data/dao/player_match_dao.g.dart

@@ -5,7 +5,10 @@ part of 'player_match_dao.dart';
 // ignore_for_file: type=lint
 mixin _$PlayerMatchDaoMixin on DatabaseAccessor<AppDatabase> {
   $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  $TeamTableTable get teamTable => attachedDatabase.teamTable;
   $PlayerMatchTableTable get playerMatchTable =>
       attachedDatabase.playerMatchTable;
 }

lib/data/dao/score_dao.dart

@@ -0,0 +1,191 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/db/tables/score_table.dart';
+
+part 'score_dao.g.dart';
+
+/// A data class representing a score entry.
+class ScoreEntry {
+  final String playerId;
+  final String matchId;
+  final int roundNumber;
+  final int score;
+  final int change;
+
+  ScoreEntry({
+    required this.playerId,
+    required this.matchId,
+    required this.roundNumber,
+    required this.score,
+    required this.change,
+  });
+}
+
+@DriftAccessor(tables: [ScoreTable])
+class ScoreDao extends DatabaseAccessor<AppDatabase> with _$ScoreDaoMixin {
+  ScoreDao(super.db);
+
+  /// Adds a score entry to the database.
+  Future<void> addScore({
+    required String playerId,
+    required String matchId,
+    required int roundNumber,
+    required int score,
+    required int change,
+  }) async {
+    await into(scoreTable).insert(
+      ScoreTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        roundNumber: roundNumber,
+        score: score,
+        change: change,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+  }
+
+  /// Retrieves all scores for a specific match.
+  Future<List<ScoreEntry>> getScoresForMatch({required String matchId}) async {
+    final query = select(scoreTable)..where((s) => s.matchId.equals(matchId));
+    final result = await query.get();
+    return result
+        .map(
+          (row) => ScoreEntry(
+            playerId: row.playerId,
+            matchId: row.matchId,
+            roundNumber: row.roundNumber,
+            score: row.score,
+            change: row.change,
+          ),
+        )
+        .toList();
+  }
+
+  /// Retrieves all scores for a specific player in a match.
+  Future<List<ScoreEntry>> getPlayerScoresInMatch({
+    required String playerId,
+    required String matchId,
+  }) async {
+    final query = select(scoreTable)
+      ..where(
+        (s) => s.playerId.equals(playerId) & s.matchId.equals(matchId),
+      )
+      ..orderBy([(s) => OrderingTerm.asc(s.roundNumber)]);
+    final result = await query.get();
+    return result
+        .map(
+          (row) => ScoreEntry(
+            playerId: row.playerId,
+            matchId: row.matchId,
+            roundNumber: row.roundNumber,
+            score: row.score,
+            change: row.change,
+          ),
+        )
+        .toList();
+  }
+
+  /// Retrieves the score for a specific round.
+  Future<ScoreEntry?> getScoreForRound({
+    required String playerId,
+    required String matchId,
+    required int roundNumber,
+  }) async {
+    final query = select(scoreTable)
+      ..where(
+        (s) =>
+            s.playerId.equals(playerId) &
+            s.matchId.equals(matchId) &
+            s.roundNumber.equals(roundNumber),
+      );
+    final result = await query.getSingleOrNull();
+    if (result == null) return null;
+    return ScoreEntry(
+      playerId: result.playerId,
+      matchId: result.matchId,
+      roundNumber: result.roundNumber,
+      score: result.score,
+      change: result.change,
+    );
+  }
+
+  /// Updates a score entry.
+  Future<bool> updateScore({
+    required String playerId,
+    required String matchId,
+    required int roundNumber,
+    required int newScore,
+    required int newChange,
+  }) async {
+    final rowsAffected = await (update(scoreTable)
+          ..where(
+            (s) =>
+                s.playerId.equals(playerId) &
+                s.matchId.equals(matchId) &
+                s.roundNumber.equals(roundNumber),
+          ))
+        .write(
+          ScoreTableCompanion(
+            score: Value(newScore),
+            change: Value(newChange),
+          ),
+        );
+    return rowsAffected > 0;
+  }
+
+  /// Deletes a score entry.
+  Future<bool> deleteScore({
+    required String playerId,
+    required String matchId,
+    required int roundNumber,
+  }) async {
+    final query = delete(scoreTable)
+      ..where(
+        (s) =>
+            s.playerId.equals(playerId) &
+            s.matchId.equals(matchId) &
+            s.roundNumber.equals(roundNumber),
+      );
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Deletes all scores for a specific match.
+  Future<bool> deleteScoresForMatch({required String matchId}) async {
+    final query = delete(scoreTable)..where((s) => s.matchId.equals(matchId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Deletes all scores for a specific player.
+  Future<bool> deleteScoresForPlayer({required String playerId}) async {
+    final query = delete(scoreTable)..where((s) => s.playerId.equals(playerId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Gets the latest round number for a match.
+  Future<int> getLatestRoundNumber({required String matchId}) async {
+    final query = selectOnly(scoreTable)
+      ..where(scoreTable.matchId.equals(matchId))
+      ..addColumns([scoreTable.roundNumber.max()]);
+    final result = await query.getSingle();
+    return result.read(scoreTable.roundNumber.max()) ?? 0;
+  }
+
+  /// Gets the total score for a player in a match (sum of all changes).
+  Future<int> getTotalScoreForPlayer({
+    required String playerId,
+    required String matchId,
+  }) async {
+    final scores = await getPlayerScoresInMatch(
+      playerId: playerId,
+      matchId: matchId,
+    );
+    if (scores.isEmpty) return 0;
+    // Return the score from the latest round
+    return scores.last.score;
+  }
+}
+

lib/data/dao/score_dao.g.dart

@@ -0,0 +1,12 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'score_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$ScoreDaoMixin on DatabaseAccessor<AppDatabase> {
+  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  $GroupTableTable get groupTable => attachedDatabase.groupTable;
+  $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  $ScoreTableTable get scoreTable => attachedDatabase.scoreTable;
+}

lib/data/dao/team_dao.dart

@@ -0,0 +1,145 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/db/tables/team_table.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/data/dto/team.dart';
+
+part 'team_dao.g.dart';
+
+@DriftAccessor(tables: [TeamTable])
+class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
+  TeamDao(super.db);
+
+  /// Retrieves all teams from the database.
+  /// Note: This returns teams without their members. Use getTeamById for full team data.
+  Future<List<Team>> getAllTeams() async {
+    final query = select(teamTable);
+    final result = await query.get();
+    return Future.wait(
+      result.map((row) async {
+        final members = await _getTeamMembers(teamId: row.id);
+        return Team(
+          id: row.id,
+          createdAt: row.createdAt,
+          members: members,
+        );
+      }),
+    );
+  }
+
+  /// Retrieves a [Team] by its [teamId], including its members.
+  Future<Team> getTeamById({required String teamId}) async {
+    final query = select(teamTable)..where((t) => t.id.equals(teamId));
+    final result = await query.getSingle();
+    final members = await _getTeamMembers(teamId: teamId);
+    return Team(
+      id: result.id,
+      createdAt: result.createdAt,
+      members: members,
+    );
+  }
+
+  /// Helper method to get team members from player_match_table.
+  /// This assumes team members are tracked via the player_match_table.
+  Future<List<Player>> _getTeamMembers({required String teamId}) async {
+    // Get all player_match entries with this teamId
+    final playerMatchQuery = select(db.playerMatchTable)
+      ..where((pm) => pm.teamId.equals(teamId));
+    final playerMatches = await playerMatchQuery.get();
+
+    if (playerMatches.isEmpty) return [];
+
+    // Get unique player IDs
+    final playerIds = playerMatches.map((pm) => pm.playerId).toSet();
+
+    // Fetch all players
+    final players = await Future.wait(
+      playerIds.map((id) => db.playerDao.getPlayerById(playerId: id)),
+    );
+    return players;
+  }
+
+  /// Adds a new [team] to the database.
+  /// Returns `true` if the team was added, `false` otherwise.
+  Future<bool> addTeam({required Team team}) async {
+    if (!await teamExists(teamId: team.id)) {
+      await into(teamTable).insert(
+        TeamTableCompanion.insert(
+          id: team.id,
+          name: '', // Team name from table (not in DTO currently)
+          createdAt: team.createdAt,
+        ),
+        mode: InsertMode.insertOrReplace,
+      );
+      return true;
+    }
+    return false;
+  }
+
+  /// Adds multiple [teams] to the database in a batch operation.
+  Future<bool> addTeamsAsList({required List<Team> teams}) async {
+    if (teams.isEmpty) return false;
+
+    await db.batch(
+      (b) => b.insertAll(
+        teamTable,
+        teams
+            .map(
+              (team) => TeamTableCompanion.insert(
+                id: team.id,
+                name: '',
+                createdAt: team.createdAt,
+              ),
+            )
+            .toList(),
+        mode: InsertMode.insertOrIgnore,
+      ),
+    );
+
+    return true;
+  }
+
+  /// Deletes the team with the given [teamId] from the database.
+  /// Returns `true` if the team was deleted, `false` otherwise.
+  Future<bool> deleteTeam({required String teamId}) async {
+    final query = delete(teamTable)..where((t) => t.id.equals(teamId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Checks if a team with the given [teamId] exists in the database.
+  /// Returns `true` if the team exists, `false` otherwise.
+  Future<bool> teamExists({required String teamId}) async {
+    final query = select(teamTable)..where((t) => t.id.equals(teamId));
+    final result = await query.getSingleOrNull();
+    return result != null;
+  }
+
+  /// Updates the name of the team with the given [teamId].
+  Future<void> updateTeamName({
+    required String teamId,
+    required String newName,
+  }) async {
+    await (update(teamTable)..where((t) => t.id.equals(teamId))).write(
+      TeamTableCompanion(name: Value(newName)),
+    );
+  }
+
+  /// Retrieves the total count of teams in the database.
+  Future<int> getTeamCount() async {
+    final count =
+        await (selectOnly(teamTable)..addColumns([teamTable.id.count()]))
+            .map((row) => row.read(teamTable.id.count()))
+            .getSingle();
+    return count ?? 0;
+  }
+
+  /// Deletes all teams from the database.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> deleteAllTeams() async {
+    final query = delete(teamTable);
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+}
+

lib/data/dao/team_dao.g.dart

@@ -0,0 +1,8 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'team_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$TeamDaoMixin on DatabaseAccessor<AppDatabase> {
+  $TeamTableTable get teamTable => attachedDatabase.teamTable;
+}

lib/data/db/database.dart

@@ -1,17 +1,21 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
+import 'package:game_tracker/data/dao/game_dao.dart';
 import 'package:game_tracker/data/dao/group_dao.dart';
-import 'package:game_tracker/data/dao/group_match_dao.dart';
 import 'package:game_tracker/data/dao/match_dao.dart';
 import 'package:game_tracker/data/dao/player_dao.dart';
 import 'package:game_tracker/data/dao/player_group_dao.dart';
 import 'package:game_tracker/data/dao/player_match_dao.dart';
-import 'package:game_tracker/data/db/tables/group_match_table.dart';
+import 'package:game_tracker/data/dao/score_dao.dart';
+import 'package:game_tracker/data/dao/team_dao.dart';
+import 'package:game_tracker/data/db/tables/game_table.dart';
 import 'package:game_tracker/data/db/tables/group_table.dart';
 import 'package:game_tracker/data/db/tables/match_table.dart';
 import 'package:game_tracker/data/db/tables/player_group_table.dart';
 import 'package:game_tracker/data/db/tables/player_match_table.dart';
 import 'package:game_tracker/data/db/tables/player_table.dart';
+import 'package:game_tracker/data/db/tables/score_table.dart';
+import 'package:game_tracker/data/db/tables/team_table.dart';
 import 'package:path_provider/path_provider.dart';
 
 part 'database.g.dart';
@@ -20,25 +24,29 @@ part 'database.g.dart';
   tables: [
     PlayerTable,
     GroupTable,
+    GameTable,
+    TeamTable,
     MatchTable,
     PlayerGroupTable,
     PlayerMatchTable,
-    GroupMatchTable,
+    ScoreTable,
   ],
   daos: [
     PlayerDao,
     GroupDao,
+    GameDao,
+    TeamDao,
     MatchDao,
     PlayerGroupDao,
     PlayerMatchDao,
-    GroupMatchDao,
+    ScoreDao,
   ],
 )
 class AppDatabase extends _$AppDatabase {
   AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 1;
+  int get schemaVersion => 2;
 
   @override
   MigrationStrategy get migration {

lib/data/db/tables/game_table.dart

@@ -0,0 +1,14 @@
+import 'package:drift/drift.dart';
+
+class GameTable extends Table {
+  TextColumn get id => text()();
+  TextColumn get name => text()();
+  TextColumn get ruleset => text()();
+  TextColumn get description => text().nullable()();
+  TextColumn get color => text().nullable()();
+  TextColumn get icon => text().nullable()();
+  DateTimeColumn get createdAt => dateTime()();
+
+  @override
+  Set<Column<Object>> get primaryKey => {id};
+}

lib/data/db/tables/group_match_table.dart

@@ -1,13 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:game_tracker/data/db/tables/match_table.dart';
-
-class GroupMatchTable extends Table {
-  TextColumn get groupId =>
-      text().references(GroupTable, #id, onDelete: KeyAction.cascade)();
-  TextColumn get matchId =>
-      text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
-
-  @override
-  Set<Column<Object>> get primaryKey => {groupId, matchId};
-}

lib/data/db/tables/group_table.dart

@@ -3,6 +3,7 @@ import 'package:drift/drift.dart';
 class GroupTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  TextColumn get description => text().nullable()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override

lib/data/db/tables/match_table.dart

@@ -1,9 +1,15 @@
 import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/tables/game_table.dart';
+import 'package:game_tracker/data/db/tables/group_table.dart';
 
 class MatchTable extends Table {
   TextColumn get id => text()();
-  TextColumn get name => text()();
+  TextColumn get gameId =>
-  late final winnerId = text().nullable()();
+      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get groupId =>
+      text().references(GroupTable, #id, onDelete: KeyAction.cascade).nullable()(); // Nullable if not part of a group
+  TextColumn get name => text().nullable()();
+  TextColumn get notes => text().nullable()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override

lib/data/db/tables/player_match_table.dart

@@ -1,12 +1,16 @@
 import 'package:drift/drift.dart';
 import 'package:game_tracker/data/db/tables/match_table.dart';
 import 'package:game_tracker/data/db/tables/player_table.dart';
+import 'package:game_tracker/data/db/tables/team_table.dart';
 
 class PlayerMatchTable extends Table {
   TextColumn get playerId =>
       text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
   TextColumn get matchId =>
       text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get teamId =>
+      text().references(TeamTable, #id).nullable()();
+  IntColumn get score => integer()();
 
   @override
   Set<Column<Object>> get primaryKey => {playerId, matchId};

lib/data/db/tables/player_table.dart

@@ -3,6 +3,7 @@ import 'package:drift/drift.dart';
 class PlayerTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  TextColumn get description => text().nullable()();
   DateTimeColumn get createdAt => dateTime()();
 
   @override

lib/data/db/tables/score_table.dart

@@ -0,0 +1,16 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
+import 'package:game_tracker/data/db/tables/player_table.dart';
+
+class ScoreTable extends Table {
+  TextColumn get playerId =>
+      text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get matchId =>
+      text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
+  IntColumn get roundNumber => integer()();
+  IntColumn get score => integer()();
+  IntColumn get change => integer()();
+
+  @override
+  Set<Column<Object>> get primaryKey => {playerId, matchId, roundNumber};
+}

lib/data/db/tables/team_table.dart

@@ -0,0 +1,10 @@
+import 'package:drift/drift.dart';
+
+class TeamTable extends Table {
+  TextColumn get id => text()();
+  TextColumn get name => text()();
+  DateTimeColumn get createdAt => dateTime()();
+
+  @override
+  Set<Column<Object>> get primaryKey => {id};
+}

lib/data/dto/game.dart

@@ -0,0 +1,50 @@
+import 'package:clock/clock.dart';
+import 'package:uuid/uuid.dart';
+
+class Game {
+  final String id;
+  final DateTime createdAt;
+  final String name;
+  final String? ruleset;
+  final String? description;
+  final int? color;
+  final String? icon;
+
+  Game({
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    this.ruleset,
+    this.description,
+    this.color,
+    this.icon,
+  }) : id = id ?? const Uuid().v4(),
+       createdAt = createdAt ?? clock.now();
+
+  @override
+  String toString() {
+    return 'Game{id: $id, name: $name, ruleset: $ruleset, description: $description, color: $color, icon: $icon}';
+  }
+
+  /// Creates a Game instance from a JSON object.
+  Game.fromJson(Map<String, dynamic> json)
+    : id = json['id'],
+      createdAt = DateTime.parse(json['createdAt']),
+      name = json['name'],
+      ruleset = json['ruleset'],
+      description = json['description'],
+      color = json['color'],
+      icon = json['icon'];
+
+  /// Converts the Game instance to a JSON object.
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'createdAt': createdAt.toIso8601String(),
+    'name': name,
+    'ruleset': ruleset,
+    'description': description,
+    'color': color,
+    'icon': icon,
+  };
+}
+

lib/data/dto/group.dart

@@ -4,21 +4,23 @@ import 'package:uuid/uuid.dart';
 
 class Group {
   final String id;
-  final DateTime createdAt;
   final String name;
+  final String? description;
+  final DateTime createdAt;
   final List<Player> members;
 
   Group({
     String? id,
     DateTime? createdAt,
     required this.name,
+    this.description,
     required this.members,
   }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Group{id: $id, name: $name,members: $members}';
+    return 'Group{id: $id, name: $name, description: $description, members: $members}';
   }
 
   /// Creates a Group instance from a JSON object.
@@ -26,6 +28,7 @@ class Group {
     : id = json['id'],
       createdAt = DateTime.parse(json['createdAt']),
       name = json['name'],
+      description = json['description'],
       members = (json['members'] as List)
           .map((memberJson) => Player.fromJson(memberJson))
           .toList();
@@ -35,6 +38,7 @@ class Group {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
+    'description': description,
     'members': members.map((member) => member.toJson()).toList(),
   };
 }

lib/data/dto/match.dart

@@ -1,4 +1,5 @@
 import 'package:clock/clock.dart';
+import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:uuid/uuid.dart';
@@ -7,45 +8,51 @@ class Match {
   final String id;
   final DateTime createdAt;
   final String name;
-  final List<Player>? players;
+  final Game? game;
   final Group? group;
-  final Player? winner;
+  final List<Player>? players;
+  final String? notes;
+  Player? winner;
 
   Match({
     String? id,
     DateTime? createdAt,
     required this.name,
-    this.players,
+    this.game,
     this.group,
+    this.players,
+    this.notes,
     this.winner,
   }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Match{\n\tid: $id,\n\tname: $name,\n\tplayers: $players,\n\tgroup: $group,\n\twinner: $winner\n}';
+    return 'Match{id: $id, name: $name, game: $game, group: $group, players: $players, notes: $notes, winner: $winner}';
   }
 
   /// Creates a Match instance from a JSON object.
   Match.fromJson(Map<String, dynamic> json)
     : id = json['id'],
-      name = json['name'],
       createdAt = DateTime.parse(json['createdAt']),
+      name = json['name'],
+      game = json['game'] != null ? Game.fromJson(json['game']) : null,
+      group = json['group'] != null ? Group.fromJson(json['group']) : null,
       players = json['players'] != null
           ? (json['players'] as List)
               .map((playerJson) => Player.fromJson(playerJson))
               .toList()
           : null,
-      group = json['group'] != null ? Group.fromJson(json['group']) : null,
+      notes = json['notes'];
-      winner = json['winner'] != null ? Player.fromJson(json['winner']) : null;
 
   /// Converts the Match instance to a JSON object.
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
-    'players': players?.map((player) => player.toJson()).toList(),
+    'game': game?.toJson(),
     'group': group?.toJson(),
-    'winner': winner?.toJson(),
+    'players': players?.map((player) => player.toJson()).toList(),
+    'notes': notes,
   };
 }

lib/data/dto/pair.dart

@@ -0,0 +1,16 @@
+import 'package:game_tracker/data/dto/team.dart';
+
+class Pair extends Team {
+  Pair({
+    super.id,
+    super.createdAt,
+    required super.members,
+  });
+
+  @override
+  String toString() {
+    return 'Pair{id: $id, members: $members}';
+  }
+
+}
+

lib/data/dto/player.dart

@@ -5,26 +5,33 @@ class Player {
   final String id;
   final DateTime createdAt;
   final String name;
+  final String? description;
 
-  Player({String? id, DateTime? createdAt, required this.name})
+  Player({
-    : id = id ?? const Uuid().v4(),
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    this.description,
+  }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Player{id: $id,name: $name}';
+    return 'Player{id: $id, name: $name, description: $description}';
   }
 
   /// Creates a Player instance from a JSON object.
   Player.fromJson(Map<String, dynamic> json)
     : id = json['id'],
       createdAt = DateTime.parse(json['createdAt']),
-      name = json['name'];
+      name = json['name'],
+      description = json['description'];
 
   /// Converts the Player instance to a JSON object.
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
+    'description': description,
   };
 }

lib/data/dto/team.dart

@@ -0,0 +1,37 @@
+import 'package:clock/clock.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:uuid/uuid.dart';
+
+class Team {
+  final String id;
+  final DateTime createdAt;
+  final List<Player> members;
+
+  Team({
+    String? id,
+    DateTime? createdAt,
+    required this.members,
+  }) : id = id ?? const Uuid().v4(),
+       createdAt = createdAt ?? clock.now();
+
+  @override
+  String toString() {
+    return 'Team{id: $id, members: $members}';
+  }
+
+  /// Creates a Team instance from a JSON object.
+  Team.fromJson(Map<String, dynamic> json)
+    : id = json['id'],
+      createdAt = DateTime.parse(json['createdAt']),
+      members = (json['members'] as List)
+          .map((memberJson) => Player.fromJson(memberJson))
+          .toList();
+
+  /// Converts the Team instance to a JSON object.
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'createdAt': createdAt.toIso8601String(),
+    'members': members.map((member) => member.toJson()).toList(),
+  };
+}
+

lib/l10n/arb/app_de.arb

@@ -17,7 +17,7 @@
   "data_successfully_imported": "Daten erfolgreich importiert",
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
-  "delete_all_data": "Alle Daten löschen?",
+  "delete_all_data": "Alle Daten löschen",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",

lib/l10n/arb/app_en.arb

@@ -277,7 +277,7 @@
   "data_successfully_imported": "Data successfully imported",
   "days_ago": "{count} days ago",
   "delete": "Delete",
-  "delete_all_data": "Delete all data?",
+  "delete_all_data": "Delete all data",
   "error_creating_group": "Error while creating group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",

lib/l10n/generated/app_localizations.dart

@@ -209,7 +209,7 @@ abstract class AppLocalizations {
   /// Confirmation dialog for deleting all data
   ///
   /// In en, this message translates to:
-  /// **'Delete all data?'**
+  /// **'Delete all data'**
   String get delete_all_data;
 
   /// Error message when group creation fails

lib/l10n/generated/app_localizations_de.dart

@@ -67,7 +67,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete => 'Löschen';
 
   @override
-  String get delete_all_data => 'Alle Daten löschen?';
+  String get delete_all_data => 'Alle Daten löschen';
 
   @override
   String get error_creating_group =>

lib/l10n/generated/app_localizations_en.dart

@@ -67,7 +67,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get delete => 'Delete';
 
   @override
-  String get delete_all_data => 'Delete all data?';
+  String get delete_all_data => 'Delete all data';
 
   @override
   String get error_creating_group =>

lib/main.dart

@@ -44,6 +44,12 @@ class GameTracker extends StatelessWidget {
           seedColor: CustomTheme.primaryColor,
           brightness: Brightness.dark,
         ).copyWith(surface: CustomTheme.backgroundColor),
+        pageTransitionsTheme: const PageTransitionsTheme(
+          builders: {
+            TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
+            TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
+          },
+        ),
       ),
       home: const CustomNavigationBar(),
     );

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
@@ -56,7 +57,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                MaterialPageRoute(builder: (_) => const SettingsView()),
+                adaptivePageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;

lib/presentation/views/main_menu/group_view/create_group_view.dart

@@ -44,7 +44,8 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      child: Scaffold(
         backgroundColor: CustomTheme.backgroundColor,
         appBar: AppBar(title: Text(loc.create_new_group)),
         body: SafeArea(
@@ -106,6 +107,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
             ],
           ),
         ),
+      ),
     );
   }
 }

lib/presentation/views/main_menu/group_view/groups_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/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -85,7 +86,7 @@ class _GroupsViewState extends State<GroupsView> {
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) {
                       return const CreateGroupView();
                     },

lib/presentation/views/main_menu/home_view.dart

@@ -1,14 +1,16 @@
 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';
 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';
 
@@ -43,7 +45,6 @@ class _HomeViewState extends State<HomeView> {
           Player(name: 'Skeleton Player 2'),
         ],
       ),
-      winner: Player(name: 'Skeleton Player 1'),
     ),
   );
 
@@ -90,74 +91,43 @@ class _HomeViewState extends State<HomeView> {
                   child: InfoTile(
                     width: constraints.maxWidth * 0.95,
                     title: loc.recent_matches,
-                    icon: Icons.timer,
+                    icon: Icons.history_rounded,
-                    content: Padding(
+                    content: Column(
-                      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(
+                        if (recentMatches.isNotEmpty)
-                              matchTitle: recentMatches[0].name,
+                          for (Match match in recentMatches)
-                              game: 'Winner',
+                            Padding(
-                              ruleset: 'Ruleset',
+                              padding: const EdgeInsets.symmetric(
-                              players: _getPlayerText(
+                                vertical: 6.0,
-                                recentMatches[0],
-                                context,
                               ),
-                              winner: recentMatches[0].winner == null
+                              child: MatchTile(
-                                  ? AppLocalizations.of(
+                                compact: true,
-                                      context,
+                                width: constraints.maxWidth * 0.9,
-                                    ).match_in_progress
+                                match: match,
-                                  : recentMatches[0].winner!.name,
+                                onTap: () async {
+                                  await Navigator.of(context).push(
+                                    adaptivePageRoute(
+                                      fullscreenDialog: true,
+                                      builder: (context) =>
+                                          MatchResultView(match: match),
                                     ),
-                            const Padding(
+                                  );
-                              padding: EdgeInsets.symmetric(vertical: 8.0),
+                                  await updatedWinnerinRecentMatches(match.id);
-                              child: Divider(),
+                                },
                               ),
-                            if (loadedRecentMatches.length > 1) ...[
+                            )
-                              MatchSummaryTile(
+                        else
-                                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,
+                            heightFactor: 5,
-                                child: Text(
+                            child: Text(loc.no_recent_matches_available),
-                                  AppLocalizations.of(
-                                    context,
-                                  ).no_second_match_available,
-                                ),
                           ),
                       ],
-                          ],
                     ),
                   ),
                 ),
-                  ),
+                Padding(
-                ),
+                  padding: EdgeInsets.zero,
-                InfoTile(
+                  child: InfoTile(
                     width: constraints.maxWidth * 0.95,
                     title: loc.quick_create,
                     icon: Icons.add_box_rounded,
@@ -205,6 +175,8 @@ class _HomeViewState extends State<HomeView> {
                       ],
                     ),
                   ),
+                ),
+                SizedBox(height: MediaQuery.paddingOf(context).bottom),
               ],
             ),
           ),
@@ -215,7 +187,7 @@ class _HomeViewState extends State<HomeView> {
 
   /// Loads the data for the HomeView from the database.
   /// This includes the match count, group count, and recent matches.
-  void loadHomeViewData() {
+  Future<void> loadHomeViewData() async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     Future.wait([
       db.matchDao.getMatchCount(),
@@ -231,11 +203,6 @@ class _HomeViewState extends State<HomeView> {
                 ..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;
@@ -244,18 +211,15 @@ class _HomeViewState extends State<HomeView> {
     });
   }
 
-  /// Generates a text representation of the players in the match.
+  /// Updates the winner information for a specific match in the recent matches list.
-  /// If the match has a group, it returns the group name and the number of additional players.
+  Future<void> updatedWinnerinRecentMatches(String matchId) async {
-  /// If there is no group, it returns the count of players.
+    final db = Provider.of<AppDatabase>(context, listen: false);
-  String _getPlayerText(Match game, context) {
+    final winner = await db.matchDao.getWinner(matchId: matchId);
-    final loc = AppLocalizations.of(context);
+    final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
-    if (game.group == null) {
+    if (matchIndex != -1) {
-      final playerCount = game.players?.length ?? 0;
+      setState(() {
-      return loc.players_count(playerCount);
+        recentMatches[matchIndex].winner = winner;
-    }
+      });
-    if (game.players == null || game.players!.isEmpty) {
+    }
-      return game.group!.name;
-    }
-    return '${game.group!.name} + ${game.players!.length}';
   }
 }

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

@@ -140,7 +140,11 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
         filteredGroups.clear();
         filteredGroups.addAll(
           widget.groups.where(
-            (group) => group.name.toLowerCase().contains(query.toLowerCase()),
+                (group) =>
+            group.name.toLowerCase().contains(query.toLowerCase()) ||
+                group.members.any(
+                      (player) => player.name.toLowerCase().contains(query.toLowerCase()),
+                ),
           ),
         );
       }

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

@@ -1,8 +1,9 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
@@ -119,7 +120,8 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      child: Scaffold(
         backgroundColor: CustomTheme.backgroundColor,
         appBar: AppBar(title: Text(loc.create_new_match)),
         body: SafeArea(
@@ -140,7 +142,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                     : games[selectedGameIndex].$1,
                 onPressed: () async {
                   selectedGameIndex = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                       builder: (context) => ChooseGameView(
                         games: games,
                         initialGameIndex: selectedGameIndex,
@@ -168,7 +170,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                     : translateRulesetToString(selectedRuleset!, context),
                 onPressed: () async {
                   selectedRuleset = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                       builder: (context) => ChooseRulesetView(
                         rulesets: _rulesets,
                         initialRulesetIndex: selectedRulesetIndex,
@@ -190,7 +192,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                     : selectedGroup!.name,
                 onPressed: () async {
                   selectedGroup = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                       builder: (context) => ChooseGroupView(
                         groups: groupsList,
                         initialGroupId: selectedGroupId,
@@ -228,11 +230,20 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                 buttonType: ButtonType.primary,
                 onPressed: _enableCreateGameButton()
                     ? () async {
+                        final selectedGame = games[selectedGameIndex];
+                        final game = Game(
+                          name: selectedGame.$1,
+                          description: selectedGame.$2.isEmpty ? null : selectedGame.$2,
+                          ruleset: selectedGame.$3.name,
+                        );
+                        // Ensure the game exists in the database before creating the match
+                        await db.gameDao.addGame(game: game);
                         Match match = Match(
                           name: _matchNameController.text.isEmpty
                               ? (hintText ?? '')
                               : _matchNameController.text.trim(),
                           createdAt: DateTime.now(),
+                          game: game,
                           group: selectedGroup,
                           players: selectedPlayers,
                         );
@@ -240,7 +251,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                         if (context.mounted) {
                           Navigator.pushReplacement(
                             context,
-                          CupertinoPageRoute(
+                            adaptivePageRoute(
                               fullscreenDialog: true,
                               builder: (context) => MatchResultView(
                                 match: match,
@@ -255,16 +266,19 @@ class _CreateMatchViewState extends State<CreateMatchView> {
             ],
           ),
         ),
+      ),
     );
   }
 
   /// Determines whether the "Create Match" button should be enabled.
   ///
   /// Returns `true` if:
+  /// - A game is selected AND
   /// - A ruleset is selected AND
   /// - Either a group is selected OR at least 2 players are selected
   bool _enableCreateGameButton() {
-    return (selectedGroup != null ||
+    return selectedGameIndex != -1 &&
+        (selectedGroup != null ||
             (selectedPlayers != null && selectedPlayers!.length > 1)) &&
         selectedRuleset != null;
   }

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

@@ -1,7 +1,7 @@
 import 'dart:core' hide Match;
 
-import 'package:flutter/cupertino.dart';
 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/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -78,11 +78,15 @@ class _MatchViewState extends State<MatchView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return MatchTile(
+                  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(
+                            adaptivePageRoute(
                               fullscreenDialog: true,
                               builder: (context) => MatchResultView(
                                 match: matches[index],
@@ -92,6 +96,8 @@ class _MatchViewState extends State<MatchView> {
                           );
                         },
                         match: matches[index],
+                      ),
+                    ),
                   );
                 },
               ),
@@ -105,7 +111,7 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),

lib/presentation/views/main_menu/settings_view.dart

@@ -4,6 +4,7 @@ import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/widgets/tiles/settings_list_tile.dart';
 import 'package:game_tracker/services/data_transfer_service.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class SettingsView extends StatefulWidget {
   const SettingsView({super.key});
@@ -13,21 +14,26 @@ class SettingsView extends StatefulWidget {
 }
 
 class _SettingsViewState extends State<SettingsView> {
+  PackageInfo _packageInfo = PackageInfo(
+    appName: 'n.A.',
+    packageName: 'n.A.',
+    version: 'n.A.',
+    buildNumber: 'n.A.',
+  );
   @override
   void initState() {
     super.initState();
+    _initPackageInfo();
   }
 
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      child: Scaffold(
         appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
         backgroundColor: CustomTheme.backgroundColor,
-      body: LayoutBuilder(
+        body: Column(
-        builder: (BuildContext context, BoxConstraints constraints) =>
-            SingleChildScrollView(
-              child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -43,10 +49,7 @@ class _SettingsViewState extends State<SettingsView> {
               ),
             ),
             Padding(
-                    padding: const EdgeInsets.symmetric(
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
-                      horizontal: 24,
-                      vertical: 10,
-                    ),
               child: Text(
                 textAlign: TextAlign.start,
                 loc.settings,
@@ -61,8 +64,9 @@ class _SettingsViewState extends State<SettingsView> {
               icon: Icons.upload_rounded,
               suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
               onPressed: () async {
-                      final String json =
+                final String json = await DataTransferService.getAppDataAsJson(
-                          await DataTransferService.getAppDataAsJson(context);
+                  context,
+                );
                 final result = await DataTransferService.exportData(
                   json,
                   'game_tracker-data',
@@ -76,9 +80,7 @@ class _SettingsViewState extends State<SettingsView> {
               icon: Icons.download_rounded,
               suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
               onPressed: () async {
-                      final result = await DataTransferService.importData(
+                final result = await DataTransferService.importData(context);
-                        context,
-                      );
                 if (!context.mounted) return;
                 showImportSnackBar(context: context, result: result);
               },
@@ -91,7 +93,7 @@ class _SettingsViewState extends State<SettingsView> {
                 showDialog<bool>(
                   context: context,
                   builder: (context) => AlertDialog(
-                          title: Text(loc.delete_all_data),
+                    title: Text('${loc.delete_all_data}?'),
                     content: Text(loc.this_cannot_be_undone),
                     actions: [
                       TextButton(
@@ -117,10 +119,23 @@ class _SettingsViewState extends State<SettingsView> {
                 });
               },
             ),
-                ],
+            const Spacer(),
+            Padding(
+              padding: const EdgeInsets.all(20),
+              child: Center(
+                child: Text(
+                  'Version ${_packageInfo.version} (${_packageInfo.buildNumber})',
+                  style: TextStyle(
+                    color: Colors.grey.shade600,
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
                   ),
                 ),
               ),
+            ),
+          ],
+        ),
+      ),
     );
   }
 
@@ -194,4 +209,11 @@ class _SettingsViewState extends State<SettingsView> {
       ),
     );
   }
+
+  Future<void> _initPackageInfo() async {
+    final info = await PackageInfo.fromPlatform();
+    setState(() {
+      _packageInfo = info;
+    });
+  }
 }

lib/presentation/widgets/tiles/match_tile.dart

@@ -10,8 +10,16 @@ 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});
+  const MatchTile({
+    super.key,
+    required this.match,
+    required this.onTap,
+    this.width,
+    this.compact = false,
+  });
 
   /// The match data to be displayed.
   final Match match;
@@ -19,6 +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<MatchTile> createState() => _MatchTileState();
 }
@@ -41,13 +55,10 @@ class _MatchTileState extends State<MatchTile> {
     return GestureDetector(
       onTap: widget.onTap,
       child: Container(
-        margin: CustomTheme.tileMargin,
+        margin: EdgeInsets.zero,
+        width: widget.width,
         padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
+        decoration: CustomTheme.standardBoxDecoration,
-          color: CustomTheme.boxColor,
-          border: Border.all(color: CustomTheme.boxBorder),
-          borderRadius: BorderRadius.circular(12),
-        ),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -80,7 +91,22 @@ class _MatchTileState extends State<MatchTile> {
                   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,
                     ),
@@ -127,9 +153,46 @@ class _MatchTileState extends State<MatchTile> {
                 ),
               ),
               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(

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.4+101
 
 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
@@ -27,6 +22,7 @@ dependencies:
   intl: any
   flutter_localizations:
     sdk: flutter
+  package_info_plus: ^9.0.0
 
 dev_dependencies:
   flutter_test:

test/db_tests/group_match_test.dart

@@ -1,221 +0,0 @@
-import 'package:clock/clock.dart';
-import 'package:drift/drift.dart' hide isNotNull;
-import 'package:drift/native.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/match.dart';
-import 'package:game_tracker/data/dto/player.dart';
-
-void main() {
-  late AppDatabase database;
-  late Player testPlayer1;
-  late Player testPlayer2;
-  late Player testPlayer3;
-  late Player testPlayer4;
-  late Player testPlayer5;
-  late Group testGroup1;
-  late Group testGroup2;
-  late Match testMatchWithGroup;
-  late Match testMatchWithPlayers;
-  final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
-  final fakeClock = Clock(() => fixedDate);
-
-  setUp(() async {
-    database = AppDatabase(
-      DatabaseConnection(
-        NativeDatabase.memory(),
-        // Recommended for widget tests to avoid test errors.
-        closeStreamsSynchronously: true,
-      ),
-    );
-
-    withClock(fakeClock, () {
-      testPlayer1 = Player(name: 'Alice');
-      testPlayer2 = Player(name: 'Bob');
-      testPlayer3 = Player(name: 'Charlie');
-      testPlayer4 = Player(name: 'Diana');
-      testPlayer5 = Player(name: 'Eve');
-      testGroup1 = Group(
-        name: 'Test Group',
-        members: [testPlayer1, testPlayer2, testPlayer3],
-      );
-      testGroup2 = Group(
-        name: 'Test Group',
-        members: [testPlayer3, testPlayer2],
-      );
-      testMatchWithPlayers = Match(
-        name: 'Test Match with Players',
-        players: [testPlayer4, testPlayer5],
-      );
-      testMatchWithGroup = Match(
-        name: 'Test Match with Group',
-        group: testGroup1,
-      );
-    });
-    await database.playerDao.addPlayersAsList(
-      players: [
-        testPlayer1,
-        testPlayer2,
-        testPlayer3,
-        testPlayer4,
-        testPlayer5,
-      ],
-    );
-    await database.groupDao.addGroupsAsList(groups: [testGroup1, testGroup2]);
-  });
-  tearDown(() async {
-    await database.close();
-  });
-  group('Group-Match Tests', () {
-    test('matchHasGroup() has group works correctly', () async {
-      await database.matchDao.addMatch(match: testMatchWithPlayers);
-      await database.groupDao.addGroup(group: testGroup1);
-
-      var matchHasGroup = await database.groupMatchDao.matchHasGroup(
-        matchId: testMatchWithPlayers.id,
-      );
-
-      expect(matchHasGroup, false);
-
-      await database.groupMatchDao.addGroupToMatch(
-        matchId: testMatchWithPlayers.id,
-        groupId: testGroup1.id,
-      );
-
-      matchHasGroup = await database.groupMatchDao.matchHasGroup(
-        matchId: testMatchWithPlayers.id,
-      );
-
-      expect(matchHasGroup, true);
-    });
-
-    test('Adding a group to a match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatchWithPlayers);
-      await database.groupDao.addGroup(group: testGroup1);
-      await database.groupMatchDao.addGroupToMatch(
-        matchId: testMatchWithPlayers.id,
-        groupId: testGroup1.id,
-      );
-
-      var groupAdded = await database.groupMatchDao.isGroupInMatch(
-        matchId: testMatchWithPlayers.id,
-        groupId: testGroup1.id,
-      );
-      expect(groupAdded, true);
-
-      groupAdded = await database.groupMatchDao.isGroupInMatch(
-        matchId: testMatchWithPlayers.id,
-        groupId: '',
-      );
-      expect(groupAdded, false);
-    });
-
-    test('Removing group from match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatchWithGroup);
-
-      final groupToRemove = testMatchWithGroup.group!;
-
-      final removed = await database.groupMatchDao.removeGroupFromMatch(
-        groupId: groupToRemove.id,
-        matchId: testMatchWithGroup.id,
-      );
-      expect(removed, true);
-
-      final result = await database.matchDao.getMatchById(
-        matchId: testMatchWithGroup.id,
-      );
-      expect(result.group, null);
-    });
-
-    test('Retrieving group of a match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatchWithGroup);
-      final group = await database.groupMatchDao.getGroupOfMatch(
-        matchId: testMatchWithGroup.id,
-      );
-
-      if (group == null) {
-        fail('Group should not be null');
-      }
-
-      expect(group.id, testGroup1.id);
-      expect(group.name, testGroup1.name);
-      expect(group.createdAt, testGroup1.createdAt);
-      expect(group.members.length, testGroup1.members.length);
-      for (int i = 0; i < group.members.length; i++) {
-        expect(group.members[i].id, testGroup1.members[i].id);
-        expect(group.members[i].name, testGroup1.members[i].name);
-        expect(group.members[i].createdAt, testGroup1.members[i].createdAt);
-      }
-    });
-
-    test('Updating the group of a match works correctly', () async {
-      await database.matchDao.addMatch(match: testMatchWithGroup);
-
-      var group = await database.groupMatchDao.getGroupOfMatch(
-        matchId: testMatchWithGroup.id,
-      );
-
-      if (group == null) {
-        fail('Initial group should not be null');
-      } else {
-        expect(group.id, testGroup1.id);
-        expect(group.name, testGroup1.name);
-        expect(group.createdAt, testGroup1.createdAt);
-        expect(group.members.length, testGroup1.members.length);
-      }
-
-      await database.groupDao.addGroup(group: testGroup2);
-      await database.groupMatchDao.updateGroupOfMatch(
-        matchId: testMatchWithGroup.id,
-        newGroupId: testGroup2.id,
-      );
-
-      group = await database.groupMatchDao.getGroupOfMatch(
-        matchId: testMatchWithGroup.id,
-      );
-
-      if (group == null) {
-        fail('Updated group should not be null');
-      } else {
-        expect(group.id, testGroup2.id);
-        expect(group.name, testGroup2.name);
-        expect(group.createdAt, testGroup2.createdAt);
-        expect(group.members.length, testGroup2.members.length);
-        for (int i = 0; i < group.members.length; i++) {
-          expect(group.members[i].id, testGroup2.members[i].id);
-          expect(group.members[i].name, testGroup2.members[i].name);
-          expect(group.members[i].createdAt, testGroup2.members[i].createdAt);
-        }
-      }
-    });
-
-    test('Adding the same group to seperate matches works correctly', () async {
-      final match1 = Match(name: 'Match 1', group: testGroup1);
-      final match2 = Match(name: 'Match 2', group: testGroup1);
-
-      await Future.wait([
-        database.matchDao.addMatch(match: match1),
-        database.matchDao.addMatch(match: match2),
-      ]);
-
-      final group1 = await database.groupMatchDao.getGroupOfMatch(
-        matchId: match1.id,
-      );
-      final group2 = await database.groupMatchDao.getGroupOfMatch(
-        matchId: match2.id,
-      );
-
-      expect(group1, isNotNull);
-      expect(group2, isNotNull);
-
-      final groups = [group1!, group2!];
-      for (final group in groups) {
-        expect(group.members.length, testGroup1.members.length);
-        expect(group.id, testGroup1.id);
-        expect(group.name, testGroup1.name);
-        expect(group.createdAt, testGroup1.createdAt);
-      }
-    });
-  });
-}