Merge pull request 'MVP' (#141) from development into main

Reviewed-on: #141
Reviewed-by: gelbeinhalb <spam@yannick-weigert.de>

.gitea/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Erstelle eine Meldung für etwas, das nicht Funktioniert, wie es soll.
+title: ''
+labels: 'Task/Bug'
+assignees: ''
+
+---
+
+# Bug Report  
+
+## Beschreibung
+[Eine klare und prägnante Beschreibung des Bugs]  
+
+## Schritte zur Reproduktion
+1. Schritt 1  
+2. Schritt 2  
+3. ...  
+
+## Erwartetes Verhalten
+[Was hätte passieren sollen]  
+
+## Tatsächliches Verhalten
+[Was tatsächlich passiert ist]   
+
+## Screenshots/Protokolle
+[Falls zutreffend, füge Screenshots, Error Logs oder Stack Traces hinzu]   
+
+## Umgebung
+- Plattform: Android, iOS, Web
+- OS: [z. B. iOS 18.5, Android 14]  
+- Flutter Version: [z.B. 3.35.6]
+
+## Verwandte Issues
+[Verweisen Sie auf ähnliche Issues oder PRs]

.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md

@@ -0,0 +1,22 @@
+---
+name: Enhancement
+about: Enhancements for current features
+title: ''
+labels: 'Task\Enhancement'
+assignees: ''
+
+---
+
+# Enhancement  
+
+## Aktuelles Verhalten
+[Beschreibe die bestehende Funktionalität]  
+
+## Einschränkungen/Probleme 
+[Was sind die aktuellen Mängel?]  
+
+## Vorgeschlagene Verbesserung  
+[Wie kann das Problem bzw. die Einschränkung verbessert werden?]  
+
+## Zugehörige Issues
+[Links zu verwandten oder blockierenden Issues]

.gitea/ISSUE_TEMPLATE/FEATURE.md

@@ -0,0 +1,19 @@
+---
+name: Feature
+about: Neues Feature für die App
+title: ''
+labels: 'Task\Feature'
+assignees: ''
+
+---
+
+# Feature  
+
+## Beschreibung
+[Ausführliche Erläuterung der vorgeschlagenen Funktion]  
+
+## Vorgeschlagene Lösung
+[Beschreibe, wie die Feature funktionieren soll]  
+
+## Zugehörige Issues
+[Links zu verwandten oder blockierenden Issues]

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+# [PR Titel]
+
+**Zugehörige Issue(s):**  
+Closes `<issue-no>`
+
+## Beschreibung  
+*Eine klare und prägnante Übersicht über die vorgenommenen Änderungen. Erläutere nicht nur das was gemacht wurde, sondern auch warum.*
+
+## Änderungen  
+- [ ] Neue Funktion X hinzugefügt
+- [ ] Bug in Komponente Y behoben
+- [ ] Modul Z für bessere Leistung refactored
+- [ ] Dependencies aktualisiert
+
+## Zusätzliche Anmerkungen  
+*Gibt es zusätzlichen Kontext, Einschränkungen oder Informationen, die Reviewer wissen sollten?*  

.gitea/issue_template/bug.yaml

@@ -1,53 +0,0 @@
-name: Bug Report
-about: Erstelle eine Bug Report
-labels: 'Task/Bug'
-title: ''
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Beschreibung
-      description: Beschreibe klar und pregnant das Fehlerverhalten
-      placeholder: |
-        - Was genau ist das unerwünschte Verhalten?
-        - Welche Auswirkungen hat der Fehler?
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Schritte zur Reproduktion
-      description: Beschreibe, wie der Fehler reproduziert werden kann
-      placeholder: |
-        - 1. Schritt 1  
-        - 2. Schritt 2  
-        - 3. ...
-
-  - type: dropdown
-    id: enviroment
-    attributes:
-      label: Umgebung
-      description: Gebe an, auf welchen Platformen dieser Fehler auftritt
-      list: false
-      multiple: true
-      options: ['Android', 'iOS']
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: Lösungsidee
-      description: Beschreibe, wie das Problem bzw. gelöst werden kann
-      placeholder: |
-        - Button X ändern, sodass ...
-        - Funktion X so erweitern, dass ...
-        - Design anpassen, sodass ...
-
-  - type: textarea
-    attributes:
-      label: Verwandte Issues
-      description: Verweise auf ähnliche Issues oder PRs
-      placeholder: |
-        - Knüpft an Issue #35 an
-        - Ersetzt Issue #12
-        - Brauch Implementierung von #43

.gitea/issue_template/enhancement.yaml

@@ -1,36 +0,0 @@
-name: Enhancement
-about: Erstelle ein Enhancement-Ticket
-labels: 'Task/Enhancement'
-title: ''
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Aktuelles Verhalten
-      description: Beschreibe, wie die Funktionalität aktuell gestaltet ist
-      placeholder: |
-        - Aktuell macht Button X folgendes ...
-        - Das Problem ist, dass ...
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: Vorgeschlagene Verbesserung
-      description: Beschreibe, wie das Problem bzw. die Einschränkung verbessert werden kann
-      placeholder: |
-        - Button X ändern, sodass ...
-        - Funktion X so erweitern, dass ...
-        - Design anpassen, sodass ...
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Zugehörige Issues
-      description: Links zu verwandten oder blockierenden Issues
-      placeholder: |
-        - Knüpft an Issue #35 an
-        - Ersetzt Issue #12
-        - Brauch Implementierung von #43

.gitea/issue_template/feature.yaml

@@ -1,36 +0,0 @@
-name: Feature
-about: Erstelle ein Feature-Ticket
-labels: 'Task/Feature'
-title: ''
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Beschreibung
-      description: Ausführliche Erläuterung der vorgeschlagenen Funktion
-      placeholder: |
-        - Welchen Zweck erfüllt das Feature?
-        - Welches Problem löst das Feature?
-        - Wer profitiert davon? 
-        - Warum ist es wichtig?
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: Vorgeschlagene Lösung
-      description: Beschreibe, wie das Feature funktionieren soll
-      placeholder: |
-        - Neues Widget, das folgendermaßen aussieht ...
-        - Neue Ansicht, die folgende Inhalte hat
-        - Neue Funktionsweise von Komponente XY
-
-  - type: textarea
-    attributes:
-      label: Zugehörige Issues
-      description: Links zu verwandten oder blockierenden Issues
-      placeholder: |
-        - Knüpft an Issue #35 an
-        - Ersetzt Issue #12
-        - Brauch Implementierung von #43

.gitea/pull_request_template.yaml

@@ -1,47 +0,0 @@
-name: Pull Request
-about: Vorlage für Pull Requests
-title: "WIP: [Name des Issues]"
-
-body:
-  - type: input
-    id: related_issue
-    attributes:
-      label: Zugehörige Issue(s)
-      description: Issues welche mit diesem Pull Request geschlossen werden sollen
-      placeholder: "Closes #123"
-    validations:
-      required: true
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Beschreibung
-      description: |
-        Eine klare und prägnante Zusammenfassung aller vorgenommenen Änderungen.
-      placeholder: |
-        Was wurde geändert?
-    validations:
-      required: true
-
-  - type: textarea
-    id: changes
-    attributes:
-      label: Änderungen
-      description: Liste alle Änderungen detailiert auf, die in diesem Pull Request vorgenommen wurden.
-      placeholder: |
-        - Neue Funktion X hinzugefügt
-        - Bug in Komponente X behoben
-        - Modul X für bessere Leistung refactored
-        - Dependencies aktualisiert
-
-  - type: textarea
-    id: additional_notes
-    attributes:
-      label: Zusätzliche Anmerkungen
-      description: |
-        Gibt es zusätzlichen Kontext, Einschränkungen oder Informationen,
-        die Reviewer wissen sollten?
-      placeholder: |
-        - Bekannte Einschränkungen
-        - Offene TODOs
-        - Hinweise für Reviewer

.gitignore

@@ -150,9 +150,25 @@ app.*.symbols
 .gclient_previous_custom_vars
 .gclient_previous_sync_commits
 
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
 .swiftpm/
 migrate_working_dir/
 
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
 
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
@@ -160,8 +176,17 @@ migrate_working_dir/
 #.vscode/
 
 # Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
 /build/
 
+# Symbolication related
+app.*.symbols
 
 # Obfuscation related
 app.*.map.json
@@ -171,5 +196,3 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 /devtools_options.yaml
-
-untranslated_messages.json

analysis_options.yaml

@@ -11,4 +11,3 @@ linter:
     prefer_const_literals_to_create_immutables: true
     unnecessary_const: true
     lines_longer_than_80_chars: false
-    constant_identifier_names: false

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:label="game_tracker"
         android:name="${applicationName}"
@@ -43,14 +42,5 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
-        <!-- Required for url_launcher to open URLs in external browser -->
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="http" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="https" />
-        </intent>
     </queries>
 </manifest>

android/settings.gradle.kts

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.9.1" apply false
+    id("com.android.application") version "8.7.3" apply false
     id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 

assets/schema.json

@@ -15,43 +15,6 @@
           },
           "name": {
             "type": "string"
-          },
-          "description": {
-            "type": ["string", "null"]
-          }
-        },
-        "required": [
-          "id",
-          "createdAt",
-          "name"
-        ]
-      }
-    },
-    "games": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "createdAt": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "ruleset": {
-            "type": ["string", "null"]
-          },
-          "description": {
-            "type": ["string", "null"]
-          },
-          "color": {
-            "type": ["integer", "null"]
-          },
-          "icon": {
-            "type": ["string", "null"]
           }
         },
         "required": [
@@ -62,38 +25,6 @@
       }
     },
     "groups": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "createdAt": {
-            "type": "string"
-          },
-          "description": {
-            "type": ["string", "null"]
-          },
-          "memberIds": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        },
-        "required": [
-          "id",
-          "name",
-          "createdAt",
-          "memberIds"
-        ]
-      }
-    },
-    "teams": {
       "type": "array",
       "items": {
         "type": "object",
@@ -136,12 +67,6 @@
           "createdAt": {
             "type": "string"
           },
-          "gameId": {
-            "anyOf": [
-              {"type": "string"},
-              {"type": "null"}
-            ]
-          },
           "groupId": {
             "anyOf": [
               {"type": "string"},
@@ -154,7 +79,7 @@
               "type": "string"
             }
           },
-          "notes": {
+          "winnerId": {
             "anyOf": [
               {"type": "string"},
               {"type": "null"}
@@ -165,6 +90,7 @@
           "id",
           "name",
           "createdAt",
+          "groupId",
           "playerIds"
         ]
       }
@@ -172,9 +98,7 @@
   },
   "required": [
     "players",
-    "games",
     "groups",
-    "teams",
     "matches"
   ]
 }

ios/Runner/Info.plist

@@ -24,11 +24,6 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>LSApplicationQueriesSchemes</key>
-    <array>
-        <string>https</string>
-        <string>http</string>
-    </array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

l10n.yaml

@@ -3,4 +3,3 @@ template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 output-dir: lib/l10n/generated
 nullable-getter: false
-untranslated-messages-file: lib/l10n/untranslated_messages.json

lib/core/adaptive_page_route.dart

@@ -1,23 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-/// Returns a platform-adaptive page route based on the current platform.
-/// - On iOS, it returns a [CupertinoPageRoute].
-/// - On other platforms, it returns a [MaterialPageRoute].
-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/core/constants.dart

@@ -1,22 +1,6 @@
-/// Application-wide constants
 class Constants {
   Constants._(); // Private constructor to prevent instantiation
 
   /// Minimum duration of all app skeletons
-  static const Duration MINIMUM_SKELETON_DURATION = Duration(milliseconds: 250);
+  static Duration minimumSkeletonDuration = const Duration(milliseconds: 250);
-
-  /// Maximum length for player names
-  static const int MAX_PLAYER_NAME_LENGTH = 32;
-
-  /// Maximum length for group names
-  static const int MAX_GROUP_NAME_LENGTH = 32;
-
-  /// Maximum length for match names
-  static const int MAX_MATCH_NAME_LENGTH = 32;
-
-  /// Maximum length for game names
-  static const int MAX_GAME_NAME_LENGTH = 32;
-
-  /// Maximum length for team names
-  static const int MAX_TEAM_NAME_LENGTH = 32;
 }

lib/core/custom_theme.dart

@@ -1,38 +1,17 @@
 import 'package:flutter/material.dart';
 
-/// Theme class that defines colors, border radius, padding, and decorations
 class CustomTheme {
   CustomTheme._(); // Private constructor to prevent instantiation
 
   // ==================== Colors ====================
-
-  /// Primary color of the app theme
   static Color primaryColor = const Color(0xFF7505E4);
-
-  /// Secondary color of the app theme
   static Color secondaryColor = const Color(0xFFAFA2FF);
-
-  /// Background color of the app theme
   static Color backgroundColor = const Color(0xFF0B0B0B);
-
-  /// Default color for boxes and containers
   static Color boxColor = const Color(0xFF101010);
-
-  /// Default border color for boxes and containers
-  static Color boxBorder = const Color(0xFF272727);
-
-  /// Color for boxes and containers displayed on boxes
   static Color onBoxColor = const Color(0xFF181818);
-
+  static Color boxBorder = const Color(0xFF272727);
-  /// Text color used throughout the app
   static const Color textColor = Colors.white;
 
-  /// Selected color for the [NavbarItem]
-  static Color navBarItemSelectedColor = primaryColor.withGreen(100);
-
-  /// Unselected color for the [NavbarItem]
-  static Color navBarItemUnselectedColor = Colors.grey.shade400;
-
   // ==================== Border Radius ====================
   static const double standardBorderRadius = 12.0;
   static BorderRadius get standardBorderRadiusAll =>

lib/data/dao/game_dao.dart

@@ -1,179 +0,0 @@
-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

@@ -1,8 +0,0 @@
-// 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,7 +23,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
         return Group(
           id: groupData.id,
           name: groupData.name,
-          description: groupData.description,
           members: members,
           createdAt: groupData.createdAt,
         );
@@ -43,7 +42,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     return Group(
       id: result.id,
       name: result.name,
-      description: result.description,
       members: members,
       createdAt: result.createdAt,
     );
@@ -58,7 +56,6 @@ 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,
@@ -108,7 +105,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                 (group) => GroupTableCompanion.insert(
                   id: group.id,
                   name: group.name,
-                  description: Value(group.description),
                   createdAt: group.createdAt,
                 ),
               )
@@ -136,7 +132,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
-                    description: Value(p.description),
                     createdAt: p.createdAt,
                   ),
                 )
@@ -181,7 +176,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
 
   /// Updates the name of the group with the given [id] to [newName].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateGroupName({
+  Future<bool> updateGroupname({
     required String groupId,
     required String newName,
   }) async {
@@ -192,21 +187,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     return rowsAffected > 0;
   }
 
-  /// Updates the description of the group with the given [groupId] to [newDescription].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateGroupDescription({
-    required String groupId,
-    required String? newDescription,
-  }) async {
-    final rowsAffected =
-        await (update(groupTable)..where((g) => g.id.equals(groupId))).write(
-          GroupTableCompanion(description: Value(newDescription)),
-        );
-    return rowsAffected > 0;
-  }
-
-
-
   /// Retrieves the number of groups in the database.
   Future<int> getGroupCount() async {
     final count =

lib/data/dao/group_match_dao.dart

@@ -0,0 +1,98 @@
+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

@@ -0,0 +1,10 @@
+// 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,17 +1,13 @@
 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, GameTable, GroupTable, PlayerMatchTable])
+@DriftAccessor(tables: [MatchTable])
 class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   MatchDao(super.db);
 
@@ -22,22 +18,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
 
     return Future.wait(
       result.map((row) async {
-        final game = await db.gameDao.getGameById(gameId: row.gameId);
+        final group = await db.groupMatchDao.getGroupOfMatch(matchId: row.id);
-        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,
         );
       }),
     );
@@ -48,110 +42,100 @@ 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,
-      game: game,
-      group: group,
       players: players,
-      notes: result.notes,
+      group: group,
+      winner: winner,
       createdAt: result.createdAt,
     );
   }
 
-  /// Adds a new [Match] to the database. Also adds players associations.
+  /// Adds a new [Match] to the database. Also adds players and group
-  /// This method assumes that the game and group (if any) are already present
+  /// associations. This method assumes that the players and groups added to
-  /// in the database.
+  /// this match are already present 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,
-          gameId: match.game!.id,
+          name: match.name,
-          groupId: Value(match.group?.id),
+          winnerId: Value(match.winner?.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]es to the database in a batch operation.
+  /// Adds multiple [Match]s 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 games first (deduplicated)
+      // Add all matches in batch
-      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(
-            db.gameTable,
+          matchTable,
-            uniqueGames.values
+          matches
               .map(
-                  (game) => GameTableCompanion.insert(
+                (match) => MatchTableCompanion.insert(
-                    id: game.id,
+                  id: match.id,
-                    name: game.name,
+                  name: match.name,
-                    ruleset: game.ruleset ?? '',
+                  createdAt: match.createdAt,
-                    description: Value(game.description),
+                  winnerId: Value(match.winner?.id),
-                    color: Value(game.color?.toString()),
-                    icon: Value(game.icon),
-                    createdAt: game.createdAt,
                 ),
               )
               .toList(),
-            mode: InsertMode.insertOrIgnore,
+          mode: InsertMode.insertOrReplace,
         ),
       );
-      }
 
       // 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(
-                (match) => GroupTableCompanion.insert(
+                (matches) => GroupTableCompanion.insert(
-                  id: match.group!.id,
+                  id: matches.group!.id,
-                  name: match.group!.name,
+                  name: matches.group!.name,
-                  description: Value(match.group!.description),
+                  createdAt: matches.group!.createdAt,
-                  createdAt: match.group!.createdAt,
                 ),
               )
               .toList(),
@@ -159,27 +143,6 @@ 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) {
@@ -197,6 +160,8 @@ 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,
@@ -205,7 +170,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
-                    description: Value(p.description),
                     createdAt: p.createdAt,
                   ),
                 )
@@ -219,13 +183,12 @@ 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,
               );
@@ -251,6 +214,22 @@ 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,
+            );
+          }
+        }
+      });
     });
   }
 
@@ -287,20 +266,52 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     return rowsAffected > 0;
   }
 
-  /// Updates the notes of the match with the given [matchId].
+  /// Sets the winner of the match with the given [matchId] to the player with
+  /// the given [winnerId].
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateMatchNotes({
+  Future<bool> setWinner({
     required String matchId,
-    required String? notes,
+    required String winnerId,
   }) async {
     final query = update(matchTable)..where((g) => g.id.equals(matchId));
     final rowsAffected = await query.write(
-      MatchTableCompanion(notes: Value(notes)),
+      MatchTableCompanion(winnerId: Value(winnerId)),
     );
     return rowsAffected > 0;
   }
 
-  /// Changes the name of the match with the given [matchId] to [newName].
+  /// Retrieves the winner of the match with the given [matchId].
+  /// 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,
@@ -312,80 +323,4 @@ 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;
-  }
-
-  /// Updates the createdAt timestamp of the match with the given [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateMatchCreatedAt({
-    required String matchId,
-    required DateTime createdAt,
-  }) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      MatchTableCompanion(createdAt: Value(createdAt)),
-    );
-    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,11 +4,5 @@ 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,12 +15,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     final result = await query.get();
     return result
         .map(
-          (row) => Player(
+          (row) => Player(id: row.id, name: row.name, createdAt: row.createdAt),
-            id: row.id,
-            name: row.name,
-            description: row.description,
-            createdAt: row.createdAt,
-          ),
         )
         .toList();
   }
@@ -32,7 +27,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
     return Player(
       id: result.id,
       name: result.name,
-      description: result.description,
       createdAt: result.createdAt,
     );
   }
@@ -46,7 +40,6 @@ 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,
@@ -70,7 +63,6 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
               (player) => PlayerTableCompanion.insert(
                 id: player.id,
                 name: player.name,
-                description: Value(player.description),
                 createdAt: player.createdAt,
               ),
             )
@@ -99,7 +91,7 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
   }
 
   /// Updates the name of the player with the given [playerId] to [newName].
-  Future<void> updatePlayerName({
+  Future<void> updatePlayername({
     required String playerId,
     required String newName,
   }) async {

lib/data/dao/player_group_dao.dart

@@ -27,7 +27,7 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     }
 
     if (!await db.playerDao.playerExists(playerId: player.id)) {
-      await db.playerDao.addPlayer(player: player);
+      db.playerDao.addPlayer(player: player);
     }
 
     await into(playerGroupTable).insert(

lib/data/dao/player_match_dao.dart

@@ -1,31 +1,23 @@
 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, TeamTable])
+@DriftAccessor(tables: [PlayerMatchTable])
 class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     with _$PlayerMatchDaoMixin {
   PlayerMatchDao(super.db);
 
   /// Associates a player with a match by inserting a record into the
-  /// [PlayerMatchTable]. Optionally associates with a team and sets initial score.
+  /// [PlayerMatchTable].
   Future<void> addPlayerToMatch({
     required String matchId,
     required String playerId,
-    String? teamId,
-    int score = 0,
   }) async {
     await into(playerMatchTable).insert(
-      PlayerMatchTableCompanion.insert(
+      PlayerMatchTableCompanion.insert(playerId: playerId, matchId: matchId),
-        playerId: playerId,
-        matchId: matchId,
-        teamId: Value(teamId),
-        score: score,
-      ),
       mode: InsertMode.insertOrIgnore,
     );
   }
@@ -46,50 +38,6 @@ 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 {
@@ -148,7 +96,7 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     final playersToAdd = newPlayerIdsSet.difference(currentPlayerIds);
     final playersToRemove = currentPlayerIds.difference(newPlayerIdsSet);
 
-    await db.transaction(() async {
+    db.transaction(() async {
       // Remove old players
       if (playersToRemove.isNotEmpty) {
         await (delete(playerMatchTable)..where(
@@ -166,7 +114,6 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
               (id) => PlayerMatchTableCompanion.insert(
                 playerId: id,
                 matchId: matchId,
-                score: 0,
               ),
             )
             .toList();
@@ -180,23 +127,4 @@ 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,10 +5,7 @@ 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

@@ -1,191 +0,0 @@
-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

@@ -1,12 +0,0 @@
-// 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

@@ -1,147 +0,0 @@
-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,
-          name: row.name,
-          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,
-      name: result.name,
-      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,
-          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: team.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

@@ -1,8 +0,0 @@
-// 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,21 +1,17 @@
 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/dao/score_dao.dart';
+import 'package:game_tracker/data/db/tables/group_match_table.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';
@@ -24,29 +20,25 @@ part 'database.g.dart';
   tables: [
     PlayerTable,
     GroupTable,
-    GameTable,
-    TeamTable,
     MatchTable,
     PlayerGroupTable,
     PlayerMatchTable,
-    ScoreTable,
+    GroupMatchTable,
   ],
   daos: [
     PlayerDao,
     GroupDao,
-    GameDao,
-    TeamDao,
     MatchDao,
     PlayerGroupDao,
     PlayerMatchDao,
-    ScoreDao,
+    GroupMatchDao,
   ],
 )
 class AppDatabase extends _$AppDatabase {
   AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 2;
+  int get schemaVersion => 1;
 
   @override
   MigrationStrategy get migration {

lib/data/db/tables/game_table.dart

@@ -1,14 +0,0 @@
-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

@@ -0,0 +1,13 @@
+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,7 +3,6 @@ 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,15 +1,9 @@
 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 gameId =>
+  TextColumn get name => text()();
-      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
+  late final winnerId = text().nullable()();
-  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,16 +1,12 @@
 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,7 +3,6 @@ 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

@@ -1,16 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,50 +0,0 @@
-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,40 +4,37 @@ import 'package:uuid/uuid.dart';
 
 class Group {
   final String id;
-  final String name;
-  final String? description;
   final DateTime createdAt;
+  final String name;
   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, description: $description, members: $members}';
+    return 'Group{id: $id, name: $name,members: $members}';
   }
 
-  /// Creates a Group instance from a JSON object (memberIds format).
+  /// Creates a Group instance from a JSON object.
-  /// Player objects are reconstructed from memberIds by the DataTransferService.
   Group.fromJson(Map<String, dynamic> json)
     : id = json['id'],
       createdAt = DateTime.parse(json['createdAt']),
       name = json['name'],
-      description = json['description'],
+      members = (json['members'] as List)
-      members = []; // Populated during import via DataTransferService
+          .map((memberJson) => Player.fromJson(memberJson))
+          .toList();
 
-  /// Converts the Group instance to a JSON object using normalized format (memberIds only).
+  /// Converts the Group instance to a JSON object.
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
-    'description': description,
+    'members': members.map((member) => member.toJson()).toList(),
-    'memberIds': members.map((member) => member.id).toList(),
   };
 }

lib/data/dto/match.dart

@@ -1,5 +1,4 @@
 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';
@@ -8,48 +7,45 @@ class Match {
   final String id;
   final DateTime createdAt;
   final String name;
-  final Game? game;
-  final Group? group;
   final List<Player>? players;
-  final String? notes;
+  final Group? group;
-  Player? winner;
+  final Player? winner;
 
   Match({
     String? id,
     DateTime? createdAt,
     required this.name,
-    this.game,
-    this.group,
     this.players,
-    this.notes,
+    this.group,
     this.winner,
   }) : id = id ?? const Uuid().v4(),
        createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
-    return 'Match{id: $id, name: $name, game: $game, group: $group, players: $players, notes: $notes}';
+    return 'Match{\n\tid: $id,\n\tname: $name,\n\tplayers: $players,\n\tgroup: $group,\n\twinner: $winner\n}';
   }
 
-  /// Creates a Match instance from a JSON object (ID references format).
+  /// Creates a Match instance from a JSON object.
-  /// Related objects are reconstructed from IDs by the DataTransferService.
   Match.fromJson(Map<String, dynamic> json)
     : id = json['id'],
-      createdAt = DateTime.parse(json['createdAt']),
       name = json['name'],
-      game = null, // Populated during import via DataTransferService
+      createdAt = DateTime.parse(json['createdAt']),
-      group = null, // Populated during import via DataTransferService
+      players = json['players'] != null
-      players = [], // Populated during import via DataTransferService
+          ? (json['players'] as List)
-      notes = json['notes'];
+                .map((playerJson) => Player.fromJson(playerJson))
+                .toList()
+          : null,
+      group = json['group'] != null ? Group.fromJson(json['group']) : null,
+      winner = json['winner'] != null ? Player.fromJson(json['winner']) : null;
 
-  /// Converts the Match instance to a JSON object using normalized format (ID references only).
+  /// Converts the Match instance to a JSON object.
   Map<String, dynamic> toJson() => {
     'id': id,
     'createdAt': createdAt.toIso8601String(),
     'name': name,
-    'gameId': game?.id,
+    'players': players?.map((player) => player.toJson()).toList(),
-    'groupId': group?.id,
+    'group': group?.toJson(),
-    'playerIds': (players ?? []).map((player) => player.id).toList(),
+    'winner': winner?.toJson(),
-    'notes': notes,
   };
 }

lib/data/dto/player.dart

@@ -5,33 +5,26 @@ class Player {
   final String id;
   final DateTime createdAt;
   final String name;
-  final String? description;
 
-  Player({
+  Player({String? id, DateTime? createdAt, required this.name})
-    String? id,
+    : id = id ?? const Uuid().v4(),
-    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, description: $description}';
+    return 'Player{id: $id,name: $name}';
   }
 
   /// 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

@@ -1,40 +0,0 @@
-import 'package:clock/clock.dart';
-import 'package:game_tracker/data/dto/player.dart';
-import 'package:uuid/uuid.dart';
-
-class Team {
-  final String id;
-  final String name;
-  final DateTime createdAt;
-  final List<Player> members;
-
-  Team({
-    String? id,
-    required this.name,
-    DateTime? createdAt,
-    required this.members,
-  }) : id = id ?? const Uuid().v4(),
-       createdAt = createdAt ?? clock.now();
-
-  @override
-  String toString() {
-    return 'Team{id: $id, name: $name, members: $members}';
-  }
-
-  /// Creates a Team instance from a JSON object (memberIds format).
-  /// Player objects are reconstructed from memberIds by the DataTransferService.
-  Team.fromJson(Map<String, dynamic> json)
-    : id = json['id'],
-      name = json['name'],
-      createdAt = DateTime.parse(json['createdAt']),
-      members = []; // Populated during import via DataTransferService
-
-  /// Converts the Team instance to a JSON object using normalized format (memberIds only).
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'name': name,
-    'createdAt': createdAt.toIso8601String(),
-    'memberIds': members.map((member) => member.id).toList(),
-  };
-}
-

lib/l10n/arb/app_de.arb

@@ -3,8 +3,6 @@
   "all_players": "Alle Spieler:innen",
   "all_players_selected": "Alle Spieler:innen ausgewählt",
   "amount_of_matches": "Anzahl der Spiele",
-  "app_name": "Game Tracker",
-  "best_player": "Beste:r Spieler:in",
   "cancel": "Abbrechen",
   "choose_game": "Spielvorlage wählen",
   "choose_group": "Gruppe wählen",
@@ -14,16 +12,12 @@
   "create_match": "Spiel erstellen",
   "create_new_group": "Neue Gruppe erstellen",
   "create_new_match": "Neues Spiel erstellen",
-  "created_on": "Erstellt am",
-  "data": "Daten",
   "data_successfully_deleted": "Daten erfolgreich gelöscht",
   "data_successfully_exported": "Daten erfolgreich exportiert",
   "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?",
-  "delete_group": "Gruppe löschen",
-  "edit_group": "Gruppe bearbeiten",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",
@@ -33,7 +27,6 @@
   "game_name": "Spielvorlagenname",
   "group": "Gruppe",
   "group_name": "Gruppenname",
-  "group_profile": "Gruppenprofil",
   "groups": "Gruppen",
   "home": "Startseite",
   "import_canceled": "Import abgebrochen",
@@ -41,18 +34,13 @@
   "info": "Info",
   "invalid_schema": "Ungültiges Schema",
   "least_points": "Niedrigste Punkte",
-  "legal": "Rechtliches",
-  "legal_notice": "Impressum",
-  "licenses": "Lizenzen",
   "match_in_progress": "Spiel läuft...",
   "match_name": "Spieltitel",
   "matches": "Spiele",
-  "members": "Mitglieder",
+  "menu": "Menü",
   "most_points": "Höchste Punkte",
   "no_data_available": "Keine Daten verfügbar",
   "no_groups_created_yet": "Noch keine Gruppen erstellt",
-  "no_licenses_found": "Keine Lizenzen gefunden",
-  "no_license_text_available": "Kein Lizenztext verfügbar",
   "no_matches_created_yet": "Noch keine Spiele erstellt",
   "no_players_created_yet": "Noch keine Spieler:in erstellt",
   "no_players_found_with_that_name": "Keine Spieler:in mit diesem Namen gefunden",
@@ -63,11 +51,9 @@
   "none": "Kein",
   "none_group": "Keine",
   "not_available": "Nicht verfügbar",
-  "played_matches": "Gespielte Spiele",
   "player_name": "Spieler:innenname",
   "players": "Spieler:innen",
   "players_count": "{count} Spieler",
-  "privacy_policy": "Datenschutzerklärung",
   "quick_create": "Schnellzugriff",
   "recent_matches": "Letzte Spiele",
   "ruleset": "Regelwerk",
@@ -86,7 +72,7 @@
   "stats": "Statistiken",
   "successfully_added_player": "Spieler:in {playerName} erfolgreich hinzugefügt",
   "there_is_no_group_matching_your_search": "Es gibt keine Gruppe, die deiner Suche entspricht",
-  "this_cannot_be_undone": "Dies kann nicht rückgängig gemacht werden.",
+  "this_cannot_be_undone": "Dies kann nicht rückgängig gemacht werden",
   "today_at": "Heute um",
   "undo": "Rückgängig",
   "unknown_exception": "Unbekannter Fehler (siehe Konsole)",

lib/l10n/arb/app_en.arb

@@ -12,9 +12,6 @@
   "@app_name": {
     "description": "The name of the App"
   },
-  "@best_player": {
-    "description": "Label for best player statistic"
-  },
   "@cancel": {
     "description": "Cancel button text"
   },
@@ -42,12 +39,6 @@
   "@create_new_match": {
     "description": "Button text to create a new match"
   },
-  "@created_on": {
-    "description": "Label for creation date"
-  },
-  "@data": {
-    "description": "Data label"
-  },
   "@data_successfully_deleted": {
     "description": "Success message after deleting data"
   },
@@ -71,12 +62,6 @@
   "@delete_all_data": {
     "description": "Confirmation dialog for deleting all data"
   },
-  "@delete_group": {
-    "description": "Button text to delete a group"
-  },
-  "@edit_group": {
-    "description": "Button text to edit a group"
-  },
   "@error_creating_group": {
     "description": "Error message when group creation fails"
   },
@@ -104,9 +89,6 @@
   "@group_name": {
     "description": "Placeholder for group name input"
   },
-  "@group_profile": {
-    "description": "Title for group profile view"
-  },
   "@groups": {
     "description": "Label for groups"
   },
@@ -128,15 +110,6 @@
   "@least_points": {
     "description": "Title for least points ruleset"
   },
-  "@legal": {
-    "description": "Legal section header"
-  },
-  "@legal_notice": {
-    "description": "Legal notice menu item"
-  },
-  "@licenses": {
-    "description": "Licenses menu item"
-  },
   "@match_in_progress": {
     "description": "Message when match is in progress"
   },
@@ -146,8 +119,8 @@
   "@matches": {
     "description": "Label for matches"
   },
-  "@members": {
+  "@menu": {
-    "description": "Label for group members"
+    "description": "Menu label"
   },
   "@most_points": {
     "description": "Title for most points ruleset"
@@ -158,12 +131,6 @@
   "@no_groups_created_yet": {
     "description": "Message when no groups exist"
   },
-  "@no_licenses_found": {
-    "description": "Message when no licenses are found"
-  },
-  "@no_license_text_available": {
-    "description": "Message when no license text is available"
-  },
   "@no_matches_created_yet": {
     "description": "Message when no matches exist"
   },
@@ -194,9 +161,6 @@
   "@not_available": {
     "description": "Abbreviation for not available"
   },
-  "@played_matches": {
-    "description": "Label for played matches statistic"
-  },
   "@player_name": {
     "description": "Placeholder for player name input"
   },
@@ -211,9 +175,6 @@
       }
     }
   },
-  "@privacy_policy": {
-    "description": "Privacy policy menu item"
-  },
   "@quick_create": {
     "description": "Title for quick create section"
   },
@@ -248,7 +209,7 @@
     "description": "Shows the number of selected players"
   },
   "@settings": {
-    "description": "Label for the App Settings"
+    "description": "Settings label"
   },
   "@single_loser": {
     "description": "Title for single loser ruleset"
@@ -302,7 +263,6 @@
   "all_players_selected": "All players selected",
   "amount_of_matches": "Amount of Matches",
   "app_name": "Game Tracker",
-  "best_player": "Best Player",
   "cancel": "Cancel",
   "choose_game": "Choose Game",
   "choose_group": "Choose Group",
@@ -311,17 +271,13 @@
   "create_group": "Create Group",
   "create_match": "Create match",
   "create_new_group": "Create new group",
-  "created_on": "Created on",
   "create_new_match": "Create new match",
-  "data": "Data",
   "data_successfully_deleted": "Data successfully deleted",
   "data_successfully_exported": "Data successfully exported",
   "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?",
-  "delete_group": "Delete Group",
-  "edit_group": "Edit Group",
   "error_creating_group": "Error while creating group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",
@@ -331,7 +287,6 @@
   "game_name": "Game Name",
   "group": "Group",
   "group_name": "Group name",
-  "group_profile": "Group Profile",
   "groups": "Groups",
   "home": "Home",
   "import_canceled": "Import canceled",
@@ -339,18 +294,13 @@
   "info": "Info",
   "invalid_schema": "Invalid Schema",
   "least_points": "Least Points",
-  "legal": "Legal",
-  "legal_notice": "Legal Notice",
-  "licenses": "Licenses",
   "match_in_progress": "Match in progress...",
   "match_name": "Match name",
   "matches": "Matches",
-  "members": "Members",
+  "menu": "Menu",
   "most_points": "Most Points",
   "no_data_available": "No data available",
   "no_groups_created_yet": "No groups created yet",
-  "no_licenses_found": "No licenses found",
-  "no_license_text_available": "No license text available",
   "no_matches_created_yet": "No matches created yet",
   "no_players_created_yet": "No players created yet",
   "no_players_found_with_that_name": "No players found with that name",
@@ -361,11 +311,9 @@
   "none": "None",
   "none_group": "None",
   "not_available": "Not available",
-  "played_matches": "Played Matches",
   "player_name": "Player name",
   "players": "Players",
   "players_count": "{count} Players",
-  "privacy_policy": "Privacy Policy",
   "quick_create": "Quick Create",
   "recent_matches": "Recent Matches",
   "ruleset": "Ruleset",
@@ -384,7 +332,7 @@
   "stats": "Stats",
   "successfully_added_player": "Successfully added player {playerName}",
   "there_is_no_group_matching_your_search": "There is no group matching your search",
-  "this_cannot_be_undone": "This can't be undone.",
+  "this_cannot_be_undone": "This can't be undone",
   "today_at": "Today at",
   "undo": "Undo",
   "unknown_exception": "Unknown Exception (see console)",

lib/l10n/generated/app_localizations.dart

@@ -122,12 +122,6 @@ abstract class AppLocalizations {
   /// **'Game Tracker'**
   String get app_name;
 
-  /// Label for best player statistic
-  ///
-  /// In en, this message translates to:
-  /// **'Best Player'**
-  String get best_player;
-
   /// Cancel button text
   ///
   /// In en, this message translates to:
@@ -176,24 +170,12 @@ abstract class AppLocalizations {
   /// **'Create new group'**
   String get create_new_group;
 
-  /// Label for creation date
-  ///
-  /// In en, this message translates to:
-  /// **'Created on'**
-  String get created_on;
-
   /// Button text to create a new match
   ///
   /// In en, this message translates to:
   /// **'Create new match'**
   String get create_new_match;
 
-  /// Data label
-  ///
-  /// In en, this message translates to:
-  /// **'Data'**
-  String get data;
-
   /// Success message after deleting data
   ///
   /// In en, this message translates to:
@@ -227,21 +209,9 @@ 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;
 
-  /// Button text to delete a group
-  ///
-  /// In en, this message translates to:
-  /// **'Delete Group'**
-  String get delete_group;
-
-  /// Button text to edit a group
-  ///
-  /// In en, this message translates to:
-  /// **'Edit Group'**
-  String get edit_group;
-
   /// Error message when group creation fails
   ///
   /// In en, this message translates to:
@@ -296,12 +266,6 @@ abstract class AppLocalizations {
   /// **'Group name'**
   String get group_name;
 
-  /// Title for group profile view
-  ///
-  /// In en, this message translates to:
-  /// **'Group Profile'**
-  String get group_profile;
-
   /// Label for groups
   ///
   /// In en, this message translates to:
@@ -344,24 +308,6 @@ abstract class AppLocalizations {
   /// **'Least Points'**
   String get least_points;
 
-  /// Legal section header
-  ///
-  /// In en, this message translates to:
-  /// **'Legal'**
-  String get legal;
-
-  /// Legal notice menu item
-  ///
-  /// In en, this message translates to:
-  /// **'Legal Notice'**
-  String get legal_notice;
-
-  /// Licenses menu item
-  ///
-  /// In en, this message translates to:
-  /// **'Licenses'**
-  String get licenses;
-
   /// Message when match is in progress
   ///
   /// In en, this message translates to:
@@ -380,11 +326,11 @@ abstract class AppLocalizations {
   /// **'Matches'**
   String get matches;
 
-  /// Label for group members
+  /// Menu label
   ///
   /// In en, this message translates to:
-  /// **'Members'**
+  /// **'Menu'**
-  String get members;
+  String get menu;
 
   /// Title for most points ruleset
   ///
@@ -404,18 +350,6 @@ abstract class AppLocalizations {
   /// **'No groups created yet'**
   String get no_groups_created_yet;
 
-  /// Message when no licenses are found
-  ///
-  /// In en, this message translates to:
-  /// **'No licenses found'**
-  String get no_licenses_found;
-
-  /// Message when no license text is available
-  ///
-  /// In en, this message translates to:
-  /// **'No license text available'**
-  String get no_license_text_available;
-
   /// Message when no matches exist
   ///
   /// In en, this message translates to:
@@ -476,12 +410,6 @@ abstract class AppLocalizations {
   /// **'Not available'**
   String get not_available;
 
-  /// Label for played matches statistic
-  ///
-  /// In en, this message translates to:
-  /// **'Played Matches'**
-  String get played_matches;
-
   /// Placeholder for player name input
   ///
   /// In en, this message translates to:
@@ -500,12 +428,6 @@ abstract class AppLocalizations {
   /// **'{count} Players'**
   String players_count(int count);
 
-  /// Privacy policy menu item
-  ///
-  /// In en, this message translates to:
-  /// **'Privacy Policy'**
-  String get privacy_policy;
-
   /// Title for quick create section
   ///
   /// In en, this message translates to:
@@ -572,7 +494,7 @@ abstract class AppLocalizations {
   /// **'Selected players'**
   String get selected_players;
 
-  /// Label for the App Settings
+  /// Settings label
   ///
   /// In en, this message translates to:
   /// **'Settings'**
@@ -617,7 +539,7 @@ abstract class AppLocalizations {
   /// Warning message for irreversible actions
   ///
   /// In en, this message translates to:
-  /// **'This can\'t be undone.'**
+  /// **'This can\'t be undone'**
   String get this_cannot_be_undone;
 
   /// Date format for today

lib/l10n/generated/app_localizations_de.dart

@@ -20,9 +20,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get app_name => 'Game Tracker';
 
-  @override
-  String get best_player => 'Beste:r Spieler:in';
-
   @override
   String get cancel => 'Abbrechen';
 
@@ -49,15 +46,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get create_new_group => 'Neue Gruppe erstellen';
 
-  @override
-  String get created_on => 'Erstellt am';
-
   @override
   String get create_new_match => 'Neues Spiel erstellen';
 
-  @override
-  String get data => 'Daten';
-
   @override
   String get data_successfully_deleted => 'Daten erfolgreich gelöscht';
 
@@ -76,13 +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 delete_group => 'Gruppe löschen';
-
-  @override
-  String get edit_group => 'Gruppe bearbeiten';
 
   @override
   String get error_creating_group =>
@@ -112,9 +97,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get group_name => 'Gruppenname';
 
-  @override
-  String get group_profile => 'Gruppenprofil';
-
   @override
   String get groups => 'Gruppen';
 
@@ -136,15 +118,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get least_points => 'Niedrigste Punkte';
 
-  @override
-  String get legal => 'Rechtliches';
-
-  @override
-  String get legal_notice => 'Impressum';
-
-  @override
-  String get licenses => 'Lizenzen';
-
   @override
   String get match_in_progress => 'Spiel läuft...';
 
@@ -155,7 +128,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get matches => 'Spiele';
 
   @override
-  String get members => 'Mitglieder';
+  String get menu => 'Menü';
 
   @override
   String get most_points => 'Höchste Punkte';
@@ -166,12 +139,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get no_groups_created_yet => 'Noch keine Gruppen erstellt';
 
-  @override
-  String get no_licenses_found => 'Keine Lizenzen gefunden';
-
-  @override
-  String get no_license_text_available => 'Kein Lizenztext verfügbar';
-
   @override
   String get no_matches_created_yet => 'Noch keine Spiele erstellt';
 
@@ -203,9 +170,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get not_available => 'Nicht verfügbar';
 
-  @override
-  String get played_matches => 'Gespielte Spiele';
-
   @override
   String get player_name => 'Spieler:innenname';
 
@@ -217,9 +181,6 @@ class AppLocalizationsDe extends AppLocalizations {
     return '$count Spieler';
   }
 
-  @override
-  String get privacy_policy => 'Datenschutzerklärung';
-
   @override
   String get quick_create => 'Schnellzugriff';
 
@@ -283,7 +244,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get this_cannot_be_undone =>
-      'Dies kann nicht rückgängig gemacht werden.';
+      'Dies kann nicht rückgängig gemacht werden';
 
   @override
   String get today_at => 'Heute um';

lib/l10n/generated/app_localizations_en.dart

@@ -20,9 +20,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get app_name => 'Game Tracker';
 
-  @override
-  String get best_player => 'Best Player';
-
   @override
   String get cancel => 'Cancel';
 
@@ -49,15 +46,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get create_new_group => 'Create new group';
 
-  @override
-  String get created_on => 'Created on';
-
   @override
   String get create_new_match => 'Create new match';
 
-  @override
-  String get data => 'Data';
-
   @override
   String get data_successfully_deleted => 'Data successfully deleted';
 
@@ -76,13 +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 delete_group => 'Delete Group';
-
-  @override
-  String get edit_group => 'Edit Group';
 
   @override
   String get error_creating_group =>
@@ -112,9 +97,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get group_name => 'Group name';
 
-  @override
-  String get group_profile => 'Group Profile';
-
   @override
   String get groups => 'Groups';
 
@@ -136,15 +118,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get least_points => 'Least Points';
 
-  @override
-  String get legal => 'Legal';
-
-  @override
-  String get legal_notice => 'Legal Notice';
-
-  @override
-  String get licenses => 'Licenses';
-
   @override
   String get match_in_progress => 'Match in progress...';
 
@@ -155,7 +128,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get matches => 'Matches';
 
   @override
-  String get members => 'Members';
+  String get menu => 'Menu';
 
   @override
   String get most_points => 'Most Points';
@@ -166,12 +139,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get no_groups_created_yet => 'No groups created yet';
 
-  @override
-  String get no_licenses_found => 'No licenses found';
-
-  @override
-  String get no_license_text_available => 'No license text available';
-
   @override
   String get no_matches_created_yet => 'No matches created yet';
 
@@ -203,9 +170,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get not_available => 'Not available';
 
-  @override
-  String get played_matches => 'Played Matches';
-
   @override
   String get player_name => 'Player name';
 
@@ -217,9 +181,6 @@ class AppLocalizationsEn extends AppLocalizations {
     return '$count Players';
   }
 
-  @override
-  String get privacy_policy => 'Privacy Policy';
-
   @override
   String get quick_create => 'Quick Create';
 
@@ -282,7 +243,7 @@ class AppLocalizationsEn extends AppLocalizations {
       'There is no group matching your search';
 
   @override
-  String get this_cannot_be_undone => 'This can\'t be undone.';
+  String get this_cannot_be_undone => 'This can\'t be undone';
 
   @override
   String get today_at => 'Today at';

lib/main.dart

@@ -44,12 +44,6 @@ 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,19 +1,14 @@
-import 'dart:ui';
-
 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';
 import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/settings_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/settings_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart';
 import 'package:game_tracker/presentation/widgets/navbar_item.dart';
 
 class CustomNavigationBar extends StatefulWidget {
-  /// A custom navigation bar widget that provides tabbed navigation
-  /// between different views: Home, Matches, Groups, and Statistics.
   const CustomNavigationBar({super.key});
 
   @override
@@ -61,7 +56,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                adaptivePageRoute(builder: (_) => const SettingsView()),
+                MaterialPageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;
@@ -75,66 +70,18 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       backgroundColor: CustomTheme.backgroundColor,
       body: tabs[currentIndex],
       extendBody: true,
-      bottomNavigationBar: SizedBox(
+      bottomNavigationBar: SafeArea(
-        height: 70 + MediaQuery.of(context).padding.bottom,
+        minimum: const EdgeInsets.only(bottom: 30),
-        child: Stack(
-          children: [
-            // Dynamically generated blur layers for ultra-smooth transition
-            ...List.generate(34, (index) {
-              // Use cubic curve for an even more natural, smoother transition
-              final progress = index / 34.0; // 0.0 to 1.0
-              final cubic = progress * progress * progress; // cubic curve
-              final blurStrength =
-                  0.5 + (cubic * 50.0); // Very smooth from 0.5 to 50.5
-
-              // Height goes completely from 100% to 0% (all the way down)
-              // With extra density at the bottom for softer transition
-              final heightFactor = index < 25
-                  // First 25 layers: 100% to 30%
-                  ? 1.0 - (progress * 0.7)
-                  // Last 10 layers: 30% to 0% (denser)
-                  : 0.3 - ((index - 25) / 34.0);
-
-              return Positioned(
-                left: 0,
-                right: 0,
-                bottom: 0,
-                height:
-                    (70 + MediaQuery.of(context).padding.bottom) *
-                    heightFactor.clamp(0.05, 1.0),
-                child: ClipRect(
-                  child: BackdropFilter(
-                    filter: ImageFilter.blur(
-                      sigmaX: blurStrength,
-                      sigmaY: blurStrength,
-                    ),
-                    child: Container(color: Colors.transparent),
-                  ),
-                ),
-              );
-            }),
-            // Gradient overlay
-            Positioned.fill(
         child: Container(
+          margin: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 10),
           decoration: BoxDecoration(
-                  gradient: LinearGradient(
+            borderRadius: BorderRadius.circular(24),
-                    begin: Alignment.bottomCenter,
+            color: CustomTheme.primaryColor,
-                    end: Alignment.topCenter,
-                    colors: [
-                      CustomTheme.boxColor.withValues(alpha: 1),
-                      CustomTheme.boxColor.withValues(alpha: 0.5),
-                      CustomTheme.boxColor.withValues(alpha: 0.2),
-                      CustomTheme.boxColor.withValues(alpha: 0.0),
-                    ],
-                    stops: const [0.0, 0.4, 0.8, 1],
           ),
-                ),
+          child: ClipRRect(
-              ),
+            borderRadius: BorderRadius.circular(24),
-            ),
-            // Navbar content
-            SafeArea(
             child: SizedBox(
-                height: 70,
+              height: 60,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceAround,
                 children: <Widget>[
@@ -170,7 +117,6 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
               ),
             ),
           ),
-          ],
         ),
       ),
     );

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

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -12,7 +11,6 @@ import 'package:game_tracker/presentation/widgets/text_input/text_input_field.da
 import 'package:provider/provider.dart';
 
 class CreateGroupView extends StatefulWidget {
-  /// A view that allows the user to create a new group
   const CreateGroupView({super.key});
 
   @override
@@ -46,9 +44,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
+    return Scaffold(
-      child: Scaffold(
-        resizeToAvoidBottomInset: false,
       backgroundColor: CustomTheme.backgroundColor,
       appBar: AppBar(title: Text(loc.create_new_group)),
       body: SafeArea(
@@ -60,7 +56,6 @@ class _CreateGroupViewState extends State<CreateGroupView> {
               child: TextInputField(
                 controller: _groupNameController,
                 hintText: loc.group_name,
-                  maxLength: Constants.MAX_GROUP_NAME_LENGTH,
               ),
             ),
             Expanded(
@@ -111,7 +106,6 @@ class _CreateGroupViewState extends State<CreateGroupView> {
           ],
         ),
       ),
-      ),
     );
   }
 }

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

@@ -1,271 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.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/widgets/app_skeleton.dart';
-import 'package:game_tracker/presentation/widgets/buttons/animated_dialog_button.dart';
-import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
-import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
-import 'package:game_tracker/presentation/widgets/custom_alert_dialog.dart';
-import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart';
-import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-
-class GroupProfileView extends StatefulWidget {
-  /// A view that displays the profile of a group
-  /// - [group]: The group to display
-  const GroupProfileView({
-    super.key,
-    required this.group,
-    required this.callback,
-  });
-
-  /// The group to display
-  final Group group;
-
-  final VoidCallback callback;
-
-  @override
-  State<GroupProfileView> createState() => _GroupProfileViewState();
-}
-
-class _GroupProfileViewState extends State<GroupProfileView> {
-  late final AppDatabase db;
-  bool isLoading = true;
-
-  /// Total matches played in this group
-  int totalMatches = 0;
-
-  String bestPlayer = '';
-
-  @override
-  void initState() {
-    super.initState();
-    db = Provider.of<AppDatabase>(context, listen: false);
-    _loadStatistics();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      backgroundColor: CustomTheme.backgroundColor,
-      appBar: AppBar(
-        title: Text(loc.group_profile),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.delete),
-            onPressed: () async {
-              showDialog<bool>(
-                context: context,
-                builder: (context) => CustomAlertDialog(
-                  title: '${loc.delete_group}?',
-                  content: loc.this_cannot_be_undone,
-                  actions: [
-                    AnimatedDialogButton(
-                      onPressed: () => Navigator.of(context).pop(false),
-                      child: Text(
-                        loc.cancel,
-                        style: const TextStyle(color: CustomTheme.textColor),
-                      ),
-                    ),
-                    AnimatedDialogButton(
-                      onPressed: () => Navigator.of(context).pop(true),
-                      child: Text(
-                        loc.delete,
-                        style: TextStyle(color: CustomTheme.secondaryColor),
-                      ),
-                    ),
-                  ],
-                ),
-              ).then((confirmed) async {
-                if (confirmed! && context.mounted) {
-                  await db.groupDao.deleteGroup(groupId: widget.group.id);
-                  if (!context.mounted) return;
-                  Navigator.pop(context);
-                  widget.callback.call();
-                }
-              });
-            },
-          ),
-        ],
-      ),
-      body: SafeArea(
-        child: Stack(
-          alignment: Alignment.center,
-          children: [
-            ListView(
-              padding: const EdgeInsets.only(
-                left: 12,
-                right: 12,
-                top: 20,
-                bottom: 100,
-              ),
-              children: [
-                const Center(
-                  child: ColoredIconContainer(
-                    icon: Icons.group,
-                    containerSize: 55,
-                    iconSize: 38,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  widget.group.name,
-                  style: const TextStyle(
-                    fontSize: 28,
-                    fontWeight: FontWeight.bold,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 5),
-                Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.group.createdAt)}',
-                  style: const TextStyle(
-                    fontSize: 12,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 20),
-                InfoTile(
-                  title: loc.members,
-                  icon: Icons.people,
-                  horizontalAlignment: CrossAxisAlignment.start,
-                  content: Wrap(
-                    alignment: WrapAlignment.start,
-                    crossAxisAlignment: WrapCrossAlignment.start,
-                    spacing: 12,
-                    runSpacing: 8,
-                    children: widget.group.members.map((member) {
-                      return TextIconTile(
-                        text: member.name,
-                        iconEnabled: false,
-                      );
-                    }).toList(),
-                  ),
-                ),
-                const SizedBox(height: 15),
-                InfoTile(
-                  title: loc.statistics,
-                  icon: Icons.bar_chart,
-                  content: AppSkeleton(
-                    enabled: isLoading,
-                    child: Column(
-                      children: [
-                        _buildStatRow(
-                          loc.members,
-                          widget.group.members.length.toString(),
-                        ),
-                        _buildStatRow(
-                          loc.played_matches,
-                          totalMatches.toString(),
-                        ),
-                        _buildStatRow(loc.best_player, bestPlayer),
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            ),
-            Positioned(
-              bottom: MediaQuery.paddingOf(context).bottom,
-              child: MainMenuButton(
-                text: loc.edit_group,
-                icon: Icons.edit,
-                onPressed: () {
-                  // TODO: Uncomment when GroupDetailView is implemented
-                  /*
-                  await Navigator.push(
-                    context,
-                    adaptivePageRoute(
-                      builder: (context) {
-
-                        return const GroupDetailView();
-                      },
-                    ),
-                  );*/
-                  print('Edit Group pressed');
-                },
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// Builds a single statistic row with a label and value
-  /// - [label]: The label of the statistic
-  /// - [value]: The value of the statistic
-  Widget _buildStatRow(String label, String value) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Row(
-            children: [
-              Text(
-                label,
-                style: const TextStyle(
-                  fontSize: 16,
-                  color: CustomTheme.textColor,
-                ),
-              ),
-            ],
-          ),
-          Text(
-            value,
-            style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
-          ),
-        ],
-      ),
-    );
-  }
-
-  /// Loads statistics for this group
-  Future<void> _loadStatistics() async {
-    final matches = await db.matchDao.getAllMatches();
-    final groupMatches = matches
-        .where((match) => match.group?.id == widget.group.id)
-        .toList();
-
-    setState(() {
-      totalMatches = groupMatches.length;
-      bestPlayer = _getBestPlayer(groupMatches);
-      isLoading = false;
-    });
-  }
-
-  /// Determines the best player in the group based on match wins
-  String _getBestPlayer(List<Match> matches) {
-    final bestPlayerCounts = <Player, int>{};
-
-    // Count wins for each player
-    for (var match in matches) {
-      if (match.winner != null) {
-        bestPlayerCounts.update(
-          match.winner!,
-          (value) => value + 1,
-          ifAbsent: () => 1,
-        );
-      }
-    }
-
-    // Sort players by win count
-    final sortedPlayers = bestPlayerCounts.entries.toList()
-      ..sort((a, b) => b.value.compareTo(a.value));
-
-    // Get the best player
-    bestPlayer = sortedPlayers.isNotEmpty ? sortedPlayers.first.key.name : '-';
-
-    return bestPlayer;
-  }
-}

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

@@ -1,5 +1,4 @@
 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';
@@ -7,15 +6,13 @@ import 'package:game_tracker/data/dto/group.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/group_view/create_group_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/group_view/group_profile_view.dart';
 import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
-import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
 
 class GroupsView extends StatefulWidget {
-  /// A view that displays a list of groups
   const GroupsView({super.key});
 
   @override
@@ -75,35 +72,20 @@ class _GroupsViewState extends State<GroupsView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return GroupTile(
+                  return GroupTile(group: groups[index]);
-                    group: groups[index],
-                    onTap: () async {
-                      await Navigator.push(
-                        context,
-                        adaptivePageRoute(
-                          builder: (context) {
-                            return GroupProfileView(
-                              group: groups[index],
-                              callback: loadGroups,
-                            );
-                          },
-                        ),
-                      );
-                    },
-                  );
                 },
               ),
             ),
           ),
           Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom + 20,
+            bottom: MediaQuery.paddingOf(context).bottom,
-            child: MainMenuButton(
+            child: CustomWidthButton(
               text: loc.create_group,
-              icon: Icons.group_add,
+              sizeRelativeToWidth: 0.90,
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) {
                       return const CreateGroupView();
                     },
@@ -121,12 +103,9 @@ class _GroupsViewState extends State<GroupsView> {
   }
 
   void loadGroups() {
-    setState(() {
-      isLoading = true;
-    });
     Future.wait([
       db.groupDao.getAllGroups(),
-      Future.delayed(Constants.MINIMUM_SKELETON_DURATION),
+      Future.delayed(Constants.minimumSkeletonDuration),
     ]).then((results) {
       loadedGroups = results[0] as List<Group>;
       setState(() {

lib/presentation/views/main_menu/home_view.dart

@@ -1,22 +1,18 @@
 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_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/match_summary_tile.dart';
 import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart';
 import 'package:provider/provider.dart';
 
 class HomeView extends StatefulWidget {
-  /// The main home view of the application, displaying quick info,
-  /// recent matches, and quick create options.
   const HomeView({super.key});
 
   @override
@@ -47,6 +43,7 @@ class _HomeViewState extends State<HomeView> {
           Player(name: 'Skeleton Player 2'),
         ],
       ),
+      winner: Player(name: 'Skeleton Player 1'),
     ),
   );
 
@@ -93,43 +90,74 @@ class _HomeViewState extends State<HomeView> {
                   child: InfoTile(
                     width: constraints.maxWidth * 0.95,
                     title: loc.recent_matches,
-                    icon: Icons.history_rounded,
+                    icon: Icons.timer,
-                    content: Column(
+                    content: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 40.0),
+                      child: Visibility(
+                        visible: !isLoading && loadedRecentMatches.isNotEmpty,
+                        replacement: Center(
+                          heightFactor: 12,
+                          child: Text(
+                            AppLocalizations.of(
+                              context,
+                            ).no_recent_matches_available,
+                          ),
+                        ),
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                        if (recentMatches.isNotEmpty)
+                            MatchSummaryTile(
-                          for (Match match in recentMatches)
+                              matchTitle: recentMatches[0].name,
-                            Padding(
+                              game: 'Winner',
-                              padding: const EdgeInsets.symmetric(
+                              ruleset: 'Ruleset',
-                                vertical: 6.0,
+                              players: _getPlayerText(
+                                recentMatches[0],
+                                context,
                               ),
-                              child: MatchTile(
+                              winner: recentMatches[0].winner == null
-                                compact: true,
+                                  ? AppLocalizations.of(
-                                width: constraints.maxWidth * 0.9,
+                                      context,
-                                match: match,
+                                    ).match_in_progress
-                                onTap: () async {
+                                  : recentMatches[0].winner!.name,
-                                  await Navigator.of(context).push(
-                                    adaptivePageRoute(
-                                      fullscreenDialog: true,
-                                      builder: (context) =>
-                                          MatchResultView(match: match),
                             ),
-                                  );
+                            const Padding(
-                                  await updatedWinnerinRecentMatches(match.id);
+                              padding: EdgeInsets.symmetric(vertical: 8.0),
-                                },
+                              child: Divider(),
                             ),
-                            )
+                            if (loadedRecentMatches.length > 1) ...[
-                        else
+                              MatchSummaryTile(
+                                matchTitle: recentMatches[1].name,
+                                game: 'Winner',
+                                ruleset: 'Ruleset',
+                                players: _getPlayerText(
+                                  recentMatches[1],
+                                  context,
+                                ),
+                                winner: recentMatches[1].winner == null
+                                    ? AppLocalizations.of(
+                                        context,
+                                      ).match_in_progress
+                                    : recentMatches[1].winner!.name,
+                              ),
+                              const SizedBox(height: 8),
+                            ] else ...[
                               Center(
-                            heightFactor: 5,
+                                heightFactor: 5.35,
-                            child: Text(loc.no_recent_matches_available),
+                                child: Text(
+                                  AppLocalizations.of(
+                                    context,
+                                  ).no_second_match_available,
                                 ),
+                              ),
+                            ],
                           ],
                         ),
                       ),
                     ),
-                Padding(
+                  ),
-                  padding: EdgeInsets.zero,
+                ),
-                  child: InfoTile(
+                InfoTile(
                   width: constraints.maxWidth * 0.95,
                   title: loc.quick_create,
                   icon: Icons.add_box_rounded,
@@ -177,8 +205,6 @@ class _HomeViewState extends State<HomeView> {
                     ],
                   ),
                 ),
-                ),
-                SizedBox(height: MediaQuery.paddingOf(context).bottom),
               ],
             ),
           ),
@@ -189,13 +215,13 @@ class _HomeViewState extends State<HomeView> {
 
   /// Loads the data for the HomeView from the database.
   /// This includes the match count, group count, and recent matches.
-  Future<void> loadHomeViewData() async {
+  void loadHomeViewData() {
     final db = Provider.of<AppDatabase>(context, listen: false);
     Future.wait([
       db.matchDao.getMatchCount(),
       db.groupDao.getGroupCount(),
       db.matchDao.getAllMatches(),
-      Future.delayed(Constants.MINIMUM_SKELETON_DURATION),
+      Future.delayed(Constants.minimumSkeletonDuration),
     ]).then((results) {
       matchCount = results[0] as int;
       groupCount = results[1] as int;
@@ -205,6 +231,11 @@ 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;
@@ -213,15 +244,18 @@ class _HomeViewState extends State<HomeView> {
     });
   }
 
-  /// Updates the winner information for a specific match in the recent matches list.
+  /// Generates a text representation of the players in the match.
-  Future<void> updatedWinnerinRecentMatches(String matchId) async {
+  /// If the match has a group, it returns the group name and the number of additional players.
-    final db = Provider.of<AppDatabase>(context, listen: false);
+  /// If there is no group, it returns the count of players.
-    final winner = await db.matchDao.getWinner(matchId: matchId);
+  String _getPlayerText(Match game, context) {
-    final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
+    final loc = AppLocalizations.of(context);
-    if (matchIndex != -1) {
+    if (game.group == null) {
-      setState(() {
+      final playerCount = game.players?.length ?? 0;
-        recentMatches[matchIndex].winner = winner;
+      return loc.players_count(playerCount);
-      });
+    }
-    }
+    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_game_view.dart

@@ -6,21 +6,15 @@ import 'package:game_tracker/presentation/widgets/text_input/custom_search_bar.d
 import 'package:game_tracker/presentation/widgets/tiles/title_description_list_tile.dart';
 
 class ChooseGameView extends StatefulWidget {
-  /// A view that allows the user to choose a game from a list of available games
+  final List<(String, String, Ruleset)> games;
-  /// - [games]: A list of tuples containing the game name, description and ruleset
+  final int initialGameIndex;
-  /// - [initialGameIndex]: The index of the initially selected game
+
   const ChooseGameView({
     super.key,
     required this.games,
     required this.initialGameIndex,
   });
 
-  /// A list of tuples containing the game name, description and ruleset
-  final List<(String, String, Ruleset)> games;
-
-  /// The index of the initially selected game
-  final int initialGameIndex;
-
   @override
   State<ChooseGameView> createState() => _ChooseGameViewState();
 }
@@ -43,7 +37,6 @@ class _ChooseGameViewState extends State<ChooseGameView> {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
-      resizeToAvoidBottomInset: false,
       appBar: AppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back_ios),

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

@@ -7,21 +7,15 @@ import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 
 class ChooseGroupView extends StatefulWidget {
-  /// A view that allows the user to choose a group from a list of groups.
+  final List<Group> groups;
-  /// - [groups]: A list of available groups to choose from
+  final String initialGroupId;
-  /// - [initialGroupId]: The ID of the initially selected group
+
   const ChooseGroupView({
     super.key,
     required this.groups,
     required this.initialGroupId,
   });
 
-  /// A list of available groups to choose from
-  final List<Group> groups;
-
-  /// The ID of the initially selected group
-  final String initialGroupId;
-
   @override
   State<ChooseGroupView> createState() => _ChooseGroupViewState();
 }
@@ -43,7 +37,6 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
-      resizeToAvoidBottomInset: false,
       appBar: AppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back_ios),
@@ -147,12 +140,7 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
         filteredGroups.clear();
         filteredGroups.addAll(
           widget.groups.where(
-            (group) =>
+            (group) => group.name.toLowerCase().contains(query.toLowerCase()),
-                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/choose_ruleset_view.dart

@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/tiles/title_description_list_tile.dart';
+
+class ChooseRulesetView extends StatefulWidget {
+  final List<(Ruleset, String)> rulesets;
+  final int initialRulesetIndex;
+
+  const ChooseRulesetView({
+    super.key,
+    required this.rulesets,
+    required this.initialRulesetIndex,
+  });
+
+  @override
+  State<ChooseRulesetView> createState() => _ChooseRulesetViewState();
+}
+
+class _ChooseRulesetViewState extends State<ChooseRulesetView> {
+  /// Currently selected ruleset index
+  late int selectedRulesetIndex;
+
+  @override
+  void initState() {
+    selectedRulesetIndex = widget.initialRulesetIndex;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+    return DefaultTabController(
+      length: 2,
+      initialIndex: 0,
+      child: Scaffold(
+        backgroundColor: CustomTheme.backgroundColor,
+        appBar: AppBar(
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios),
+            onPressed: () {
+              Navigator.of(context).pop(
+                selectedRulesetIndex == -1
+                    ? null
+                    : widget.rulesets[selectedRulesetIndex].$1,
+              );
+            },
+          ),
+          title: Text(loc.choose_ruleset),
+        ),
+        body: PopScope(
+          // This fixes that the Android Back Gesture didn't return the
+          // selectedRulesetIndex and therefore the selected Ruleset wasn't saved
+          canPop: false,
+          onPopInvokedWithResult: (bool didPop, Object? result) {
+            if (didPop) {
+              return;
+            }
+            Navigator.of(context).pop(
+              selectedRulesetIndex == -1
+                  ? null
+                  : widget.rulesets[selectedRulesetIndex].$1,
+            );
+          },
+          child: ListView.builder(
+            padding: const EdgeInsets.only(bottom: 85),
+            itemCount: widget.rulesets.length,
+            itemBuilder: (BuildContext context, int index) {
+              return TitleDescriptionListTile(
+                onPressed: () async {
+                  setState(() {
+                    if (selectedRulesetIndex == index) {
+                      selectedRulesetIndex = -1;
+                    } else {
+                      selectedRulesetIndex = index;
+                    }
+                  });
+                },
+                title: translateRulesetToString(
+                  widget.rulesets[index].$1,
+                  context,
+                ),
+                description: widget.rulesets[index].$2,
+                isHighlighted: selectedRulesetIndex == index,
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}

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

@@ -1,16 +1,15 @@
+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/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';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_game_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_group_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_ruleset_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:game_tracker/presentation/widgets/player_selection.dart';
@@ -19,12 +18,8 @@ import 'package:game_tracker/presentation/widgets/tiles/choose_tile.dart';
 import 'package:provider/provider.dart';
 
 class CreateMatchView extends StatefulWidget {
-  /// A view that allows creating a new match
-  /// [onWinnerChanged]: Optional callback invoked when the winner is changed
-  const CreateMatchView({super.key, this.onWinnerChanged});
-
-  /// Optional callback invoked when the winner is changed
   final VoidCallback? onWinnerChanged;
+  const CreateMatchView({super.key, this.onWinnerChanged});
 
   @override
   State<CreateMatchView> createState() => _CreateMatchViewState();
@@ -58,6 +53,13 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// the [ChooseGroupView]
   String selectedGroupId = '';
 
+  /// The currently selected ruleset
+  Ruleset? selectedRuleset;
+
+  /// The index of the currently selected ruleset in [rulesets] to mark it in
+  /// the [ChooseRulesetView]
+  int selectedRulesetIndex = -1;
+
   /// The index of the currently selected game in [games] to mark it in
   /// the [ChooseGameView]
   int selectedGameIndex = -1;
@@ -65,6 +67,9 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// The currently selected players
   List<Player>? selectedPlayers;
 
+  /// List of available rulesets with their localized string representations
+  late final List<(Ruleset, String)> _rulesets;
+
   @override
   void initState() {
     super.initState();
@@ -97,8 +102,15 @@ class _CreateMatchViewState extends State<CreateMatchView> {
     super.didChangeDependencies();
     final loc = AppLocalizations.of(context);
     hintText ??= loc.match_name;
+    _rulesets = [
+      (Ruleset.singleWinner, loc.ruleset_single_winner),
+      (Ruleset.singleLoser, loc.ruleset_single_loser),
+      (Ruleset.mostPoints, loc.ruleset_most_points),
+      (Ruleset.leastPoints, loc.ruleset_least_points),
+    ];
   }
 
+  // TODO: Replace when games are implemented
   List<(String, String, Ruleset)> games = [
     ('Example Game 1', 'This is a description', Ruleset.leastPoints),
     ('Example Game 2', '', Ruleset.singleWinner),
@@ -107,9 +119,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
+    return Scaffold(
-      child: Scaffold(
-        resizeToAvoidBottomInset: false,
       backgroundColor: CustomTheme.backgroundColor,
       appBar: AppBar(title: Text(loc.create_new_match)),
       body: SafeArea(
@@ -121,7 +131,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
               child: TextInputField(
                 controller: _matchNameController,
                 hintText: hintText ?? '',
-                  maxLength: Constants.MAX_MATCH_NAME_LENGTH,
               ),
             ),
             ChooseTile(
@@ -131,7 +140,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : games[selectedGameIndex].$1,
               onPressed: () async {
                 selectedGameIndex = await Navigator.of(context).push(
-                    adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) => ChooseGameView(
                       games: games,
                       initialGameIndex: selectedGameIndex,
@@ -141,12 +150,39 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                 setState(() {
                   if (selectedGameIndex != -1) {
                     hintText = games[selectedGameIndex].$1;
+                    selectedRuleset = games[selectedGameIndex].$3;
+                    selectedRulesetIndex = _rulesets.indexWhere(
+                      (r) => r.$1 == selectedRuleset,
+                    );
                   } else {
                     hintText = loc.match_name;
+                    selectedRuleset = null;
                   }
                 });
               },
             ),
+            ChooseTile(
+              title: loc.ruleset,
+              trailingText: selectedRuleset == null
+                  ? loc.none
+                  : translateRulesetToString(selectedRuleset!, context),
+              onPressed: () async {
+                selectedRuleset = await Navigator.of(context).push(
+                  MaterialPageRoute(
+                    builder: (context) => ChooseRulesetView(
+                      rulesets: _rulesets,
+                      initialRulesetIndex: selectedRulesetIndex,
+                    ),
+                  ),
+                );
+                if (!mounted) return;
+                selectedRulesetIndex = _rulesets.indexWhere(
+                  (r) => r.$1 == selectedRuleset,
+                );
+                selectedGameIndex = -1;
+                setState(() {});
+              },
+            ),
             ChooseTile(
               title: loc.group,
               trailingText: selectedGroup == null
@@ -154,7 +190,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : selectedGroup!.name,
               onPressed: () async {
                 selectedGroup = await Navigator.of(context).push(
-                    adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) => ChooseGroupView(
                       groups: groupsList,
                       initialGroupId: selectedGroupId,
@@ -165,8 +201,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                 if (selectedGroup != null) {
                   filteredPlayerList = playerList
                       .where(
-                          (p) =>
+                        (p) => !selectedGroup!.members.any((m) => m.id == p.id),
-                              !selectedGroup!.members.any((m) => m.id == p.id),
                       )
                       .toList();
                 } else {
@@ -193,34 +228,11 @@ class _CreateMatchViewState extends State<CreateMatchView> {
               buttonType: ButtonType.primary,
               onPressed: _enableCreateGameButton()
                   ? () async {
-                        // Use a game from the games list
-                        Game? gameToUse;
-                        if (selectedGameIndex == -1) {
-                          // Use the first game as default if none selected
-                          final selectedGame = games[0];
-                          gameToUse = Game(
-                            name: selectedGame.$1,
-                            description: selectedGame.$2,
-                            ruleset: selectedGame.$3.name,
-                          );
-                        } else {
-                          // Use the selected game from the list
-                          final selectedGame = games[selectedGameIndex];
-                          gameToUse = Game(
-                            name: selectedGame.$1,
-                            description: selectedGame.$2,
-                            ruleset: selectedGame.$3.name,
-                          );
-                        }
-                        // Add the game to the database if it doesn't exist
-                        await db.gameDao.addGame(game: gameToUse);
-
                       Match match = Match(
                         name: _matchNameController.text.isEmpty
                             ? (hintText ?? '')
                             : _matchNameController.text.trim(),
                         createdAt: DateTime.now(),
-                          game: gameToUse,
                         group: selectedGroup,
                         players: selectedPlayers,
                       );
@@ -228,7 +240,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                       if (context.mounted) {
                         Navigator.pushReplacement(
                           context,
-                            adaptivePageRoute(
+                          CupertinoPageRoute(
                             fullscreenDialog: true,
                             builder: (context) => MatchResultView(
                               match: match,
@@ -243,7 +255,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
           ],
         ),
       ),
-      ),
     );
   }
 
@@ -254,6 +265,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// - Either a group is selected OR at least 2 players are selected
   bool _enableCreateGameButton() {
     return (selectedGroup != null ||
-            (selectedPlayers != null && selectedPlayers!.length > 1));
+            (selectedPlayers != null && selectedPlayers!.length > 1)) &&
+        selectedRuleset != null;
   }
 }

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

@@ -8,17 +8,11 @@ import 'package:game_tracker/presentation/widgets/tiles/custom_radio_list_tile.d
 import 'package:provider/provider.dart';
 
 class MatchResultView extends StatefulWidget {
-  /// A view that allows selecting and saving the winner of a match
-  /// [match]: The match for which the winner is to be selected
-  /// [onWinnerChanged]: Optional callback invoked when the winner is changed
-  const MatchResultView({super.key, required this.match, this.onWinnerChanged});
-
-  /// The match for which the winner is to be selected
   final Match match;
 
-  /// Optional callback invoked when the winner is changed
   final VoidCallback? onWinnerChanged;
 
+  const MatchResultView({super.key, required this.match, this.onWinnerChanged});
   @override
   State<MatchResultView> createState() => _MatchResultViewState();
 }

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

@@ -1,8 +1,7 @@
 import 'dart:core' hide Match;
 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:fluttericon/rpg_awesome_icons.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';
@@ -13,13 +12,12 @@ import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/create_match_view.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/main_menu_button.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
 
 class MatchView extends StatefulWidget {
-  /// A view that displays a list of matches
   const MatchView({super.key});
 
   @override
@@ -80,15 +78,11 @@ class _MatchViewState extends State<MatchView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return Center(
+                  return MatchTile(
-                    child: Padding(
-                      padding: const EdgeInsets.only(bottom: 12.0),
-                      child: MatchTile(
-                        width: MediaQuery.sizeOf(context).width * 0.95,
                     onTap: () async {
                       Navigator.push(
                         context,
-                            adaptivePageRoute(
+                        CupertinoPageRoute(
                           fullscreenDialog: true,
                           builder: (context) => MatchResultView(
                             match: matches[index],
@@ -98,22 +92,20 @@ class _MatchViewState extends State<MatchView> {
                       );
                     },
                     match: matches[index],
-                      ),
-                    ),
                   );
                 },
               ),
             ),
           ),
           Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom + 20,
+            bottom: MediaQuery.paddingOf(context).bottom,
-            child: MainMenuButton(
+            child: CustomWidthButton(
-              text: 'Spiel erstellen',
+              text: loc.create_match,
-              icon: RpgAwesome.clovers_card,
+              sizeRelativeToWidth: 0.90,
               onPressed: () async {
                 Navigator.push(
                   context,
-                  adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),
@@ -130,7 +122,7 @@ class _MatchViewState extends State<MatchView> {
   void loadGames() {
     Future.wait([
       db.matchDao.getAllMatches(),
-      Future.delayed(Constants.MINIMUM_SKELETON_DURATION),
+      Future.delayed(Constants.minimumSkeletonDuration),
     ]).then((results) {
       if (mounted) {
         setState(() {

lib/presentation/views/main_menu/settings_view.dart

@@ -0,0 +1,197 @@
+import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+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';
+
+class SettingsView extends StatefulWidget {
+  const SettingsView({super.key});
+
+  @override
+  State<SettingsView> createState() => _SettingsViewState();
+}
+
+class _SettingsViewState extends State<SettingsView> {
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+    return Scaffold(
+      appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
+      backgroundColor: CustomTheme.backgroundColor,
+      body: LayoutBuilder(
+        builder: (BuildContext context, BoxConstraints constraints) =>
+            SingleChildScrollView(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.fromLTRB(24, 0, 24, 10),
+                    child: Text(
+                      textAlign: TextAlign.start,
+                      loc.menu,
+                      style: const TextStyle(
+                        fontSize: 28,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 24,
+                      vertical: 10,
+                    ),
+                    child: Text(
+                      textAlign: TextAlign.start,
+                      loc.settings,
+                      style: const TextStyle(
+                        fontSize: 22,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  SettingsListTile(
+                    title: loc.export_data,
+                    icon: Icons.upload_rounded,
+                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+                    onPressed: () async {
+                      final String json =
+                          await DataTransferService.getAppDataAsJson(context);
+                      final result = await DataTransferService.exportData(
+                        json,
+                        'game_tracker-data',
+                      );
+                      if (!context.mounted) return;
+                      showExportSnackBar(context: context, result: result);
+                    },
+                  ),
+                  SettingsListTile(
+                    title: loc.import_data,
+                    icon: Icons.download_rounded,
+                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+                    onPressed: () async {
+                      final result = await DataTransferService.importData(
+                        context,
+                      );
+                      if (!context.mounted) return;
+                      showImportSnackBar(context: context, result: result);
+                    },
+                  ),
+                  SettingsListTile(
+                    title: loc.delete_all_data,
+                    icon: Icons.delete_rounded,
+                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+                    onPressed: () {
+                      showDialog<bool>(
+                        context: context,
+                        builder: (context) => AlertDialog(
+                          title: Text(loc.delete_all_data),
+                          content: Text(loc.this_cannot_be_undone),
+                          actions: [
+                            TextButton(
+                              onPressed: () => Navigator.of(context).pop(false),
+                              child: Text(loc.cancel),
+                            ),
+                            TextButton(
+                              onPressed: () => Navigator.of(context).pop(true),
+                              child: Text(loc.delete),
+                            ),
+                          ],
+                        ),
+                      ).then((confirmed) {
+                        if (confirmed == true && context.mounted) {
+                          DataTransferService.deleteAllData(context);
+                          showSnackbar(
+                            context: context,
+                            message: AppLocalizations.of(
+                              context,
+                            ).data_successfully_deleted,
+                          );
+                        }
+                      });
+                    },
+                  ),
+                ],
+              ),
+            ),
+      ),
+    );
+  }
+
+  /// Displays a snackbar based on the import result.
+  ///
+  /// [context] The BuildContext to show the snackbar in.
+  /// [result] The result of the import operation.
+  void showImportSnackBar({
+    required BuildContext context,
+    required ImportResult result,
+  }) {
+    final loc = AppLocalizations.of(context);
+    switch (result) {
+      case ImportResult.success:
+        showSnackbar(context: context, message: loc.data_successfully_imported);
+      case ImportResult.invalidSchema:
+        showSnackbar(context: context, message: loc.invalid_schema);
+      case ImportResult.fileReadError:
+        showSnackbar(context: context, message: loc.error_reading_file);
+      case ImportResult.canceled:
+        showSnackbar(context: context, message: loc.import_canceled);
+      case ImportResult.formatException:
+        showSnackbar(context: context, message: loc.format_exception);
+      case ImportResult.unknownException:
+        showSnackbar(context: context, message: loc.unknown_exception);
+    }
+  }
+
+  /// Displays a snackbar based on the export result.
+  ///
+  /// [context] The BuildContext to show the snackbar in.
+  /// [result] The result of the export operation.
+  void showExportSnackBar({
+    required BuildContext context,
+    required ExportResult result,
+  }) {
+    final loc = AppLocalizations.of(context);
+    switch (result) {
+      case ExportResult.success:
+        showSnackbar(context: context, message: loc.data_successfully_exported);
+      case ExportResult.canceled:
+        showSnackbar(context: context, message: loc.export_canceled);
+      case ExportResult.unknownException:
+        showSnackbar(context: context, message: loc.unknown_exception);
+    }
+  }
+
+  /// Displays a snackbar with the given message and optional action.
+  ///
+  /// [context] The BuildContext to show the snackbar in.
+  /// [message] The message to display in the snackbar.
+  /// [duration] The duration for which the snackbar is displayed.
+  /// [action] An optional callback function to execute when the action button is pressed.
+  void showSnackbar({
+    required BuildContext context,
+    required String message,
+    Duration duration = const Duration(seconds: 3),
+    VoidCallback? action,
+  }) {
+    final loc = AppLocalizations.of(context);
+    final messenger = ScaffoldMessenger.of(context);
+    messenger.hideCurrentSnackBar();
+    messenger.showSnackBar(
+      SnackBar(
+        content: Text(message, style: const TextStyle(color: Colors.white)),
+        backgroundColor: CustomTheme.onBoxColor,
+        duration: duration,
+        action: action != null
+            ? SnackBarAction(label: loc.undo, onPressed: action)
+            : null,
+      ),
+    );
+  }
+}

lib/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart

@@ -1,133 +0,0 @@
-import 'package:flutter/material.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/settings_view/licenses/oss_licenses.dart';
-import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class LicenseDetailView extends StatelessWidget {
-  /// A detailed view displaying information about a software package license.
-  /// - [package]: The package data to be displayed.
-  const LicenseDetailView({super.key, required this.package});
-
-  /// The package data to be displayed.
-  final Package package;
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      appBar: AppBar(title: const Text('Lizenzdetails')),
-      body: SingleChildScrollView(
-        padding: const EdgeInsets.symmetric(horizontal: 8),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Center(
-              child: Column(
-                children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const ColoredIconContainer(
-                        icon: Icons.description,
-                        margin: EdgeInsetsGeometry.only(right: 15),
-                        containerSize: 60,
-                        iconSize: 30,
-                      ),
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            package.name,
-                            textAlign: TextAlign.left,
-                            style: const TextStyle(
-                              height: 0,
-                              fontSize: 24,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          if (package.version != null) ...[
-                            Text(
-                              'Version ${package.version}',
-                              textAlign: TextAlign.left,
-                              style: TextStyle(
-                                fontSize: 14,
-                                color: Colors.grey.shade300,
-                              ),
-                            ),
-                          ],
-                        ],
-                      ),
-                    ],
-                  ),
-
-                  if (package.authors.isNotEmpty) ...[
-                    const SizedBox(height: 8),
-                    SelectableText(
-                      package.authors.join(', '),
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: Colors.grey.shade500,
-                      ),
-                    ),
-                  ],
-                  if (package.homepage != null &&
-                      package.homepage!.isNotEmpty) ...[
-                    const SizedBox(height: 8),
-                    GestureDetector(
-                      onTap: () async {
-                        final uri = Uri.parse(package.homepage!);
-                        await launchUrl(uri, mode: LaunchMode.platformDefault);
-                      },
-                      child: SizedBox(
-                        width: 300,
-                        child: Text(
-                          package.homepage!,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          textAlign: TextAlign.center,
-                          style: TextStyle(
-                            fontSize: 12,
-                            color: CustomTheme.secondaryColor,
-                            decoration: TextDecoration.underline,
-                            decorationColor: CustomTheme.secondaryColor,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                ],
-              ),
-            ),
-            const SizedBox(height: 20),
-            Container(
-              width: double.infinity,
-              padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
-              decoration: CustomTheme.standardBoxDecoration,
-              child: (package.license != null && package.license!.isNotEmpty)
-                  ? SelectableText(
-                      package.license!,
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: Colors.grey.shade300,
-                        height: 1.5,
-                        fontFamily: 'monospace',
-                      ),
-                    )
-                  : Center(
-                      heightFactor: 25,
-                      child: Text(
-                        loc.no_license_text_available,
-                        style: TextStyle(color: Colors.grey.shade500),
-                      ),
-                    ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/presentation/views/main_menu/settings_view/licenses_view.dart

@@ -1,33 +0,0 @@
-import 'package:flutter/material.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/settings_view/licenses/oss_licenses.dart';
-import 'package:game_tracker/presentation/widgets/tiles/license_tile.dart';
-
-class LicensesView extends StatelessWidget {
-  /// A view that displays a list of open source licenses used in the app
-  const LicensesView({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(loc.licenses),
-        backgroundColor: CustomTheme.backgroundColor,
-      ),
-      backgroundColor: CustomTheme.backgroundColor,
-      body: ListView.builder(
-        itemCount: allDependencies.length,
-        itemBuilder: (context, index) {
-          final package = allDependencies[index];
-          return Padding(
-            padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-            child: LicenseTile(package: package),
-          );
-        },
-      ),
-    );
-  }
-}

lib/presentation/views/main_menu/settings_view/settings_view.dart

@@ -1,349 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses_view.dart';
-import 'package:game_tracker/presentation/widgets/buttons/animated_dialog_button.dart';
-import 'package:game_tracker/presentation/widgets/custom_alert_dialog.dart';
-import 'package:game_tracker/presentation/widgets/tiles/settings_list_tile.dart';
-import 'package:game_tracker/services/data_transfer_service.dart';
-import 'package:intl/intl.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SettingsView extends StatefulWidget {
-  /// The settings view of the application, allowing users to manage data
-  /// and view legal information.
-  const SettingsView({super.key});
-
-  @override
-  State<SettingsView> createState() => _SettingsViewState();
-}
-
-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 ScaffoldMessenger(
-      child: Builder(
-        builder: (scaffoldMessengerContext) {
-          return Scaffold(
-            appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
-            backgroundColor: CustomTheme.backgroundColor,
-            body: SingleChildScrollView(
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.only(left: 16, bottom: 10),
-                    child: Text(
-                      textAlign: TextAlign.start,
-                      loc.settings,
-                      style: const TextStyle(
-                        fontSize: 28,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 16,
-                      top: 10,
-                      bottom: 10,
-                    ),
-                    child: Text(
-                      textAlign: TextAlign.start,
-                      loc.data,
-                      style: const TextStyle(
-                        fontSize: 22,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  SettingsListTile(
-                    title: loc.export_data,
-                    icon: Icons.upload,
-                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                    onPressed: () async {
-                      final String json =
-                          await DataTransferService.getAppDataAsJson(
-                            scaffoldMessengerContext,
-                          );
-                      final result = await DataTransferService.exportData(
-                        json,
-                        'game_tracker-data',
-                      );
-                      if (!scaffoldMessengerContext.mounted) return;
-                      showExportSnackBar(
-                        context: scaffoldMessengerContext,
-                        result: result,
-                      );
-                    },
-                  ),
-                  SettingsListTile(
-                    title: loc.import_data,
-                    icon: Icons.download,
-                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                    onPressed: () async {
-                      final result = await DataTransferService.importData(
-                        scaffoldMessengerContext,
-                      );
-                      if (!scaffoldMessengerContext.mounted) return;
-                      showImportSnackBar(
-                        context: scaffoldMessengerContext,
-                        result: result,
-                      );
-                    },
-                  ),
-                  SettingsListTile(
-                    title: loc.delete_all_data,
-                    icon: Icons.delete,
-                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                    onPressed: () {
-                      showDialog<bool>(
-                        context: context,
-                        builder: (context) => CustomAlertDialog(
-                          title: '${loc.delete_all_data}?',
-                          content: loc.this_cannot_be_undone,
-                          actions: [
-                            AnimatedDialogButton(
-                              onPressed: () => Navigator.of(context).pop(false),
-                              child: Text(
-                                loc.cancel,
-                                style: const TextStyle(
-                                  color: CustomTheme.textColor,
-                                ),
-                              ),
-                            ),
-                            AnimatedDialogButton(
-                              onPressed: () => Navigator.of(context).pop(true),
-                              child: Text(
-                                loc.delete,
-                                style: TextStyle(
-                                  color: CustomTheme.secondaryColor,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ).then((confirmed) {
-                        if (confirmed == true && context.mounted) {
-                          DataTransferService.deleteAllData(context);
-                          showSnackbar(
-                            context: scaffoldMessengerContext,
-                            message: AppLocalizations.of(
-                              context,
-                            ).data_successfully_deleted,
-                          );
-                        }
-                      });
-                    },
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 16,
-                      top: 10,
-                      bottom: 10,
-                    ),
-                    child: Text(
-                      textAlign: TextAlign.start,
-                      loc.legal,
-                      style: const TextStyle(
-                        fontSize: 22,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  ),
-                  SettingsListTile(
-                    title: loc.licenses,
-                    icon: Icons.insert_drive_file,
-                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                    onPressed: () {
-                      Navigator.of(context).push(
-                        MaterialPageRoute(
-                          builder: (context) => const LicensesView(),
-                        ),
-                      );
-                    },
-                  ),
-                  SettingsListTile(
-                    title: loc.legal_notice,
-                    icon: Icons.account_balance_sharp,
-                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                    onPressed: null,
-                  ),
-                  SettingsListTile(
-                    title: loc.privacy_policy,
-                    icon: Icons.gpp_good_rounded,
-                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                    onPressed: null,
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(top: 30, bottom: 20),
-                    child: Center(
-                      child: Column(
-                        spacing: 4,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 12),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              spacing: 40,
-                              children: [
-                                GestureDetector(
-                                  child: const Icon(Icons.language),
-                                  onTap: () => {
-                                    launchUrl(
-                                      Uri.parse('https://liquid-dev.de'),
-                                    ),
-                                  },
-                                ),
-                                GestureDetector(
-                                  child: const FaIcon(FontAwesomeIcons.github),
-                                  onTap: () => {
-                                    launchUrl(
-                                      Uri.parse(
-                                        'https://github.com/liquiddevelopmentde',
-                                      ),
-                                    ),
-                                  },
-                                ),
-                                GestureDetector(
-                                  child: Icon(
-                                    Platform.isIOS
-                                        ? CupertinoIcons.mail_solid
-                                        : Icons.email,
-                                  ),
-                                  onTap: () => launchUrl(
-                                    Uri.parse('mailto:hi@liquid-dev.de'),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                          Text(
-                            '© ${DateFormat('yyyy').format(DateTime.now())} Liquid Development',
-                            style: TextStyle(
-                              color: Colors.grey.shade600,
-                              fontSize: 14,
-                              fontWeight: FontWeight.w600,
-                            ),
-                          ),
-                          Text(
-                            'Version ${_packageInfo.version} (${_packageInfo.buildNumber})',
-                            style: TextStyle(
-                              color: Colors.grey.shade600,
-                              fontSize: 14,
-                              fontWeight: FontWeight.w600,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  /// Displays a snackbar based on the import result.
-  ///
-  /// [context] The BuildContext to show the snackbar in.
-  /// [result] The result of the import operation.
-  void showImportSnackBar({
-    required BuildContext context,
-    required ImportResult result,
-  }) {
-    final loc = AppLocalizations.of(context);
-    switch (result) {
-      case ImportResult.success:
-        showSnackbar(context: context, message: loc.data_successfully_imported);
-      case ImportResult.invalidSchema:
-        showSnackbar(context: context, message: loc.invalid_schema);
-      case ImportResult.fileReadError:
-        showSnackbar(context: context, message: loc.error_reading_file);
-      case ImportResult.canceled:
-        showSnackbar(context: context, message: loc.import_canceled);
-      case ImportResult.formatException:
-        showSnackbar(context: context, message: loc.format_exception);
-      case ImportResult.unknownException:
-        showSnackbar(context: context, message: loc.unknown_exception);
-    }
-  }
-
-  /// Displays a snackbar based on the export result.
-  ///
-  /// [context] The BuildContext to show the snackbar in.
-  /// [result] The result of the export operation.
-  void showExportSnackBar({
-    required BuildContext context,
-    required ExportResult result,
-  }) {
-    final loc = AppLocalizations.of(context);
-    switch (result) {
-      case ExportResult.success:
-        showSnackbar(context: context, message: loc.data_successfully_exported);
-      case ExportResult.canceled:
-        showSnackbar(context: context, message: loc.export_canceled);
-      case ExportResult.unknownException:
-        showSnackbar(context: context, message: loc.unknown_exception);
-    }
-  }
-
-  /// Displays a snackbar with the given message and optional action.
-  ///
-  /// [context] The BuildContext to show the snackbar in.
-  /// [message] The message to display in the snackbar.
-  /// [duration] The duration for which the snackbar is displayed.
-  /// [action] An optional callback function to execute when the action button is pressed.
-  void showSnackbar({
-    required BuildContext context,
-    required String message,
-    Duration duration = const Duration(seconds: 3),
-    VoidCallback? action,
-  }) {
-    if (!context.mounted) return;
-
-    final loc = AppLocalizations.of(context);
-    ScaffoldMessenger.of(context).hideCurrentSnackBar();
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(
-        content: Text(message, style: const TextStyle(color: Colors.white)),
-        backgroundColor: CustomTheme.onBoxColor,
-        duration: duration,
-        action: action != null
-            ? SnackBarAction(label: loc.undo, onPressed: action)
-            : null,
-      ),
-    );
-  }
-
-  /// Initializes the package information.
-  Future<void> _initPackageInfo() async {
-    final info = await PackageInfo.fromPlatform();
-    setState(() {
-      _packageInfo = info;
-    });
-  }
-}

lib/presentation/views/main_menu/statistics_view.dart

@@ -10,7 +10,6 @@ import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
 
 class StatisticsView extends StatefulWidget {
-  /// A view that displays player statistics
   const StatisticsView({super.key});
 
   @override
@@ -106,7 +105,7 @@ class _StatisticsViewState extends State<StatisticsView> {
     Future.wait([
       db.matchDao.getAllMatches(),
       db.playerDao.getAllPlayers(),
-      Future.delayed(Constants.MINIMUM_SKELETON_DURATION),
+      Future.delayed(Constants.minimumSkeletonDuration),
     ]).then((results) async {
       if (!mounted) return;
       final matches = results[0] as List<Match>;

lib/presentation/widgets/app_skeleton.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 
-class AppSkeleton extends StatefulWidget {
 /// A widget that provides a skeleton loading effect to its child widget tree.
 /// - [child]: The widget tree to apply the skeleton effect to.
 /// - [enabled]: A boolean to enable or disable the skeleton effect.
 /// - [fixLayoutBuilder]: A boolean to fix the layout builder for AnimatedSwitcher.
+class AppSkeleton extends StatefulWidget {
   const AppSkeleton({
     super.key,
     required this.child,

lib/presentation/widgets/buttons/animated_dialog_button.dart

@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-
-class AnimatedDialogButton extends StatefulWidget {
-  /// A custom animated button widget that provides a scaling and opacity effect
-  /// when pressed.
-  /// - [onPressed]: Callback function that is triggered when the button is pressed.
-  /// - [child]: The child widget to be displayed inside the button, typically a text or icon.
-  const AnimatedDialogButton({
-    super.key,
-    required this.onPressed,
-    required this.child,
-  });
-
-  /// Callback function that is triggered when the button is pressed.
-  final VoidCallback onPressed;
-
-  /// The child widget to be displayed inside the button, typically a text or icon.
-  final Widget child;
-
-  @override
-  State<AnimatedDialogButton> createState() => _AnimatedDialogButtonState();
-}
-
-class _AnimatedDialogButtonState extends State<AnimatedDialogButton> {
-  bool _isPressed = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTapDown: (_) => setState(() => _isPressed = true),
-      onTapUp: (_) => setState(() => _isPressed = false),
-      onTapCancel: () => setState(() => _isPressed = false),
-      onTap: widget.onPressed,
-      child: AnimatedScale(
-        scale: _isPressed ? 0.95 : 1.0,
-        duration: const Duration(milliseconds: 100),
-        child: AnimatedOpacity(
-          opacity: _isPressed ? 0.6 : 1.0,
-          duration: const Duration(milliseconds: 100),
-          child: Container(
-            decoration: CustomTheme.standardBoxDecoration,
-            padding: const EdgeInsets.symmetric(horizontal: 26, vertical: 6),
-            child: widget.child,
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/presentation/widgets/buttons/custom_width_button.dart

@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
 
-class CustomWidthButton extends StatelessWidget {
 /// A custom button widget that is designed to have a width relative to the screen size.
 /// It supports three types of buttons: primary, secondary, and text buttons.
 /// - [text]: The text to display on the button.
 /// - [buttonType]: The type of button to display. Defaults to [ButtonType.primary].
 /// - [sizeRelativeToWidth]: The size of the button relative to the width of the screen.
 /// - [onPressed]: The callback to be invoked when the button is pressed.
+class CustomWidthButton extends StatelessWidget {
   const CustomWidthButton({
     super.key,
     required this.text,

lib/presentation/widgets/buttons/main_menu_button.dart

@@ -1,98 +0,0 @@
-import 'package:flutter/material.dart';
-
-class MainMenuButton extends StatefulWidget {
-  /// A button for the main menu with an optional icon and a press animation.
-  /// - [text]: The text of the button.
-  /// - [icon]: The icon of the button.
-  /// - [onPressed]: The callback to be invoked when the button is pressed.
-  const MainMenuButton({
-    super.key,
-    required this.text,
-    this.icon,
-    required this.onPressed,
-  });
-
-  /// The text of the button.
-  final String text;
-
-  /// The icon of the button.
-  final IconData? icon;
-
-  /// The callback to be invoked when the button is pressed.
-  final void Function() onPressed;
-
-  @override
-  State<MainMenuButton> createState() => _MainMenuButtonState();
-}
-
-class _MainMenuButtonState extends State<MainMenuButton>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _animationController;
-  late Animation<double> _scaleAnimation;
-
-  @override
-  void initState() {
-    super.initState();
-
-    _animationController = AnimationController(
-      duration: const Duration(milliseconds: 100),
-      vsync: this,
-    );
-
-    _scaleAnimation = Tween<double>(begin: 1.0, end: 0.95).animate(
-      CurvedAnimation(parent: _animationController, curve: Curves.easeInOut),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ScaleTransition(
-      scale: _scaleAnimation,
-      child: GestureDetector(
-        onTapDown: (_) {
-          _animationController.forward();
-        },
-        onTapUp: (_) async {
-          await _animationController.reverse();
-          if (mounted) {
-            widget.onPressed();
-          }
-        },
-        onTapCancel: () {
-          _animationController.reverse();
-        },
-        child: Container(
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(30),
-          ),
-          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14),
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              if (widget.icon != null) ...[
-                Icon(widget.icon, size: 26, color: Colors.black),
-                const SizedBox(width: 7),
-              ],
-              Text(
-                widget.text,
-                style: const TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                  color: Colors.black,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-}

lib/presentation/widgets/buttons/quick_create_button.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class QuickCreateButton extends StatefulWidget {
 /// A button widget designed for quick creating matches in the [HomeView]
 /// - [text]: The text to display on the button.
 /// - [onPressed]: The callback to be invoked when the button is pressed.
+class QuickCreateButton extends StatefulWidget {
   const QuickCreateButton({
     super.key,
     required this.text,

lib/presentation/widgets/colored_icon_container.dart

@@ -1,57 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-
-class ColoredIconContainer extends StatelessWidget {
-  /// A customizable container widget that displays an icon with a colored background.
-  /// - [icon]: The icon to be displayed inside the container.
-  /// - [containerSize]: The size of the container (width and height).
-  /// - [iconSize]: The size of the icon inside the container.
-  /// - [margin]: Optional margin around the container.
-  /// - [padding]: Optional padding inside the container.
-  const ColoredIconContainer({
-    super.key,
-    required this.icon,
-    this.containerSize = 44,
-    this.iconSize = 28,
-    this.margin,
-    this.padding,
-  });
-
-  /// The icon to be displayed inside the container.
-  final IconData icon;
-
-  /// The size of the container (width and height).
-  final double containerSize;
-
-  /// The size of the icon inside the container.
-  final double iconSize;
-
-  /// Optional margin around the container.
-  final EdgeInsetsGeometry? margin;
-
-  /// Optional padding inside the container.
-  final EdgeInsetsGeometry? padding;
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        Container(
-          width: containerSize,
-          height: containerSize,
-          margin: margin,
-          padding: padding,
-          decoration: BoxDecoration(
-            color: CustomTheme.primaryColor.withAlpha(40),
-            borderRadius: BorderRadius.circular(10),
-          ),
-          child: Icon(
-            icon,
-            size: iconSize,
-            color: CustomTheme.primaryColor.withGreen(40),
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/presentation/widgets/custom_alert_dialog.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-
-class CustomAlertDialog extends StatelessWidget {
-  /// A custom alert dialog widget that provides a os unspecific AlertDialog,
-  /// with consistent colors, borders, and layout that match the app's custom theme.
-  /// - [title]: The title text displayed at the top of the dialog.
-  /// - [content]: The main content text displayed in the body of the dialog.
-  /// - [actions]: A list of action widgets (typically buttons) displayed at the bottom
-  ///   of the dialog. These actions are horizontally spaced around the dialog's width.
-  const CustomAlertDialog({
-    super.key,
-    required this.title,
-    required this.content,
-    required this.actions,
-  });
-
-  final String title;
-  final String content;
-  final List<Widget> actions;
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text(title, style: const TextStyle(color: CustomTheme.textColor)),
-      content: Text(
-        content,
-        style: const TextStyle(color: CustomTheme.textColor),
-      ),
-      actions: actions,
-      backgroundColor: CustomTheme.boxColor,
-      actionsAlignment: MainAxisAlignment.spaceAround,
-      shape: RoundedRectangleBorder(
-        borderRadius: CustomTheme.standardBorderRadiusAll,
-        side: BorderSide(color: CustomTheme.boxBorder),
-      ),
-    );
-  }
-}

lib/presentation/widgets/navbar_item.dart

@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
 
-class NavbarItem extends StatefulWidget {
 /// A navigation bar item widget that represents a single tab in a navigation bar.
 /// - [index]: The index of the tab.
 /// - [isSelected]: A boolean indicating whether the tab is currently selected.
 /// - [icon]: The icon to display for the tab.
 /// - [label]: The label to display for the tab.
 /// - [onTabTapped]: The callback to be invoked when the tab is tapped.
+class NavbarItem extends StatefulWidget {
   const NavbarItem({
     super.key,
     required this.index,
@@ -36,45 +35,7 @@ class NavbarItem extends StatefulWidget {
   State<NavbarItem> createState() => _NavbarItemState();
 }
 
-class _NavbarItemState extends State<NavbarItem>
+class _NavbarItemState extends State<NavbarItem> {
-    with SingleTickerProviderStateMixin {
-  /// Animation controller for the scale animation
-  late AnimationController _animationController;
-
-  /// Scale animation for the icon when selected
-  late Animation<double> _scaleAnimation;
-
-  @override
-  void initState() {
-    super.initState();
-    _animationController = AnimationController(
-      duration: const Duration(milliseconds: 300),
-      vsync: this,
-    );
-
-    _scaleAnimation = Tween<double>(begin: 1.0, end: 1.2).animate(
-      CurvedAnimation(
-        parent: _animationController,
-        curve: Curves.easeInOutBack,
-      ),
-    );
-
-    if (widget.isSelected) {
-      _animationController.forward();
-    }
-  }
-
-  // Retrigger animation on selection change
-  @override
-  void didUpdateWidget(NavbarItem oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.isSelected && !oldWidget.isSelected) {
-      _animationController.forward();
-    } else if (!widget.isSelected && oldWidget.isSelected) {
-      _animationController.reverse();
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     return Expanded(
@@ -87,29 +48,19 @@ class _NavbarItemState extends State<NavbarItem>
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              ScaleTransition(
+              Icon(
-                scale: widget.isSelected
-                    ? _scaleAnimation
-                    : const AlwaysStoppedAnimation(1.0),
-                child: Icon(
                 widget.icon,
-                  color: widget.isSelected
+                color: widget.isSelected ? Colors.white : Colors.black,
-                      ? CustomTheme.navBarItemSelectedColor
-                      : CustomTheme.navBarItemUnselectedColor,
-                  size: 32,
-                ),
               ),
               const SizedBox(height: 4),
               Text(
                 widget.label,
                 style: TextStyle(
-                  color: widget.isSelected
+                  color: widget.isSelected ? Colors.white : Colors.black,
-                      ? CustomTheme.navBarItemSelectedColor
+                  fontSize: 12,
-                      : CustomTheme.navBarItemUnselectedColor,
-                  fontSize: widget.isSelected ? 12 : 11,
                   fontWeight: widget.isSelected
                       ? FontWeight.bold
-                      : FontWeight.w500,
+                      : FontWeight.normal,
                 ),
               ),
             ],
@@ -118,10 +69,4 @@ class _NavbarItemState extends State<NavbarItem>
       ),
     );
   }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
 }

lib/presentation/widgets/player_selection.dart

@@ -11,14 +11,14 @@ import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
 
-class PlayerSelection extends StatefulWidget {
 /// A widget that allows users to select players from a list,
 /// with search functionality and the ability to add new players.
-  /// - [availablePlayers]: An optional list of players to choose from. If null,
+/// - [availablePlayers]: An optional list of players to choose from. If null, all
-  ///   all players from the database are used.
+///   players from the database are used.
 /// - [initialSelectedPlayers]: An optional list of players that should be pre-selected.
-  /// - [onChanged]: A callback function that is invoked whenever the selection
+/// - [onChanged]: A callback function that is invoked whenever the selection changes,
-  ///   changes, providing the updated list of selected players.
+///   providing the updated list of selected players.
+class PlayerSelection extends StatefulWidget {
   const PlayerSelection({
     super.key,
     this.availablePlayers,
@@ -84,7 +84,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           CustomSearchBar(
-            maxLength: Constants.MAX_PLAYER_NAME_LENGTH,
             controller: _searchBarController,
             constraints: const BoxConstraints(maxHeight: 45, minHeight: 45),
             hintText: loc.search_for_players,
@@ -182,7 +181,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                   icon: Icons.info,
                   title: loc.info,
                   message: _getInfoText(context),
-                  fullscreen: false,
                 ),
                 child: ListView.builder(
                   itemCount: suggestedPlayers.length,
@@ -220,7 +218,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
   void loadPlayerList() {
     _allPlayersFuture = Future.wait([
       db.playerDao.getAllPlayers(),
-      Future.delayed(Constants.MINIMUM_SKELETON_DURATION),
+      Future.delayed(Constants.minimumSkeletonDuration),
     ]).then((results) => results[0] as List<Player>);
     if (mounted) {
       _allPlayersFuture.then((loadedPlayers) {
@@ -296,7 +294,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
   /// [message] - The message to display in the snackbar.
   void showSnackBarMessage(String message) {
     if (!context.mounted) return;
-    ScaffoldMessenger.of(context).hideCurrentSnackBar();
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
         backgroundColor: CustomTheme.boxColor,

lib/presentation/widgets/text_input/custom_search_bar.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class CustomSearchBar extends StatelessWidget {
 /// A custom search bar widget that encapsulates a [SearchBar] with additional customization options.
 /// - [controller]: The controller for the search bar's text input.
 /// - [hintText]: The hint text displayed in the search bar when it is empty.
@@ -11,6 +10,7 @@ class CustomSearchBar extends StatelessWidget {
 /// - [onTrailingButtonPressed]: The callback invoked when the trailing button is pressed.
 /// - [onChanged]: The callback invoked when the text in the search bar changes.
 /// - [constraints]: The constraints for the search bar.
+class CustomSearchBar extends StatelessWidget {
   const CustomSearchBar({
     super.key,
     required this.controller,
@@ -21,7 +21,6 @@ class CustomSearchBar extends StatelessWidget {
     this.onTrailingButtonPressed,
     this.onChanged,
     this.constraints,
-    this.maxLength,
   });
 
   /// The controller for the search bar's text input.
@@ -48,21 +47,8 @@ class CustomSearchBar extends StatelessWidget {
   /// The constraints for the search bar.
   final BoxConstraints? constraints;
 
-  /// Optional parameter for maximum length of the input text.
-  final int? maxLength;
-
   @override
   Widget build(BuildContext context) {
-    /// Enforce maximum length on the input text
-    if (maxLength != null) {
-      if (controller.text.length > maxLength!) {
-        controller.text = controller.text.substring(0, maxLength);
-        controller.selection = TextSelection.fromPosition(
-          TextPosition(offset: controller.text.length),
-        );
-      }
-    }
-
     return SearchBar(
       controller: controller,
       constraints:

lib/presentation/widgets/text_input/text_input_field.dart

@@ -1,47 +1,37 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class TextInputField extends StatelessWidget {
 /// A custom text input field widget that encapsulates a [TextField] with specific styling.
 /// - [controller]: The controller for the text input field.
-  /// - [onChanged]: Optional callback invoked when the text in the field changes.
+/// - [onChanged]: The callback invoked when the text in the field changes.
 /// - [hintText]: The hint text displayed in the text input field when it is empty
-  /// - [maxLength]: Optional parameter for maximum length of the input text.
+class TextInputField extends StatelessWidget {
   const TextInputField({
     super.key,
     required this.controller,
     required this.hintText,
     this.onChanged,
-    this.maxLength,
   });
 
   /// The controller for the text input field.
   final TextEditingController controller;
 
-  /// Optional callback invoked when the text in the field changes.
+  /// The callback invoked when the text in the field changes.
   final ValueChanged<String>? onChanged;
 
   /// The hint text displayed in the text input field when it is empty.
   final String hintText;
 
-  /// Optional parameter for maximum length of the input text.
-  final int? maxLength;
-
   @override
   Widget build(BuildContext context) {
     return TextField(
       controller: controller,
       onChanged: onChanged,
-      maxLength: maxLength,
-      maxLengthEnforcement: MaxLengthEnforcement.truncateAfterCompositionEnds,
       decoration: InputDecoration(
         filled: true,
         fillColor: CustomTheme.boxColor,
         hintText: hintText,
         hintStyle: const TextStyle(fontSize: 18),
-        // Hides the character counter
-        counterText: '',
         enabledBorder: OutlineInputBorder(
           borderRadius: const BorderRadius.all(Radius.circular(12)),
           borderSide: BorderSide(color: CustomTheme.boxBorder),

lib/presentation/widgets/tiles/choose_tile.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class ChooseTile extends StatefulWidget {
 /// A tile widget that allows users to choose an option by tapping on it.
 /// - [title]: The title text displayed on the tile.
 /// - [trailingText]: Optional trailing text displayed on the tile.
 /// - [onPressed]: The callback invoked when the tile is tapped.
+class ChooseTile extends StatefulWidget {
   const ChooseTile({
     super.key,
     required this.title,

lib/presentation/widgets/tiles/custom_radio_list_tile.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class CustomRadioListTile<T> extends StatelessWidget {
 /// A custom radio list tile widget that encapsulates a [Radio] button with additional styling and functionality.
 /// - [text]: The text to display next to the radio button.
 /// - [value]: The value associated with the radio button.
 /// - [onContainerTap]: The callback invoked when the container is tapped.
+class CustomRadioListTile<T> extends StatelessWidget {
   const CustomRadioListTile({
     super.key,
     required this.text,

lib/presentation/widgets/tiles/group_tile.dart

@@ -3,17 +3,11 @@ import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 
-class GroupTile extends StatefulWidget {
 /// A tile widget that displays information about a group, including its name and members.
 /// - [group]: The group data to be displayed.
 /// - [isHighlighted]: Whether the tile should be highlighted.
-  /// - [onTap]: Callback function to be executed when the tile is tapped.
+class GroupTile extends StatelessWidget {
-  const GroupTile({
+  const GroupTile({super.key, required this.group, this.isHighlighted = false});
-    super.key,
-    required this.group,
-    this.isHighlighted = false,
-    this.onTap,
-  });
 
   /// The group data to be displayed.
   final Group group;
@@ -21,22 +15,12 @@ class GroupTile extends StatefulWidget {
   /// Whether the tile should be highlighted.
   final bool isHighlighted;
 
-  /// Callback function to be executed when the tile is tapped.
-  final VoidCallback? onTap;
-
-  @override
-  State<GroupTile> createState() => _GroupTileState();
-}
-
-class _GroupTileState extends State<GroupTile> {
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
+    return AnimatedContainer(
-      onTap: widget.onTap,
-      child: AnimatedContainer(
       margin: CustomTheme.standardMargin,
       padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
-        decoration: widget.isHighlighted
+      decoration: isHighlighted
           ? CustomTheme.highlightedBoxDecoration
           : CustomTheme.standardBoxDecoration,
       duration: const Duration(milliseconds: 150),
@@ -48,7 +32,7 @@ class _GroupTileState extends State<GroupTile> {
             children: [
               Flexible(
                 child: Text(
-                    widget.group.name,
+                  group.name,
                   overflow: TextOverflow.ellipsis,
                   style: const TextStyle(
                     fontWeight: FontWeight.bold,
@@ -59,7 +43,7 @@ class _GroupTileState extends State<GroupTile> {
               Row(
                 children: [
                   Text(
-                      '${widget.group.members.length}',
+                    '${group.members.length}',
                     style: const TextStyle(
                       fontWeight: FontWeight.w900,
                       fontSize: 18,
@@ -79,7 +63,7 @@ class _GroupTileState extends State<GroupTile> {
             runSpacing: 8.0,
             children: <Widget>[
               for (var member in [
-                  ...widget.group.members,
+                ...group.members,
               ]..sort((a, b) => a.name.compareTo(b.name)))
                 TextIconTile(text: member.name, iconEnabled: false),
             ],
@@ -87,7 +71,6 @@ class _GroupTileState extends State<GroupTile> {
           const SizedBox(height: 2.5),
         ],
       ),
-      ),
     );
   }
 }

lib/presentation/widgets/tiles/info_tile.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class InfoTile extends StatefulWidget {
 /// A tile widget that displays a title with an icon and some content below it.
 /// - [title]: The title text displayed on the tile.
 /// - [icon]: The icon displayed next to the title.
@@ -9,6 +8,7 @@ class InfoTile extends StatefulWidget {
 /// - [padding]: Optional padding for the tile content.
 /// - [height]: Optional height for the tile.
 /// - [width]: Optional width for the tile.
+class InfoTile extends StatefulWidget {
   const InfoTile({
     super.key,
     required this.title,
@@ -17,7 +17,6 @@ class InfoTile extends StatefulWidget {
     this.padding,
     this.height,
     this.width,
-    this.horizontalAlignment = CrossAxisAlignment.center,
   });
 
   /// The title text displayed on the tile.
@@ -38,9 +37,6 @@ class InfoTile extends StatefulWidget {
   /// Optional width for the tile.
   final double? width;
 
-  /// The main axis alignment for the content.
-  final CrossAxisAlignment horizontalAlignment;
-
   @override
   State<InfoTile> createState() => _InfoTileState();
 }
@@ -55,7 +51,7 @@ class _InfoTileState extends State<InfoTile> {
       decoration: CustomTheme.standardBoxDecoration,
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
-        crossAxisAlignment: widget.horizontalAlignment,
+        crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           Row(
             children: [

lib/presentation/widgets/tiles/license_tile.dart

@@ -1,102 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
-import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
-
-class LicenseTile extends StatelessWidget {
-  /// A tile widget that displays information about a software package license.
-  /// - [package]: The package data to be displayed.
-  const LicenseTile({super.key, required this.package});
-
-  /// The package data to be displayed.
-  final Package package;
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () {
-        Navigator.of(context).push(
-          MaterialPageRoute(
-            builder: (context) => LicenseDetailView(package: package),
-          ),
-        );
-      },
-      child: Container(
-        margin: const EdgeInsets.only(bottom: 8),
-        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 12),
-        decoration: CustomTheme.standardBoxDecoration.copyWith(
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Row(
-          children: [
-            const ColoredIconContainer(
-              icon: Icons.description,
-              containerSize: 50,
-              iconSize: 32,
-            ),
-            const SizedBox(width: 16),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Flexible(
-                        child: Text(
-                          package.name,
-                          overflow: TextOverflow.ellipsis,
-                          maxLines: 1,
-                          style: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                      ),
-                      if (package.version != null &&
-                          package.version!.isNotEmpty) ...[
-                        const SizedBox(width: 12),
-                        Container(
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 8,
-                            vertical: 2,
-                          ),
-                          decoration: BoxDecoration(
-                            color: CustomTheme.onBoxColor,
-                            borderRadius: BorderRadius.circular(6),
-                          ),
-                          child: Text(
-                            'v${package.version}',
-                            style: TextStyle(
-                              fontSize: 11,
-                              color: Colors.grey.shade500,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ],
-                  ),
-                  const SizedBox(height: 4),
-                  Text(
-                    package.description,
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                      fontSize: 13,
-                      color: Colors.grey.shade400,
-                      height: 1.3,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(width: 12),
-            // Arrow Icon
-            Icon(Icons.chevron_right, color: Colors.grey.shade600, size: 24),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/presentation/widgets/tiles/match_summary_tile.dart

@@ -0,0 +1,95 @@
+import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:skeletonizer/skeletonizer.dart';
+
+class MatchSummaryTile extends StatefulWidget {
+  final String matchTitle;
+  final String game;
+  final String ruleset;
+  final String players;
+  final String winner;
+
+  const MatchSummaryTile({
+    super.key,
+    required this.matchTitle,
+    required this.game,
+    required this.ruleset,
+    required this.players,
+    required this.winner,
+  });
+
+  @override
+  State<MatchSummaryTile> createState() => _MatchSummaryTileState();
+}
+
+class _MatchSummaryTileState extends State<MatchSummaryTile> {
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Text(
+              widget.matchTitle,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+            ),
+            const SizedBox(width: 5),
+            Text(
+              widget.game,
+              style: const TextStyle(fontSize: 14, color: Colors.grey),
+            ),
+          ],
+        ),
+        const SizedBox(height: 5),
+        Container(
+          padding: const EdgeInsets.symmetric(horizontal: 4),
+          height: 20,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(4),
+            color: CustomTheme.primaryColor,
+          ),
+          child: Skeleton.ignore(
+            child: Text(
+              widget.ruleset,
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
+          ),
+        ),
+        Center(
+          heightFactor: 1.5,
+          child: Text(
+            widget.players,
+            style: const TextStyle(fontWeight: FontWeight.bold),
+          ),
+        ),
+        Center(
+          child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 4),
+            width: 220,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(4),
+              color: Colors.yellow.shade300,
+            ),
+            child: Skeleton.ignore(
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const Icon(Icons.emoji_events, color: Colors.black, size: 20),
+                  Text(
+                    widget.winner,
+                    textAlign: TextAlign.center,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                      color: Colors.black87,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/presentation/widgets/tiles/match_tile.dart

@@ -6,20 +6,12 @@ import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 import 'package:intl/intl.dart';
 
-class MatchTile extends StatefulWidget {
 /// A tile widget that displays information about a match, including its name,
 /// 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.
+class MatchTile extends StatefulWidget {
-  /// - [compact]: Whether to display the tile in a compact mode
+  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;
@@ -27,12 +19,6 @@ 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();
 }
@@ -55,10 +41,13 @@ class _MatchTileState extends State<MatchTile> {
     return GestureDetector(
       onTap: widget.onTap,
       child: Container(
-        margin: EdgeInsets.zero,
+        margin: CustomTheme.tileMargin,
-        width: widget.width,
         padding: const EdgeInsets.all(12),
-        decoration: CustomTheme.standardBoxDecoration,
+        decoration: BoxDecoration(
+          color: CustomTheme.boxColor,
+          border: Border.all(color: CustomTheme.boxBorder),
+          borderRadius: BorderRadius.circular(12),
+        ),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -91,22 +80,7 @@ class _MatchTileState extends State<MatchTile> {
                   const SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      '${group.name}${widget.match.players != null ? ' + ${widget.match.players?.length}' : ''}',
+                      group.name,
-                      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,
                     ),
@@ -153,46 +127,9 @@ 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 && widget.compact == false) ...[
+            if (_allPlayers.isNotEmpty) ...[
               Text(
                 loc.players,
                 style: const TextStyle(
@@ -230,7 +167,7 @@ class _MatchTileState extends State<MatchTile> {
     } else if (difference.inDays < 7) {
       return loc.days_ago(difference.inDays);
     } else {
-      return '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(dateTime)}';
+      return DateFormat('MMM d, yyyy').format(dateTime);
     }
   }
 

lib/presentation/widgets/tiles/quick_info_tile.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class QuickInfoTile extends StatefulWidget {
 /// A tile widget that displays a title with an icon and a numeric value below it.
 /// - [title]: The title text displayed on the tile.
 /// - [icon]: The icon displayed next to the title.
@@ -9,6 +8,7 @@ class QuickInfoTile extends StatefulWidget {
 /// - [height]: Optional height for the tile.
 /// - [width]: Optional width for the tile.
 /// - [padding]: Optional padding for the tile content.
+class QuickInfoTile extends StatefulWidget {
   const QuickInfoTile({
     super.key,
     required this.title,

lib/presentation/widgets/tiles/settings_list_tile.dart

@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
 
-class SettingsListTile extends StatelessWidget {
 /// A customizable settings list tile widget that displays an icon, title, and an optional suffix widget.
 /// - [icon]: The icon displayed on the left side of the tile.
 /// - [title]: The title text displayed next to the icon.
 /// - [suffixWidget]: An optional widget displayed on the right side of the tile.
 /// - [onPressed]: The callback invoked when the tile is tapped.
+class SettingsListTile extends StatelessWidget {
   const SettingsListTile({
     super.key,
     required this.icon,
@@ -39,7 +38,7 @@ class SettingsListTile extends StatelessWidget {
             onTap: onPressed ?? () {},
             child: Container(
               margin: EdgeInsets.zero,
-              padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
+              padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 14),
               decoration: CustomTheme.standardBoxDecoration,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -47,10 +46,13 @@ class SettingsListTile extends StatelessWidget {
                   Row(
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      ColoredIconContainer(
+                      Container(
-                        icon: icon,
+                        padding: const EdgeInsets.all(8),
-                        containerSize: 44,
+                        decoration: BoxDecoration(
-                        iconSize: 28,
+                          color: CustomTheme.primaryColor,
+                          shape: BoxShape.circle,
+                        ),
+                        child: Icon(icon, size: 24),
                       ),
                       const SizedBox(width: 16),
                       Text(title, style: const TextStyle(fontSize: 18)),

lib/presentation/widgets/tiles/statistics_tile.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart';
 
-class StatisticsTile extends StatelessWidget {
 /// A tile widget that displays statistical data using horizontal bars.
 /// - [icon]: The icon displayed next to the title.
 /// - [title]: The title text displayed on the tile.
@@ -12,6 +11,7 @@ class StatisticsTile extends StatelessWidget {
 /// - [values]: A list of tuples containing labels and their corresponding numeric values.
 /// - [itemCount]: The maximum number of items to display.
 /// - [barColor]: The color of the bars representing the values.
+class StatisticsTile extends StatelessWidget {
   const StatisticsTile({
     super.key,
     required this.icon,

lib/presentation/widgets/tiles/text_icon_list_tile.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class TextIconListTile extends StatelessWidget {
 /// A list tile widget that displays text with an optional icon button.
 /// - [text]: The text to display in the tile.
 /// - [onPressed]: The callback to be invoked when the icon is pressed.
 /// - [iconEnabled]: A boolean to determine if the icon should be displayed.
+class TextIconListTile extends StatelessWidget {
   const TextIconListTile({
     super.key,
     required this.text,

lib/presentation/widgets/tiles/text_icon_tile.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class TextIconTile extends StatelessWidget {
 /// A tile widget that displays text with an optional icon that can be tapped.
 /// - [text]: The text to display in the tile.
 /// - [iconEnabled]: A boolean to determine if the icon should be displayed.
 /// - [onIconTap]: The callback to be invoked when the icon is tapped.
+class TextIconTile extends StatelessWidget {
   const TextIconTile({
     super.key,
     required this.text,

lib/presentation/widgets/tiles/title_description_list_tile.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class TitleDescriptionListTile extends StatelessWidget {
 /// A list tile widget that displays a title and description, with optional highlighting and badge.
 /// - [title]: The title text displayed on the tile.
 /// - [description]: The description text displayed below the title.
@@ -9,6 +8,7 @@ class TitleDescriptionListTile extends StatelessWidget {
 /// - [isHighlighted]: A boolean to determine if the tile should be highlighted.
 /// - [badgeText]: Optional text to display in a badge on the right side of the title.
 /// - [badgeColor]: Optional color for the badge background.
+class TitleDescriptionListTile extends StatelessWidget {
   const TitleDescriptionListTile({
     super.key,
     required this.title,
@@ -73,6 +73,7 @@ class TitleDescriptionListTile extends StatelessWidget {
                   const Spacer(),
                   Container(
                     constraints: const BoxConstraints(maxWidth: 115),
+                    margin: const EdgeInsets.only(top: 4),
                     padding: const EdgeInsets.symmetric(
                       vertical: 2,
                       horizontal: 6,

lib/presentation/widgets/top_centered_message.dart

@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
 
-class TopCenteredMessage extends StatelessWidget {
 /// A widget that displays a message centered at the top of the screen with an icon, title, and message.
 /// - [icon]: The icon to display above the title.
 /// - [title]: The title text to display.
 /// - [message]: The message text to display below the title.
+class TopCenteredMessage extends StatelessWidget {
   const TopCenteredMessage({
     super.key,
     required this.icon,
     required this.title,
     required this.message,
-    this.fullscreen = true,
   });
 
   /// The icon to display above the title.
@@ -22,18 +21,13 @@ class TopCenteredMessage extends StatelessWidget {
   /// The message text to display below the title.
   final String message;
 
-  final bool fullscreen;
-
   @override
   Widget build(BuildContext context) {
     return Container(
-      padding: fullscreen ? const EdgeInsets.only(top: 100) : null,
+      padding: const EdgeInsets.only(top: 100),
       margin: const EdgeInsets.symmetric(horizontal: 10),
       alignment: Alignment.topCenter,
       child: Column(
-        mainAxisAlignment: fullscreen
-            ? MainAxisAlignment.start
-            : MainAxisAlignment.center,
         children: [
           Icon(icon, size: 45),
           const SizedBox(height: 10),

lib/services/data_transfer_service.dart

@@ -6,11 +6,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.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';
-import 'package:game_tracker/data/dto/team.dart';
 import 'package:json_schema/json_schema.dart';
 import 'package:provider/provider.dart';
 
@@ -19,54 +17,39 @@ class DataTransferService {
   static Future<void> deleteAllData(BuildContext context) async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     await db.matchDao.deleteAllMatches();
-    await db.teamDao.deleteAllTeams();
     await db.groupDao.deleteAllGroups();
-    await db.gameDao.deleteAllGames();
     await db.playerDao.deleteAllPlayers();
   }
 
   /// Retrieves all application data and converts it to a JSON string.
-  /// Returns the JSON string representation of the data in normalized format.
+  /// Returns the JSON string representation of the data.
   static Future<String> getAppDataAsJson(BuildContext context) async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     final matches = await db.matchDao.getAllMatches();
     final groups = await db.groupDao.getAllGroups();
     final players = await db.playerDao.getAllPlayers();
-    final games = await db.gameDao.getAllGames();
-    final teams = await db.teamDao.getAllTeams();
 
-    // Construct a JSON representation of the data in normalized format
+    // Construct a JSON representation of the data
     final Map<String, dynamic> jsonMap = {
       'players': players.map((p) => p.toJson()).toList(),
-      'games': games.map((g) => g.toJson()).toList(),
+
       'groups': groups
           .map((g) => {
         'id': g.id,
         'name': g.name,
-                'description': g.description,
         'createdAt': g.createdAt.toIso8601String(),
         'memberIds': (g.members).map((m) => m.id).toList(),
-              })
+      }).toList(),
-          .toList(),
+
-      'teams': teams
-          .map((t) => {
-                'id': t.id,
-                'name': t.name,
-                'createdAt': t.createdAt.toIso8601String(),
-                'memberIds': (t.members).map((m) => m.id).toList(),
-              })
-          .toList(),
       'matches': matches
           .map((m) => {
         'id': m.id,
         'name': m.name,
         'createdAt': m.createdAt.toIso8601String(),
-                'gameId': m.game?.id,
         'groupId': m.group?.id,
         'playerIds': (m.players ?? []).map((p) => p.id).toList(),
-                'notes': m.notes,
+        'winnerId': m.winner?.id,
-              })
+      }).toList(),
-          .toList(),
     };
 
     return json.encode(jsonMap);
@@ -124,12 +107,10 @@ class DataTransferService {
       final Map<String, dynamic> decoded = json.decode(jsonString) as Map<String, dynamic>;
 
       final List<dynamic> playersJson = (decoded['players'] as List<dynamic>?) ?? [];
-      final List<dynamic> gamesJson = (decoded['games'] as List<dynamic>?) ?? [];
       final List<dynamic> groupsJson = (decoded['groups'] as List<dynamic>?) ?? [];
-      final List<dynamic> teamsJson = (decoded['teams'] as List<dynamic>?) ?? [];
       final List<dynamic> matchesJson = (decoded['matches'] as List<dynamic>?) ?? [];
 
-      // Import Players
+      // Players
       final List<Player> importedPlayers = playersJson
           .map((p) => Player.fromJson(p as Map<String, dynamic>))
           .toList();
@@ -138,16 +119,7 @@ class DataTransferService {
         for (final p in importedPlayers) p.id: p,
       };
 
-      // Import Games
+      // Groups
-      final List<Game> importedGames = gamesJson
-          .map((g) => Game.fromJson(g as Map<String, dynamic>))
-          .toList();
-
-      final Map<String, Game> gameById = {
-        for (final g in importedGames) g.id: g,
-      };
-
-      // Import Groups
       final List<Group> importedGroups = groupsJson.map((g) {
         final map = g as Map<String, dynamic>;
         final memberIds = (map['memberIds'] as List<dynamic>? ?? []).cast<String>();
@@ -160,7 +132,6 @@ class DataTransferService {
         return Group(
           id: map['id'] as String,
           name: map['name'] as String,
-          description: map['description'] as String?,
           members: members,
           createdAt: DateTime.parse(map['createdAt'] as String),
         );
@@ -170,59 +141,33 @@ class DataTransferService {
         for (final g in importedGroups) g.id: g,
       };
 
-      // Import Teams
+      // Matches
-      final List<Team> importedTeams = teamsJson.map((t) {
-        final map = t as Map<String, dynamic>;
-        final memberIds = (map['memberIds'] as List<dynamic>? ?? []).cast<String>();
-
-        final members = memberIds
-            .map((id) => playerById[id])
-            .whereType<Player>()
-            .toList();
-
-        return Team(
-          id: map['id'] as String,
-          name: map['name'] as String,
-          members: members,
-          createdAt: DateTime.parse(map['createdAt'] as String),
-        );
-      }).toList();
-
-      final Map<String, Team> teamById = {
-        for (final t in importedTeams) t.id: t,
-      };
-
-      // Import Matches
       final List<Match> importedMatches = matchesJson.map((m) {
         final map = m as Map<String, dynamic>;
 
-        final String? gameId = map['gameId'] as String?;
         final String? groupId = map['groupId'] as String?;
         final List<String> playerIds = (map['playerIds'] as List<dynamic>? ?? []).cast<String>();
+        final String? winnerId = map['winnerId'] as String?;
 
-        final game = (gameId == null) ? null : gameById[gameId];
         final group = (groupId == null) ? null : groupById[groupId];
         final players = playerIds
             .map((id) => playerById[id])
             .whereType<Player>()
             .toList();
+        final winner = (winnerId == null) ? null : playerById[winnerId];
 
         return Match(
           id: map['id'] as String,
           name: map['name'] as String,
-          game: game,
           group: group,
-          players: players.isNotEmpty ? players : null,
+          players: players,
           createdAt: DateTime.parse(map['createdAt'] as String),
-          notes: map['notes'] as String?,
+          winner: winner,
         );
       }).toList();
 
-      // Import all data into the database
       await db.playerDao.addPlayersAsList(players: importedPlayers);
-      await db.gameDao.addGamesAsList(games: importedGames);
       await db.groupDao.addGroupsAsList(groups: importedGroups);
-      await db.teamDao.addTeamsAsList(teams: importedTeams);
       await db.matchDao.addMatchAsList(matches: importedMatches);
 
       return ImportResult.success;

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.10+237
+version: 0.0.1+21
 
 environment:
   sdk: ^3.8.1
@@ -9,32 +9,31 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_localizations:
+  material_symbols_icons: ^4.2815.1
-    sdk: flutter
+
-  clock: ^1.1.2
+  # The following adds the Cupertino Icons font to your application.
-  cupertino_icons: ^1.0.6
+  # Use with the CupertinoIcons class for iOS style icons.
+  cupertino_icons: ^1.0.8
   drift: ^2.27.0
   drift_flutter: ^0.2.4
-  file_picker: ^10.3.6
-  file_saver: ^0.3.1
-  fluttericon: ^2.0.0
-  font_awesome_flutter: ^10.12.0
-  intl: any
-  json_schema: ^5.2.2
-  package_info_plus: ^9.0.0
   path_provider: ^2.1.5
   provider: ^6.1.5
   skeletonizer: ^2.1.0+1
-  url_launcher: ^6.3.2
   uuid: ^4.5.2
+  file_picker: ^10.3.6
+  json_schema: ^5.2.2
+  file_saver: ^0.3.1
+  clock: ^1.1.2
+  intl: any
+  flutter_localizations:
+    sdk: flutter
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.5.4
-  dart_pubspec_licenses: ^3.0.14
-  drift_dev: ^2.27.0
   flutter_lints: ^5.0.0
+  drift_dev: ^2.27.0
+  build_runner: ^2.5.4
 
 flutter:
   uses-material-design: true

test/db_tests/game_test.dart

@@ -1,548 +1,362 @@
 import 'package:clock/clock.dart';
-import 'package:drift/drift.dart' hide isNull;
+import 'package:drift/drift.dart';
 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/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';
 
 void main() {
   late AppDatabase database;
-  late Game testGame1;
+  late Player testPlayer1;
-  late Game testGame2;
+  late Player testPlayer2;
-  late Game testGame3;
+  late Player testPlayer3;
-  final fixedDate = DateTime(2025, 11, 19, 00, 11, 23);
+  late Player testPlayer4;
+  late Player testPlayer5;
+  late Group testGroup1;
+  late Group testGroup2;
+  late Match testMatch1;
+  late Match testMatch2;
+  late Match testMatchOnlyPlayers;
+  late Match testMatchOnlyGroup;
+  final fixedDate = DateTime(2025, 19, 11, 00, 11, 23);
   final fakeClock = Clock(() => fixedDate);
 
-  setUp(() {
+  setUp(() async {
     database = AppDatabase(
       DatabaseConnection(
         NativeDatabase.memory(),
+        // Recommended for widget tests to avoid test errors.
         closeStreamsSynchronously: true,
       ),
     );
 
     withClock(fakeClock, () {
-      testGame1 = Game(
+      testPlayer1 = Player(name: 'Alice');
-        name: 'Chess',
+      testPlayer2 = Player(name: 'Bob');
-        ruleset: 'winner.single',
+      testPlayer3 = Player(name: 'Charlie');
-        description: 'A classic strategy game',
+      testPlayer4 = Player(name: 'Diana');
-        color: 0xFF0000FF,
+      testPlayer5 = Player(name: 'Eve');
-        icon: 'chess_icon',
+      testGroup1 = Group(
+        name: 'Test Group 2',
+        members: [testPlayer1, testPlayer2, testPlayer3],
       );
-      testGame2 = Game(
+      testGroup2 = Group(
-        id: 'game2',
+        name: 'Test Group 2',
-        name: 'Poker',
+        members: [testPlayer4, testPlayer5],
-        ruleset: 'Texas Hold\'em rules',
-        description: 'winner.multiple',
-        color: 0xFFFF0000,
-        icon: 'poker_icon',
       );
-      testGame3 = Game(
+      testMatch1 = Match(
-        id: 'game3',
+        name: 'First Test Match',
-        name: 'Monopoly',
+        group: testGroup1,
-        description: 'A board game about real estate',
+        players: [testPlayer4, testPlayer5],
+        winner: testPlayer4,
+      );
+      testMatch2 = Match(
+        name: 'Second Test Match',
+        group: testGroup2,
+        players: [testPlayer1, testPlayer2, testPlayer3],
+        winner: testPlayer2,
+      );
+      testMatchOnlyPlayers = Match(
+        name: 'Test Match with Players',
+        players: [testPlayer1, testPlayer2, testPlayer3],
+        winner: testPlayer3,
+      );
+      testMatchOnlyGroup = Match(
+        name: 'Test Match with Group',
+        group: testGroup2,
       );
     });
+    await database.playerDao.addPlayersAsList(
+      players: [
+        testPlayer1,
+        testPlayer2,
+        testPlayer3,
+        testPlayer4,
+        testPlayer5,
+      ],
+    );
+    await database.groupDao.addGroupsAsList(groups: [testGroup1, testGroup2]);
   });
-
   tearDown(() async {
     await database.close();
   });
 
-  group('Game Tests', () {
+  group('Match Tests', () {
+    test('Adding and fetching single match works correctly', () async {
+      await database.matchDao.addMatch(match: testMatch1);
 
-    // Verifies that getAllGames returns an empty list when the database has no games.
+      final result = await database.matchDao.getMatchById(
-    test('getAllGames returns empty list when no games exist', () async {
+        matchId: testMatch1.id,
-      final allGames = await database.gameDao.getAllGames();
+      );
-      expect(allGames, isEmpty);
-    });
 
-    // Verifies that a single game can be added and retrieved with all fields intact.
+      expect(result.id, testMatch1.id);
-    test('Adding and fetching a single game works correctly', () async {
+      expect(result.name, testMatch1.name);
-      await database.gameDao.addGame(game: testGame1);
+      expect(result.createdAt, testMatch1.createdAt);
 
-      final allGames = await database.gameDao.getAllGames();
+      if (result.winner != null && testMatch1.winner != null) {
-      expect(allGames.length, 1);
+        expect(result.winner!.id, testMatch1.winner!.id);
-      expect(allGames.first.id, testGame1.id);
+        expect(result.winner!.name, testMatch1.winner!.name);
-      expect(allGames.first.name, testGame1.name);
+        expect(result.winner!.createdAt, testMatch1.winner!.createdAt);
-      expect(allGames.first.ruleset, testGame1.ruleset);
+      } else {
-      expect(allGames.first.description, testGame1.description);
+        expect(result.winner, testMatch1.winner);
-      expect(allGames.first.color, testGame1.color);
+      }
-      expect(allGames.first.icon, testGame1.icon);
-      expect(allGames.first.createdAt, testGame1.createdAt);
-    });
 
-    // Verifies that multiple games can be added and retrieved correctly.
+      if (result.group != null) {
-    test('Adding and fetching multiple games works correctly', () async {
+        expect(result.group!.members.length, testGroup1.members.length);
-      await database.gameDao.addGame(game: testGame1);
-      await database.gameDao.addGame(game: testGame2);
-      await database.gameDao.addGame(game: testGame3);
 
-      final allGames = await database.gameDao.getAllGames();
+        for (int i = 0; i < testGroup1.members.length; i++) {
-      expect(allGames.length, 3);
+          expect(result.group!.members[i].id, testGroup1.members[i].id);
+          expect(result.group!.members[i].name, testGroup1.members[i].name);
+        }
+      } else {
+        fail('Group is null');
+      }
+      if (result.players != null) {
+        expect(result.players!.length, testMatch1.players!.length);
 
-      final names = allGames.map((g) => g.name).toList();
+        for (int i = 0; i < testMatch1.players!.length; i++) {
-      expect(names, containsAll(['Chess', 'Poker', 'Monopoly']));
+          expect(result.players![i].id, testMatch1.players![i].id);
-    });
+          expect(result.players![i].name, testMatch1.players![i].name);
-
-    // Verifies that getGameById returns the correct game with all properties.
-    test('getGameById returns correct game', () async {
-      await database.gameDao.addGame(game: testGame1);
-      await database.gameDao.addGame(game: testGame2);
-
-      final game = await database.gameDao.getGameById(gameId: testGame2.id);
-      expect(game.id, testGame2.id);
-      expect(game.name, testGame2.name);
-      expect(game.ruleset, testGame2.ruleset);
-      expect(game.description, testGame2.description);
-      expect(game.color, testGame2.color);
-      expect(game.icon, testGame2.icon);
-    });
-
-    // Verifies that getGameById throws a StateError when the game doesn't exist.
-    test('getGameById throws exception for non-existent game', () async {
           expect(
-        () => database.gameDao.getGameById(gameId: 'non-existent-id'),
+            result.players![i].createdAt,
-        throwsA(isA<StateError>()),
+            testMatch1.players![i].createdAt,
           );
+        }
+      } else {
+        fail('Players is null');
+      }
     });
 
-    // Verifies that addGame returns true when a game is successfully added.
+    test('Adding and fetching multiple matches works correctly', () async {
-    test('addGame returns true when game is added successfully', () async {
+      await database.matchDao.addMatchAsList(
-      final result = await database.gameDao.addGame(game: testGame1);
+        matches: [
-      expect(result, true);
+          testMatch1,
+          testMatch2,
+          testMatchOnlyGroup,
+          testMatchOnlyPlayers,
+        ],
+      );
 
-      final allGames = await database.gameDao.getAllGames();
+      final allMatches = await database.matchDao.getAllMatches();
-      expect(allGames.length, 1);
+      expect(allMatches.length, 4);
+
+      final testMatches = {
+        testMatch1.id: testMatch1,
+        testMatch2.id: testMatch2,
+        testMatchOnlyGroup.id: testMatchOnlyGroup,
+        testMatchOnlyPlayers.id: testMatchOnlyPlayers,
+      };
+
+      for (final match in allMatches) {
+        final testMatch = testMatches[match.id]!;
+
+        // Match-Checks
+        expect(match.id, testMatch.id);
+        expect(match.name, testMatch.name);
+        expect(match.createdAt, testMatch.createdAt);
+        if (match.winner != null && testMatch.winner != null) {
+          expect(match.winner!.id, testMatch.winner!.id);
+          expect(match.winner!.name, testMatch.winner!.name);
+          expect(match.winner!.createdAt, testMatch.winner!.createdAt);
+        } else {
+          expect(match.winner, testMatch.winner);
+        }
+
+        // Group-Checks
+        if (testMatch.group != null) {
+          expect(match.group!.id, testMatch.group!.id);
+          expect(match.group!.name, testMatch.group!.name);
+          expect(match.group!.createdAt, testMatch.group!.createdAt);
+
+          // Group Members-Checks
+          expect(match.group!.members.length, testMatch.group!.members.length);
+          for (int i = 0; i < testMatch.group!.members.length; i++) {
+            expect(match.group!.members[i].id, testMatch.group!.members[i].id);
+            expect(
+              match.group!.members[i].name,
+              testMatch.group!.members[i].name,
+            );
+            expect(
+              match.group!.members[i].createdAt,
+              testMatch.group!.members[i].createdAt,
+            );
+          }
+        } else {
+          expect(match.group, null);
+        }
+
+        // Players-Checks
+        if (testMatch.players != null) {
+          expect(match.players!.length, testMatch.players!.length);
+          for (int i = 0; i < testMatch.players!.length; i++) {
+            expect(match.players![i].id, testMatch.players![i].id);
+            expect(match.players![i].name, testMatch.players![i].name);
+            expect(
+              match.players![i].createdAt,
+              testMatch.players![i].createdAt,
+            );
+          }
+        } else {
+          expect(match.players, null);
+        }
+      }
     });
 
-    // Verifies that addGame returns false when trying to add a duplicate game.
+    test('Adding the same match twice does not create duplicates', () async {
-    test('addGame returns false when game already exists', () async {
+      await database.matchDao.addMatch(match: testMatch1);
-      final firstAdd = await database.gameDao.addGame(game: testGame1);
+      await database.matchDao.addMatch(match: testMatch1);
-      expect(firstAdd, true);
 
-      final secondAdd = await database.gameDao.addGame(game: testGame1);
+      final matchCount = await database.matchDao.getMatchCount();
-      expect(secondAdd, false);
+      expect(matchCount, 1);
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames.length, 1);
     });
 
-    // Verifies that a game with null optional fields can be added and retrieved.
+    test('Match existence check works correctly', () async {
-    test('addGame handles game with null optional fields', () async {
+      var matchExists = await database.matchDao.matchExists(
-      final gameWithNulls = Game(name: 'Simple Game');
+        matchId: testMatch1.id,
-      final result = await database.gameDao.addGame(game: gameWithNulls);
-      expect(result, true);
-
-      final fetchedGame = await database.gameDao.getGameById(
-        gameId: gameWithNulls.id,
       );
-      expect(fetchedGame.name, 'Simple Game');
+      expect(matchExists, false);
-      expect(fetchedGame.description, isNull);
+
-      expect(fetchedGame.color, isNull);
+      await database.matchDao.addMatch(match: testMatch1);
-      expect(fetchedGame.icon, isNull);
+
+      matchExists = await database.matchDao.matchExists(matchId: testMatch1.id);
+      expect(matchExists, true);
     });
 
-    // Verifies that multiple games can be added at once using addGamesAsList.
+    test('Deleting a match works correctly', () async {
-    test('addGamesAsList adds multiple games correctly', () async {
+      await database.matchDao.addMatch(match: testMatch1);
-      final result = await database.gameDao.addGamesAsList(
-        games: [testGame1, testGame2, testGame3],
-      );
-      expect(result, true);
 
-      final allGames = await database.gameDao.getAllGames();
+      final matchDeleted = await database.matchDao.deleteMatch(
-      expect(allGames.length, 3);
+        matchId: testMatch1.id,
+      );
+      expect(matchDeleted, true);
+
+      final matchExists = await database.matchDao.matchExists(
+        matchId: testMatch1.id,
+      );
+      expect(matchExists, false);
     });
 
-    // Verifies that addGamesAsList returns false when given an empty list.
+    test('Getting the match count works correctly', () async {
-    test('addGamesAsList returns false for empty list', () async {
+      var matchCount = await database.matchDao.getMatchCount();
-      final result = await database.gameDao.addGamesAsList(games: []);
+      expect(matchCount, 0);
-      expect(result, false);
 
-      final allGames = await database.gameDao.getAllGames();
+      await database.matchDao.addMatch(match: testMatch1);
-      expect(allGames.length, 0);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 1);
+
+      await database.matchDao.addMatch(match: testMatch2);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 2);
+
+      await database.matchDao.deleteMatch(matchId: testMatch1.id);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 1);
+
+      await database.matchDao.deleteMatch(matchId: testMatch2.id);
+
+      matchCount = await database.matchDao.getMatchCount();
+      expect(matchCount, 0);
     });
 
-    // Verifies that addGamesAsList ignores duplicate games when adding.
+    test('Checking if match has winner works correctly', () async {
-    test('addGamesAsList ignores duplicate games', () async {
+      await database.matchDao.addMatch(match: testMatch1);
-      await database.gameDao.addGame(game: testGame1);
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);
 
-      final result = await database.gameDao.addGamesAsList(
+      var hasWinner = await database.matchDao.hasWinner(matchId: testMatch1.id);
-        games: [testGame1, testGame2],
+      expect(hasWinner, true);
+
+      hasWinner = await database.matchDao.hasWinner(
+        matchId: testMatchOnlyGroup.id,
       );
-      expect(result, true);
+      expect(hasWinner, false);
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames.length, 2);
     });
 
-    // Verifies that deleteGame returns true and removes the game from database.
+    test('Fetching the winner of a match works correctly', () async {
-    test('deleteGame returns true when game is deleted', () async {
+      await database.matchDao.addMatch(match: testMatch1);
-      await database.gameDao.addGame(game: testGame1);
 
-      final result = await database.gameDao.deleteGame(gameId: testGame1.id);
+      final winner = await database.matchDao.getWinner(matchId: testMatch1.id);
-      expect(result, true);
+      if (winner == null) {
-
+        fail('Winner is null');
-      final allGames = await database.gameDao.getAllGames();
+      } else {
-      expect(allGames, isEmpty);
+        expect(winner.id, testMatch1.winner!.id);
+        expect(winner.name, testMatch1.winner!.name);
+        expect(winner.createdAt, testMatch1.winner!.createdAt);
+      }
     });
 
-    // Verifies that deleteGame returns false for a non-existent game ID.
+    test('Updating the winner of a match works correctly', () async {
-    test('deleteGame returns false for non-existent game', () async {
+      await database.matchDao.addMatch(match: testMatch1);
-      final result = await database.gameDao.deleteGame(
+
-        gameId: 'non-existent-id',
+      final winner = await database.matchDao.getWinner(matchId: testMatch1.id);
+      if (winner == null) {
+        fail('Winner is null');
+      } else {
+        expect(winner.id, testMatch1.winner!.id);
+        expect(winner.name, testMatch1.winner!.name);
+        expect(winner.createdAt, testMatch1.winner!.createdAt);
+        expect(winner.id, testPlayer4.id);
+        expect(winner.id != testPlayer5.id, true);
+      }
+
+      await database.matchDao.setWinner(
+        matchId: testMatch1.id,
+        winnerId: testPlayer5.id,
       );
-      expect(result, false);
+
+      final newWinner = await database.matchDao.getWinner(
+        matchId: testMatch1.id,
+      );
+
+      if (newWinner == null) {
+        fail('New winner is null');
+      } else {
+        expect(newWinner.id, testPlayer5.id);
+        expect(newWinner.name, testPlayer5.name);
+        expect(newWinner.createdAt, testPlayer5.createdAt);
+      }
     });
 
-    // Verifies that deleteGame only removes the specified game, leaving others intact.
+    test('Removing a winner works correctly', () async {
-    test('deleteGame only deletes the specified game', () async {
+      await database.matchDao.addMatch(match: testMatch2);
-      await database.gameDao.addGamesAsList(
+
-        games: [testGame1, testGame2, testGame3],
+      var hasWinner = await database.matchDao.hasWinner(matchId: testMatch2.id);
+      expect(hasWinner, true);
+
+      await database.matchDao.removeWinner(matchId: testMatch2.id);
+
+      hasWinner = await database.matchDao.hasWinner(matchId: testMatch2.id);
+      expect(hasWinner, false);
+
+      final removedWinner = await database.matchDao.getWinner(
+        matchId: testMatch2.id,
       );
 
-      await database.gameDao.deleteGame(gameId: testGame2.id);
+      expect(removedWinner, null);
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames.length, 2);
-      expect(allGames.any((g) => g.id == testGame2.id), false);
-      expect(allGames.any((g) => g.id == testGame1.id), true);
-      expect(allGames.any((g) => g.id == testGame3.id), true);
     });
 
-    // Verifies that gameExists returns true when the game exists in database.
+    test('Renaming a match works correctly', () async {
-    test('gameExists returns true for existing game', () async {
+      await database.matchDao.addMatch(match: testMatch1);
-      await database.gameDao.addGame(game: testGame1);
 
-      final exists = await database.gameDao.gameExists(gameId: testGame1.id);
+      var fetchedMatch = await database.matchDao.getMatchById(
-      expect(exists, true);
+        matchId: testMatch1.id,
-    });
-
-    // Verifies that gameExists returns false for a non-existent game ID.
-    test('gameExists returns false for non-existent game', () async {
-      final exists = await database.gameDao.gameExists(
-        gameId: 'non-existent-id',
       );
-      expect(exists, false);
+      expect(fetchedMatch.name, testMatch1.name);
-    });
 
-    // Verifies that gameExists returns false after a game has been deleted.
+      const newName = 'Updated Match Name';
-    test('gameExists returns false after game is deleted', () async {
+      await database.matchDao.updateMatchName(
-      await database.gameDao.addGame(game: testGame1);
+        matchId: testMatch1.id,
-      await database.gameDao.deleteGame(gameId: testGame1.id);
+        newName: newName,
-
-      final exists = await database.gameDao.gameExists(gameId: testGame1.id);
-      expect(exists, false);
-    });
-
-    // Verifies that updateGameName correctly updates only the name field.
-    test('updateGameName updates the name correctly', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameName(
-        gameId: testGame1.id,
-        newName: 'Updated Chess',
       );
 
-      final updatedGame = await database.gameDao.getGameById(
+      fetchedMatch = await database.matchDao.getMatchById(
-        gameId: testGame1.id,
+        matchId: testMatch1.id,
       );
-      expect(updatedGame.name, 'Updated Chess');
+      expect(fetchedMatch.name, newName);
-      expect(updatedGame.ruleset, testGame1.ruleset);
-    });
-
-    // Verifies that updateGameName does nothing when game doesn't exist.
-    test('updateGameName does nothing for non-existent game', () async {
-      await database.gameDao.updateGameName(
-        gameId: 'non-existent-id',
-        newName: 'New Name',
-      );
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames, isEmpty);
-    });
-
-    // Verifies that updateGameRuleset correctly updates only the ruleset field.
-    test('updateGameRuleset updates the ruleset correctly', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameRuleset(
-        gameId: testGame1.id,
-        newRuleset: 'New ruleset for chess',
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.ruleset, 'New ruleset for chess');
-      expect(updatedGame.name, testGame1.name);
-    });
-
-    // Verifies that updateGameRuleset does nothing when game doesn't exist.
-    test('updateGameRuleset does nothing for non-existent game', () async {
-      await database.gameDao.updateGameRuleset(
-        gameId: 'non-existent-id',
-        newRuleset: 'New Ruleset',
-      );
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames, isEmpty);
-    });
-
-    // Verifies that updateGameDescription correctly updates the description.
-    test('updateGameDescription updates the description correctly', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameDescription(
-        gameId: testGame1.id,
-        newDescription: 'An updated description',
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.description, 'An updated description');
-    });
-
-    // Verifies that updateGameDescription can set the description to null.
-    test('updateGameDescription can set description to null', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameDescription(
-        gameId: testGame1.id,
-        newDescription: null,
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.description, isNull);
-    });
-
-    // Verifies that updateGameDescription does nothing when game doesn't exist.
-    test('updateGameDescription does nothing for non-existent game', () async {
-      await database.gameDao.updateGameDescription(
-        gameId: 'non-existent-id',
-        newDescription: 'New Description',
-      );
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames, isEmpty);
-    });
-
-    // Verifies that updateGameColor correctly updates the color value.
-    test('updateGameColor updates the color correctly', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameColor(
-        gameId: testGame1.id,
-        newColor: 0xFF00FF00,
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.color, 0xFF00FF00);
-    });
-
-    // Verifies that updateGameColor can set the color to null.
-    test('updateGameColor can set color to null', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameColor(
-        gameId: testGame1.id,
-        newColor: null,
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.color, isNull);
-    });
-
-    // Verifies that updateGameColor does nothing when game doesn't exist.
-    test('updateGameColor does nothing for non-existent game', () async {
-      await database.gameDao.updateGameColor(
-        gameId: 'non-existent-id',
-        newColor: 0xFF00FF00,
-      );
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames, isEmpty);
-    });
-
-    // Verifies that updateGameIcon correctly updates the icon value.
-    test('updateGameIcon updates the icon correctly', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameIcon(
-        gameId: testGame1.id,
-        newIcon: 'new_chess_icon',
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.icon, 'new_chess_icon');
-    });
-
-    // Verifies that updateGameIcon can set the icon to null.
-    test('updateGameIcon can set icon to null', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameIcon(
-        gameId: testGame1.id,
-        newIcon: null,
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.icon, isNull);
-    });
-
-    // Verifies that updateGameIcon does nothing when game doesn't exist.
-    test('updateGameIcon does nothing for non-existent game', () async {
-      await database.gameDao.updateGameIcon(
-        gameId: 'non-existent-id',
-        newIcon: 'some_icon',
-      );
-
-      final allGames = await database.gameDao.getAllGames();
-      expect(allGames, isEmpty);
-    });
-
-    // Verifies that getGameCount returns 0 when no games exist.
-    test('getGameCount returns 0 when no games exist', () async {
-      final count = await database.gameDao.getGameCount();
-      expect(count, 0);
-    });
-
-    // Verifies that getGameCount returns the correct count after adding games.
-    test('getGameCount returns correct count after adding games', () async {
-      await database.gameDao.addGamesAsList(
-        games: [testGame1, testGame2, testGame3],
-      );
-
-      final count = await database.gameDao.getGameCount();
-      expect(count, 3);
-    });
-
-    // Verifies that getGameCount updates correctly after deleting a game.
-    test('getGameCount updates correctly after deletion', () async {
-      await database.gameDao.addGamesAsList(
-        games: [testGame1, testGame2],
-      );
-
-      final countBefore = await database.gameDao.getGameCount();
-      expect(countBefore, 2);
-
-      await database.gameDao.deleteGame(gameId: testGame1.id);
-
-      final countAfter = await database.gameDao.getGameCount();
-      expect(countAfter, 1);
-    });
-
-    // Verifies that deleteAllGames removes all games from the database.
-    test('deleteAllGames removes all games', () async {
-      await database.gameDao.addGamesAsList(
-        games: [testGame1, testGame2, testGame3],
-      );
-
-      final countBefore = await database.gameDao.getGameCount();
-      expect(countBefore, 3);
-
-      final result = await database.gameDao.deleteAllGames();
-      expect(result, true);
-
-      final countAfter = await database.gameDao.getGameCount();
-      expect(countAfter, 0);
-    });
-
-    // Verifies that deleteAllGames returns false when no games exist.
-    test('deleteAllGames returns false when no games exist', () async {
-      final result = await database.gameDao.deleteAllGames();
-      expect(result, false);
-    });
-
-    // Verifies that games with special characters (quotes, emojis) are stored correctly.
-    test('Game with special characters in name is stored correctly', () async {
-      final specialGame = Game(
-        name: 'Game\'s & "Special" <Name>',
-        description: 'Description with émojis 🎮🎲',
-      );
-      await database.gameDao.addGame(game: specialGame);
-
-      final fetchedGame = await database.gameDao.getGameById(
-        gameId: specialGame.id,
-      );
-      expect(fetchedGame.name, 'Game\'s & "Special" <Name>');
-      expect(fetchedGame.description, 'Description with émojis 🎮🎲');
-    });
-
-    // Verifies that games with empty string fields are stored and retrieved correctly.
-    test('Game with empty string fields is stored correctly', () async {
-      final emptyGame = Game(
-        name: '',
-        ruleset: '',
-        description: '',
-        icon: '',
-      );
-      await database.gameDao.addGame(game: emptyGame);
-
-      final fetchedGame = await database.gameDao.getGameById(
-        gameId: emptyGame.id,
-      );
-      expect(fetchedGame.name, '');
-      expect(fetchedGame.ruleset, '');
-      expect(fetchedGame.description, '');
-      expect(fetchedGame.icon, '');
-    });
-
-    // Verifies that games with very long strings (10000 chars) are handled correctly.
-    test('Game with very long strings is stored correctly', () async {
-      final longString = 'A' * 10000;
-      final longGame = Game(
-        name: longString,
-        description: longString,
-        ruleset: longString,
-      );
-      await database.gameDao.addGame(game: longGame);
-
-      final fetchedGame = await database.gameDao.getGameById(
-        gameId: longGame.id,
-      );
-      expect(fetchedGame.name.length, 10000);
-      expect(fetchedGame.description?.length, 10000);
-      expect(fetchedGame.ruleset?.length, 10000);
-    });
-
-    // Verifies that multiple sequential updates to the same game work correctly.
-    test('Multiple updates to the same game work correctly', () async {
-      await database.gameDao.addGame(game: testGame1);
-
-      await database.gameDao.updateGameName(
-        gameId: testGame1.id,
-        newName: 'Updated Name',
-      );
-      await database.gameDao.updateGameColor(
-        gameId: testGame1.id,
-        newColor: 0xFF123456,
-      );
-      await database.gameDao.updateGameDescription(
-        gameId: testGame1.id,
-        newDescription: 'Updated Description',
-      );
-
-      final updatedGame = await database.gameDao.getGameById(
-        gameId: testGame1.id,
-      );
-      expect(updatedGame.name, 'Updated Name');
-      expect(updatedGame.color, 0xFF123456);
-      expect(updatedGame.description, 'Updated Description');
-      expect(updatedGame.ruleset, testGame1.ruleset);
-      expect(updatedGame.icon, testGame1.icon);
     });
   });
 }
-

test/db_tests/group_match_test.dart

@@ -0,0 +1,221 @@
+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);
+      }
+    });
+  });
+}