Merge remote-tracking branch 'origin/development' into feature/88-neue-datenbank-struktur

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

.gitea/ISSUE_TEMPLATE/BUG_REPORT.md

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

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

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

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

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

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

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

@@ -0,0 +1,47 @@
+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,25 +150,9 @@ 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
@@ -176,17 +160,8 @@ 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
@@ -196,3 +171,5 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 /devtools_options.yaml
+
+untranslated_messages.json

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <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}"
@@ -42,5 +43,14 @@
             <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.7.3" apply false
+    id("com.android.application") version "8.9.1" apply false
     id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 

ios/Runner/Info.plist

@@ -24,6 +24,11 @@
 	<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>
@@ -44,4 +49,4 @@
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 </dict>
-</plist>
+</plist>

l10n.yaml

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

lib/core/adaptive_page_route.dart

@@ -0,0 +1,23 @@
+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,3 +1,4 @@
+/// Application-wide constants
 class Constants {
   Constants._(); // Private constructor to prevent instantiation
 

lib/core/custom_theme.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+/// Theme class that defines colors, border radius, padding, and decorations
 class CustomTheme {
   CustomTheme._(); // Private constructor to prevent instantiation
 
@@ -11,6 +12,8 @@ class CustomTheme {
   static Color onBoxColor = const Color(0xFF181818);
   static Color boxBorder = const Color(0xFF272727);
   static const Color textColor = Colors.white;
+  static Color navBarItemSelectedColor = primaryColor.withGreen(100);
+  static Color navBarItemUnselectedColor = Colors.grey.shade400;
 
   // ==================== Border Radius ====================
   static const double standardBorderRadius = 12.0;

lib/data/dao/game_dao.dart

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

lib/data/dao/game_dao.g.dart

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

lib/data/dao/group_dao.dart

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

lib/data/dao/group_match_dao.dart

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

lib/data/dao/group_match_dao.g.dart

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

lib/data/dao/match_dao.dart

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

lib/data/dao/match_dao.g.dart

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

lib/data/dao/player_dao.dart

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

lib/data/dao/player_match_dao.dart

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

lib/data/dao/player_match_dao.g.dart

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

lib/data/dao/score_dao.dart

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

lib/data/dao/score_dao.g.dart

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

lib/data/dao/team_dao.dart

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

lib/data/dao/team_dao.g.dart

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

lib/data/db/database.dart

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

lib/data/db/tables/game_table.dart

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

lib/data/db/tables/group_match_table.dart

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

lib/data/db/tables/group_table.dart

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

lib/data/db/tables/match_table.dart

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

lib/data/db/tables/player_match_table.dart

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

lib/data/db/tables/player_table.dart

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

lib/data/db/tables/score_table.dart

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

lib/data/db/tables/team_table.dart

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

lib/data/dto/game.dart

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

lib/data/dto/group.dart

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

lib/data/dto/match.dart

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

lib/data/dto/pair.dart

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

lib/data/dto/player.dart

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

lib/data/dto/team.dart

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

lib/l10n/arb/app_de.arb

@@ -3,6 +3,7 @@
   "all_players": "Alle Spieler:innen",
   "all_players_selected": "Alle Spieler:innen ausgewählt",
   "amount_of_matches": "Anzahl der Spiele",
+  "app_name": "Game Tracker",
   "cancel": "Abbrechen",
   "choose_game": "Spielvorlage wählen",
   "choose_group": "Gruppe wählen",
@@ -12,12 +13,13 @@
   "create_match": "Spiel erstellen",
   "create_new_group": "Neue Gruppe erstellen",
   "create_new_match": "Neues Spiel erstellen",
+  "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",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",
@@ -34,13 +36,17 @@
   "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",
-  "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",
@@ -54,6 +60,7 @@
   "player_name": "Spieler:innenname",
   "players": "Spieler:innen",
   "players_count": "{count} Spieler",
+  "privacy_policy": "Datenschutzerklärung",
   "quick_create": "Schnellzugriff",
   "recent_matches": "Letzte Spiele",
   "ruleset": "Regelwerk",
@@ -72,7 +79,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

@@ -39,6 +39,9 @@
   "@create_new_match": {
     "description": "Button text to create a new match"
   },
+  "@data": {
+    "description": "Data label"
+  },
   "@data_successfully_deleted": {
     "description": "Success message after deleting data"
   },
@@ -110,6 +113,15 @@
   "@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"
   },
@@ -119,9 +131,6 @@
   "@matches": {
     "description": "Label for matches"
   },
-  "@menu": {
-    "description": "Menu label"
-  },
   "@most_points": {
     "description": "Title for most points ruleset"
   },
@@ -131,6 +140,12 @@
   "@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"
   },
@@ -175,6 +190,9 @@
       }
     }
   },
+  "@privacy_policy": {
+    "description": "Privacy policy menu item"
+  },
   "@quick_create": {
     "description": "Title for quick create section"
   },
@@ -209,7 +227,7 @@
     "description": "Shows the number of selected players"
   },
   "@settings": {
-    "description": "Settings label"
+    "description": "Label for the App Settings"
   },
   "@single_loser": {
     "description": "Title for single loser ruleset"
@@ -272,12 +290,13 @@
   "create_match": "Create match",
   "create_new_group": "Create new group",
   "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",
   "error_creating_group": "Error while creating group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",
@@ -294,13 +313,17 @@
   "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",
-  "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",
@@ -314,6 +337,7 @@
   "player_name": "Player name",
   "players": "Players",
   "players_count": "{count} Players",
+  "privacy_policy": "Privacy Policy",
   "quick_create": "Quick Create",
   "recent_matches": "Recent Matches",
   "ruleset": "Ruleset",
@@ -332,7 +356,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

@@ -176,6 +176,12 @@ abstract class AppLocalizations {
   /// **'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:
@@ -209,7 +215,7 @@ abstract class AppLocalizations {
   /// Confirmation dialog for deleting all data
   ///
   /// In en, this message translates to:
-  /// **'Delete all data?'**
+  /// **'Delete all data'**
   String get delete_all_data;
 
   /// Error message when group creation fails
@@ -308,6 +314,24 @@ 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:
@@ -326,12 +350,6 @@ abstract class AppLocalizations {
   /// **'Matches'**
   String get matches;
 
-  /// Menu label
-  ///
-  /// In en, this message translates to:
-  /// **'Menu'**
-  String get menu;
-
   /// Title for most points ruleset
   ///
   /// In en, this message translates to:
@@ -350,6 +368,18 @@ 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:
@@ -428,6 +458,12 @@ 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:
@@ -494,7 +530,7 @@ abstract class AppLocalizations {
   /// **'Selected players'**
   String get selected_players;
 
-  /// Settings label
+  /// Label for the App Settings
   ///
   /// In en, this message translates to:
   /// **'Settings'**
@@ -539,7 +575,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

@@ -49,6 +49,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get create_new_match => 'Neues Spiel erstellen';
 
+  @override
+  String get data => 'Daten';
+
   @override
   String get data_successfully_deleted => 'Daten erfolgreich gelöscht';
 
@@ -67,7 +70,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete => 'Löschen';
 
   @override
-  String get delete_all_data => 'Alle Daten löschen?';
+  String get delete_all_data => 'Alle Daten löschen';
 
   @override
   String get error_creating_group =>
@@ -118,6 +121,15 @@ 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...';
 
@@ -127,9 +139,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get matches => 'Spiele';
 
-  @override
-  String get menu => 'Menü';
-
   @override
   String get most_points => 'Höchste Punkte';
 
@@ -139,6 +148,12 @@ 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';
 
@@ -181,6 +196,9 @@ class AppLocalizationsDe extends AppLocalizations {
     return '$count Spieler';
   }
 
+  @override
+  String get privacy_policy => 'Datenschutzerklärung';
+
   @override
   String get quick_create => 'Schnellzugriff';
 
@@ -244,7 +262,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

@@ -49,6 +49,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get create_new_match => 'Create new match';
 
+  @override
+  String get data => 'Data';
+
   @override
   String get data_successfully_deleted => 'Data successfully deleted';
 
@@ -67,7 +70,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get delete => 'Delete';
 
   @override
-  String get delete_all_data => 'Delete all data?';
+  String get delete_all_data => 'Delete all data';
 
   @override
   String get error_creating_group =>
@@ -118,6 +121,15 @@ 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...';
 
@@ -127,9 +139,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get matches => 'Matches';
 
-  @override
-  String get menu => 'Menu';
-
   @override
   String get most_points => 'Most Points';
 
@@ -139,6 +148,12 @@ 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';
 
@@ -181,6 +196,9 @@ class AppLocalizationsEn extends AppLocalizations {
     return '$count Players';
   }
 
+  @override
+  String get privacy_policy => 'Privacy Policy';
+
   @override
   String get quick_create => 'Quick Create';
 
@@ -243,7 +261,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,6 +44,12 @@ class GameTracker extends StatelessWidget {
           seedColor: CustomTheme.primaryColor,
           brightness: Brightness.dark,
         ).copyWith(surface: CustomTheme.backgroundColor),
+        pageTransitionsTheme: const PageTransitionsTheme(
+          builders: {
+            TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
+            TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
+          },
+        ),
       ),
       home: const CustomNavigationBar(),
     );

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,14 +1,19 @@
+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.dart';
+import 'package:game_tracker/presentation/views/main_menu/settings_view/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
@@ -56,7 +61,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                MaterialPageRoute(builder: (_) => const SettingsView()),
+                adaptivePageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;
@@ -70,53 +75,102 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       backgroundColor: CustomTheme.backgroundColor,
       body: tabs[currentIndex],
       extendBody: true,
-      bottomNavigationBar: SafeArea(
+      bottomNavigationBar: SizedBox(
-        minimum: const EdgeInsets.only(bottom: 30),
+        height: 70 + MediaQuery.of(context).padding.bottom,
-        child: Container(
+        child: Stack(
-          margin: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 10),
+          children: [
-          decoration: BoxDecoration(
+            // Dynamically generated blur layers for ultra-smooth transition
-            borderRadius: BorderRadius.circular(24),
+            ...List.generate(34, (index) {
-            color: CustomTheme.primaryColor,
+              // Use cubic curve for an even more natural, smoother transition
-          ),
+              final progress = index / 34.0; // 0.0 to 1.0
-          child: ClipRRect(
+              final cubic = progress * progress * progress; // cubic curve
-            borderRadius: BorderRadius.circular(24),
+              final blurStrength =
-            child: SizedBox(
+                  0.5 + (cubic * 50.0); // Very smooth from 0.5 to 50.5
-              height: 60,
+
-              child: Row(
+              // Height goes completely from 100% to 0% (all the way down)
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
+              // With extra density at the bottom for softer transition
-                children: <Widget>[
+              final heightFactor = index < 25
-                  NavbarItem(
+                  // First 25 layers: 100% to 30%
-                    index: 0,
+                  ? 1.0 - (progress * 0.7)
-                    isSelected: currentIndex == 0,
+                  // Last 10 layers: 30% to 0% (denser)
-                    icon: Icons.home_rounded,
+                  : 0.3 - ((index - 25) / 34.0);
-                    label: loc.home,
+
-                    onTabTapped: onTabTapped,
+              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),
                   ),
-                  NavbarItem(
+                ),
-                    index: 1,
+              );
-                    isSelected: currentIndex == 1,
+            }),
-                    icon: Icons.gamepad_rounded,
+            // Gradient overlay
-                    label: loc.matches,
+            Positioned.fill(
-                    onTabTapped: onTabTapped,
+              child: Container(
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                    begin: Alignment.bottomCenter,
+                    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],
                   ),
-                  NavbarItem(
+                ),
-                    index: 2,
-                    isSelected: currentIndex == 2,
-                    icon: Icons.group_rounded,
-                    label: loc.groups,
-                    onTabTapped: onTabTapped,
-                  ),
-                  NavbarItem(
-                    index: 3,
-                    isSelected: currentIndex == 3,
-                    icon: Icons.bar_chart_rounded,
-                    label: loc.statistics,
-                    onTabTapped: onTabTapped,
-                  ),
-                ],
               ),
             ),
-          ),
+            // Navbar content
+            SafeArea(
+              child: SizedBox(
+                height: 70,
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  children: <Widget>[
+                    NavbarItem(
+                      index: 0,
+                      isSelected: currentIndex == 0,
+                      icon: Icons.home_rounded,
+                      label: loc.home,
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 1,
+                      isSelected: currentIndex == 1,
+                      icon: Icons.gamepad_rounded,
+                      label: loc.matches,
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 2,
+                      isSelected: currentIndex == 2,
+                      icon: Icons.group_rounded,
+                      label: loc.groups,
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 3,
+                      isSelected: currentIndex == 3,
+                      icon: Icons.bar_chart_rounded,
+                      label: loc.statistics,
+                      onTabTapped: onTabTapped,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ],
         ),
       ),
     );

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

@@ -11,6 +11,7 @@ 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
@@ -44,66 +45,68 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
-      backgroundColor: CustomTheme.backgroundColor,
+      child: Scaffold(
-      appBar: AppBar(title: Text(loc.create_new_group)),
+        backgroundColor: CustomTheme.backgroundColor,
-      body: SafeArea(
+        appBar: AppBar(title: Text(loc.create_new_group)),
-        child: Column(
+        body: SafeArea(
-          mainAxisAlignment: MainAxisAlignment.start,
+          child: Column(
-          children: [
+            mainAxisAlignment: MainAxisAlignment.start,
-            Container(
+            children: [
-              margin: CustomTheme.standardMargin,
+              Container(
-              child: TextInputField(
+                margin: CustomTheme.standardMargin,
-                controller: _groupNameController,
+                child: TextInputField(
-                hintText: loc.group_name,
+                  controller: _groupNameController,
+                  hintText: loc.group_name,
+                ),
               ),
-            ),
+              Expanded(
-            Expanded(
+                child: PlayerSelection(
-              child: PlayerSelection(
+                  onChanged: (value) {
-                onChanged: (value) {
+                    setState(() {
-                  setState(() {
+                      selectedPlayers = [...value];
-                    selectedPlayers = [...value];
+                    });
-                  });
+                  },
-                },
+                ),
               ),
-            ),
+              CustomWidthButton(
-            CustomWidthButton(
+                text: loc.create_group,
-              text: loc.create_group,
+                sizeRelativeToWidth: 0.95,
-              sizeRelativeToWidth: 0.95,
+                buttonType: ButtonType.primary,
-              buttonType: ButtonType.primary,
+                onPressed:
-              onPressed:
+                    (_groupNameController.text.isEmpty ||
-                  (_groupNameController.text.isEmpty ||
+                        (selectedPlayers.length < 2))
-                      (selectedPlayers.length < 2))
+                    ? null
-                  ? null
+                    : () async {
-                  : () async {
+                        bool success = await db.groupDao.addGroup(
-                      bool success = await db.groupDao.addGroup(
+                          group: Group(
-                        group: Group(
+                            name: _groupNameController.text.trim(),
-                          name: _groupNameController.text.trim(),
+                            members: selectedPlayers,
-                          members: selectedPlayers,
-                        ),
-                      );
-                      if (!context.mounted) return;
-                      if (success) {
-                        Navigator.pop(context);
-                      } else {
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          SnackBar(
-                            backgroundColor: CustomTheme.boxColor,
-                            content: Center(
-                              child: Text(
-                                AppLocalizations.of(
-                                  context,
-                                ).error_creating_group,
-                                style: const TextStyle(color: Colors.white),
-                              ),
-                            ),
                           ),
                         );
-                      }
+                        if (!context.mounted) return;
-                    },
+                        if (success) {
-            ),
+                          Navigator.pop(context);
-            const SizedBox(height: 20),
+                        } else {
-          ],
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              backgroundColor: CustomTheme.boxColor,
+                              content: Center(
+                                child: Text(
+                                  AppLocalizations.of(
+                                    context,
+                                  ).error_creating_group,
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                              ),
+                            ),
+                          );
+                        }
+                      },
+              ),
+              const SizedBox(height: 20),
+            ],
+          ),
         ),
       ),
     );

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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -7,12 +8,13 @@ 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/widgets/app_skeleton.dart';
-import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
+import 'package:game_tracker/presentation/widgets/buttons/main_menu_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
@@ -78,14 +80,14 @@ class _GroupsViewState extends State<GroupsView> {
             ),
           ),
           Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom,
+            bottom: MediaQuery.paddingOf(context).bottom + 20,
-            child: CustomWidthButton(
+            child: MainMenuButton(
               text: loc.create_group,
-              sizeRelativeToWidth: 0.90,
+              icon: Icons.group_add,
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) {
                       return const CreateGroupView();
                     },

lib/presentation/views/main_menu/home_view.dart

@@ -1,18 +1,22 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
 import 'package:game_tracker/presentation/widgets/buttons/quick_create_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart';
-import 'package:game_tracker/presentation/widgets/tiles/match_summary_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart';
 import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart';
 import 'package:provider/provider.dart';
 
 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
@@ -43,7 +47,6 @@ class _HomeViewState extends State<HomeView> {
           Player(name: 'Skeleton Player 2'),
         ],
       ),
-      winner: Player(name: 'Skeleton Player 1'),
     ),
   );
 
@@ -90,121 +93,92 @@ class _HomeViewState extends State<HomeView> {
                   child: InfoTile(
                     width: constraints.maxWidth * 0.95,
                     title: loc.recent_matches,
-                    icon: Icons.timer,
+                    icon: Icons.history_rounded,
-                    content: Padding(
+                    content: Column(
-                      padding: const EdgeInsets.symmetric(horizontal: 40.0),
+                      children: [
-                      child: Visibility(
+                        if (recentMatches.isNotEmpty)
-                        visible: !isLoading && loadedRecentMatches.isNotEmpty,
+                          for (Match match in recentMatches)
-                        replacement: Center(
+                            Padding(
-                          heightFactor: 12,
+                              padding: const EdgeInsets.symmetric(
-                          child: Text(
+                                vertical: 6.0,
-                            AppLocalizations.of(
+                              ),
-                              context,
+                              child: MatchTile(
-                            ).no_recent_matches_available,
+                                compact: true,
+                                width: constraints.maxWidth * 0.9,
+                                match: match,
+                                onTap: () async {
+                                  await Navigator.of(context).push(
+                                    adaptivePageRoute(
+                                      fullscreenDialog: true,
+                                      builder: (context) =>
+                                          MatchResultView(match: match),
+                                    ),
+                                  );
+                                  await updatedWinnerinRecentMatches(match.id);
+                                },
+                              ),
+                            )
+                        else
+                          Center(
+                            heightFactor: 5,
+                            child: Text(loc.no_recent_matches_available),
                           ),
-                        ),
+                      ],
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            MatchSummaryTile(
-                              matchTitle: recentMatches[0].name,
-                              game: 'Winner',
-                              ruleset: 'Ruleset',
-                              players: _getPlayerText(
-                                recentMatches[0],
-                                context,
-                              ),
-                              winner: recentMatches[0].winner == null
-                                  ? AppLocalizations.of(
-                                      context,
-                                    ).match_in_progress
-                                  : recentMatches[0].winner!.name,
-                            ),
-                            const Padding(
-                              padding: EdgeInsets.symmetric(vertical: 8.0),
-                              child: Divider(),
-                            ),
-                            if (loadedRecentMatches.length > 1) ...[
-                              MatchSummaryTile(
-                                matchTitle: recentMatches[1].name,
-                                game: 'Winner',
-                                ruleset: 'Ruleset',
-                                players: _getPlayerText(
-                                  recentMatches[1],
-                                  context,
-                                ),
-                                winner: recentMatches[1].winner == null
-                                    ? AppLocalizations.of(
-                                        context,
-                                      ).match_in_progress
-                                    : recentMatches[1].winner!.name,
-                              ),
-                              const SizedBox(height: 8),
-                            ] else ...[
-                              Center(
-                                heightFactor: 5.35,
-                                child: Text(
-                                  AppLocalizations.of(
-                                    context,
-                                  ).no_second_match_available,
-                                ),
-                              ),
-                            ],
-                          ],
-                        ),
-                      ),
                     ),
                   ),
                 ),
-                InfoTile(
+                Padding(
-                  width: constraints.maxWidth * 0.95,
+                  padding: EdgeInsets.zero,
-                  title: loc.quick_create,
+                  child: InfoTile(
-                  icon: Icons.add_box_rounded,
+                    width: constraints.maxWidth * 0.95,
-                  content: Column(
+                    title: loc.quick_create,
-                    children: [
+                    icon: Icons.add_box_rounded,
-                      Row(
+                    content: Column(
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                      children: [
-                        children: [
+                        Row(
-                          QuickCreateButton(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            text: 'Category 1',
+                          children: [
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 1',
-                          QuickCreateButton(
+                              onPressed: () {},
-                            text: 'Category 2',
+                            ),
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 2',
-                        ],
+                              onPressed: () {},
-                      ),
+                            ),
-                      Row(
+                          ],
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        ),
-                        children: [
+                        Row(
-                          QuickCreateButton(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            text: 'Category 3',
+                          children: [
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 3',
-                          QuickCreateButton(
+                              onPressed: () {},
-                            text: 'Category 4',
+                            ),
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 4',
-                        ],
+                              onPressed: () {},
-                      ),
+                            ),
-                      Row(
+                          ],
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        ),
-                        children: [
+                        Row(
-                          QuickCreateButton(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            text: 'Category 5',
+                          children: [
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 5',
-                          QuickCreateButton(
+                              onPressed: () {},
-                            text: 'Category 6',
+                            ),
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 6',
-                        ],
+                              onPressed: () {},
-                      ),
+                            ),
-                    ],
+                          ],
+                        ),
+                      ],
+                    ),
                   ),
                 ),
+                SizedBox(height: MediaQuery.paddingOf(context).bottom),
               ],
             ),
           ),
@@ -215,7 +189,7 @@ class _HomeViewState extends State<HomeView> {
 
   /// Loads the data for the HomeView from the database.
   /// This includes the match count, group count, and recent matches.
-  void loadHomeViewData() {
+  Future<void> loadHomeViewData() async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     Future.wait([
       db.matchDao.getMatchCount(),
@@ -231,11 +205,6 @@ class _HomeViewState extends State<HomeView> {
                 ..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
               .take(2)
               .toList();
-      if (loadedRecentMatches.length < 2) {
-        recentMatches.add(
-          Match(name: 'Dummy Match', winner: null, group: null, players: null),
-        );
-      }
       if (mounted) {
         setState(() {
           isLoading = false;
@@ -244,18 +213,15 @@ class _HomeViewState extends State<HomeView> {
     });
   }
 
-  /// Generates a text representation of the players in the match.
+  /// Updates the winner information for a specific match in the recent matches list.
-  /// If the match has a group, it returns the group name and the number of additional players.
+  Future<void> updatedWinnerinRecentMatches(String matchId) async {
-  /// If there is no group, it returns the count of players.
+    final db = Provider.of<AppDatabase>(context, listen: false);
-  String _getPlayerText(Match game, context) {
+    final winner = await db.matchDao.getWinner(matchId: matchId);
-    final loc = AppLocalizations.of(context);
+    final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
-    if (game.group == null) {
+    if (matchIndex != -1) {
-      final playerCount = game.players?.length ?? 0;
+      setState(() {
-      return loc.players_count(playerCount);
+        recentMatches[matchIndex].winner = winner;
+      });
     }
-    if (game.players == null || game.players!.isEmpty) {
-      return game.group!.name;
-    }
-    return '${game.group!.name} + ${game.players!.length}';
   }
 }

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

@@ -6,15 +6,21 @@ 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 {
-  final List<(String, String, Ruleset)> games;
+  /// A view that allows the user to choose a game from a list of available games
-  final int initialGameIndex;
+  /// - [games]: A list of tuples containing the game name, description and ruleset
-
+  /// - [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();
 }

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

@@ -7,15 +7,21 @@ import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 
 class ChooseGroupView extends StatefulWidget {
-  final List<Group> groups;
+  /// A view that allows the user to choose a group from a list of groups.
-  final String initialGroupId;
+  /// - [groups]: A list of available groups to choose from
-
+  /// - [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();
 }
@@ -140,7 +146,12 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
         filteredGroups.clear();
         filteredGroups.addAll(
           widget.groups.where(
-            (group) => group.name.toLowerCase().contains(query.toLowerCase()),
+            (group) =>
+                group.name.toLowerCase().contains(query.toLowerCase()) ||
+                group.members.any(
+                  (player) =>
+                      player.name.toLowerCase().contains(query.toLowerCase()),
+                ),
           ),
         );
       }

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

@@ -5,15 +5,21 @@ 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;
+  /// A view that allows the user to choose a ruleset from a list of available rulesets
-  final int initialRulesetIndex;
+  /// - [rulesets]: A list of tuples containing the ruleset and its description
-
+  /// - [initialRulesetIndex]: The index of the initially selected ruleset
   const ChooseRulesetView({
     super.key,
     required this.rulesets,
     required this.initialRulesetIndex,
   });
 
+  /// A list of tuples containing the ruleset and its description
+  final List<(Ruleset, String)> rulesets;
+
+  /// The index of the initially selected ruleset
+  final int initialRulesetIndex;
+
   @override
   State<ChooseRulesetView> createState() => _ChooseRulesetViewState();
 }

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

@@ -1,8 +1,9 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
@@ -18,9 +19,13 @@ import 'package:game_tracker/presentation/widgets/tiles/choose_tile.dart';
 import 'package:provider/provider.dart';
 
 class CreateMatchView extends StatefulWidget {
-  final VoidCallback? onWinnerChanged;
+  /// 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;
+
   @override
   State<CreateMatchView> createState() => _CreateMatchViewState();
 }
@@ -119,140 +124,152 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
-      backgroundColor: CustomTheme.backgroundColor,
+      child: Scaffold(
-      appBar: AppBar(title: Text(loc.create_new_match)),
+        backgroundColor: CustomTheme.backgroundColor,
-      body: SafeArea(
+        appBar: AppBar(title: Text(loc.create_new_match)),
-        child: Column(
+        body: SafeArea(
-          mainAxisAlignment: MainAxisAlignment.start,
+          child: Column(
-          children: [
+            mainAxisAlignment: MainAxisAlignment.start,
-            Container(
+            children: [
-              margin: CustomTheme.tileMargin,
+              Container(
-              child: TextInputField(
+                margin: CustomTheme.tileMargin,
-                controller: _matchNameController,
+                child: TextInputField(
-                hintText: hintText ?? '',
+                  controller: _matchNameController,
+                  hintText: hintText ?? '',
+                ),
               ),
-            ),
+              ChooseTile(
-            ChooseTile(
+                title: loc.game,
-              title: loc.game,
+                trailingText: selectedGameIndex == -1
-              trailingText: selectedGameIndex == -1
+                    ? loc.none
-                  ? loc.none
+                    : games[selectedGameIndex].$1,
-                  : games[selectedGameIndex].$1,
+                onPressed: () async {
-              onPressed: () async {
+                  selectedGameIndex = await Navigator.of(context).push(
-                selectedGameIndex = await Navigator.of(context).push(
+                    adaptivePageRoute(
-                  MaterialPageRoute(
+                      builder: (context) => ChooseGameView(
-                    builder: (context) => ChooseGameView(
+                        games: games,
-                      games: games,
+                        initialGameIndex: selectedGameIndex,
-                      initialGameIndex: selectedGameIndex,
+                      ),
                     ),
-                  ),
+                  );
-                );
-                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
-                  ? loc.none_group
-                  : selectedGroup!.name,
-              onPressed: () async {
-                selectedGroup = await Navigator.of(context).push(
-                  MaterialPageRoute(
-                    builder: (context) => ChooseGroupView(
-                      groups: groupsList,
-                      initialGroupId: selectedGroupId,
-                    ),
-                  ),
-                );
-                selectedGroupId = selectedGroup?.id ?? '';
-                if (selectedGroup != null) {
-                  filteredPlayerList = playerList
-                      .where(
-                        (p) => !selectedGroup!.members.any((m) => m.id == p.id),
-                      )
-                      .toList();
-                } else {
-                  filteredPlayerList = List.from(playerList);
-                }
-                setState(() {});
-              },
-            ),
-            Expanded(
-              child: PlayerSelection(
-                key: ValueKey(selectedGroup?.id ?? 'no_group'),
-                initialSelectedPlayers: selectedPlayers ?? [],
-                availablePlayers: filteredPlayerList,
-                onChanged: (value) {
                   setState(() {
-                    selectedPlayers = value;
+                    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(
-            CustomWidthButton(
+                title: loc.ruleset,
-              text: loc.create_match,
+                trailingText: selectedRuleset == null
-              sizeRelativeToWidth: 0.95,
+                    ? loc.none
-              buttonType: ButtonType.primary,
+                    : translateRulesetToString(selectedRuleset!, context),
-              onPressed: _enableCreateGameButton()
+                onPressed: () async {
-                  ? () async {
+                  selectedRuleset = await Navigator.of(context).push(
-                      Match match = Match(
+                    adaptivePageRoute(
-                        name: _matchNameController.text.isEmpty
+                      builder: (context) => ChooseRulesetView(
-                            ? (hintText ?? '')
+                        rulesets: _rulesets,
-                            : _matchNameController.text.trim(),
+                        initialRulesetIndex: selectedRulesetIndex,
-                        createdAt: DateTime.now(),
+                      ),
-                        group: selectedGroup,
+                    ),
-                        players: selectedPlayers,
+                  );
-                      );
+                  if (!mounted) return;
-                      await db.matchDao.addMatch(match: match);
+                  selectedRulesetIndex = _rulesets.indexWhere(
-                      if (context.mounted) {
+                    (r) => r.$1 == selectedRuleset,
-                        Navigator.pushReplacement(
+                  );
-                          context,
+                  selectedGameIndex = -1;
-                          CupertinoPageRoute(
+                  setState(() {});
-                            fullscreenDialog: true,
+                },
-                            builder: (context) => MatchResultView(
+              ),
-                              match: match,
+              ChooseTile(
-                              onWinnerChanged: widget.onWinnerChanged,
+                title: loc.group,
-                            ),
+                trailingText: selectedGroup == null
-                          ),
+                    ? loc.none_group
+                    : selectedGroup!.name,
+                onPressed: () async {
+                  selectedGroup = await Navigator.of(context).push(
+                    adaptivePageRoute(
+                      builder: (context) => ChooseGroupView(
+                        groups: groupsList,
+                        initialGroupId: selectedGroupId,
+                      ),
+                    ),
+                  );
+                  selectedGroupId = selectedGroup?.id ?? '';
+                  if (selectedGroup != null) {
+                    filteredPlayerList = playerList
+                        .where(
+                          (p) =>
+                              !selectedGroup!.members.any((m) => m.id == p.id),
+                        )
+                        .toList();
+                  } else {
+                    filteredPlayerList = List.from(playerList);
+                  }
+                  setState(() {});
+                },
+              ),
+              Expanded(
+                child: PlayerSelection(
+                  key: ValueKey(selectedGroup?.id ?? 'no_group'),
+                  initialSelectedPlayers: selectedPlayers ?? [],
+                  availablePlayers: filteredPlayerList,
+                  onChanged: (value) {
+                    setState(() {
+                      selectedPlayers = value;
+                    });
+                  },
+                ),
+              ),
+              CustomWidthButton(
+                text: loc.create_match,
+                sizeRelativeToWidth: 0.95,
+                buttonType: ButtonType.primary,
+                onPressed: _enableCreateGameButton()
+                    ? () async {
+                        final selectedGame = games[selectedGameIndex];
+                        final game = Game(
+                          name: selectedGame.$1,
+                          description: selectedGame.$2.isEmpty ? null : selectedGame.$2,
+                          ruleset: selectedGame.$3.name,
                         );
+                        // Ensure the game exists in the database before creating the match
+                        await db.gameDao.addGame(game: game);
+                        Match match = Match(
+                          name: _matchNameController.text.isEmpty
+                              ? (hintText ?? '')
+                              : _matchNameController.text.trim(),
+                          createdAt: DateTime.now(),
+                          game: game,
+                          group: selectedGroup,
+                          players: selectedPlayers,
+                        );
+                        await db.matchDao.addMatch(match: match);
+                        if (context.mounted) {
+                          Navigator.pushReplacement(
+                            context,
+                            adaptivePageRoute(
+                              fullscreenDialog: true,
+                              builder: (context) => MatchResultView(
+                                match: match,
+                                onWinnerChanged: widget.onWinnerChanged,
+                              ),
+                            ),
+                          );
+                        }
                       }
-                    }
+                    : null,
-                  : null,
+              ),
-            ),
+            ],
-          ],
+          ),
         ),
       ),
     );
@@ -261,10 +278,12 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// Determines whether the "Create Match" button should be enabled.
   ///
   /// Returns `true` if:
+  /// - A game is selected AND
   /// - A ruleset is selected AND
   /// - Either a group is selected OR at least 2 players are selected
   bool _enableCreateGameButton() {
-    return (selectedGroup != null ||
+    return selectedGameIndex != -1 &&
+        (selectedGroup != null ||
             (selectedPlayers != null && selectedPlayers!.length > 1)) &&
         selectedRuleset != null;
   }

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

@@ -8,11 +8,17 @@ 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,7 +1,8 @@
 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';
@@ -12,12 +13,13 @@ 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/custom_width_button.dart';
+import 'package:game_tracker/presentation/widgets/buttons/main_menu_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
@@ -78,34 +80,40 @@ class _MatchViewState extends State<MatchView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return MatchTile(
+                  return Center(
-                    onTap: () async {
+                    child: Padding(
-                      Navigator.push(
+                      padding: const EdgeInsets.only(bottom: 12.0),
-                        context,
+                      child: MatchTile(
-                        CupertinoPageRoute(
+                        width: MediaQuery.sizeOf(context).width * 0.95,
-                          fullscreenDialog: true,
+                        onTap: () async {
-                          builder: (context) => MatchResultView(
+                          Navigator.push(
-                            match: matches[index],
+                            context,
-                            onWinnerChanged: loadGames,
+                            adaptivePageRoute(
-                          ),
+                              fullscreenDialog: true,
-                        ),
+                              builder: (context) => MatchResultView(
-                      );
+                                match: matches[index],
-                    },
+                                onWinnerChanged: loadGames,
-                    match: matches[index],
+                              ),
+                            ),
+                          );
+                        },
+                        match: matches[index],
+                      ),
+                    ),
                   );
                 },
               ),
             ),
           ),
           Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom,
+            bottom: MediaQuery.paddingOf(context).bottom + 20,
-            child: CustomWidthButton(
+            child: MainMenuButton(
-              text: loc.create_match,
+              text: 'Spiel erstellen',
-              sizeRelativeToWidth: 0.90,
+              icon: RpgAwesome.clovers_card,
               onPressed: () async {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),

lib/presentation/views/main_menu/settings_view.dart

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

@@ -0,0 +1,140 @@
+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: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: [
+                      Container(
+                        margin: const EdgeInsetsGeometry.only(right: 15),
+                        width: 60,
+                        height: 60,
+                        decoration: BoxDecoration(
+                          color: CustomTheme.primaryColor.withAlpha(40),
+                          borderRadius: BorderRadius.circular(10),
+                        ),
+                        child: Icon(
+                          Icons.description,
+                          color: CustomTheme.primaryColor,
+                          size: 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

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

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

lib/presentation/widgets/app_skeleton.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 
-/// 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 {
+  /// 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.
   const AppSkeleton({
     super.key,
     required this.child,

lib/presentation/widgets/buttons/animated_dialog_button.dart

@@ -0,0 +1,50 @@
+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';
 
-/// 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 {
+  /// 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.
   const CustomWidthButton({
     super.key,
     required this.text,

lib/presentation/widgets/buttons/main_menu_button.dart

@@ -0,0 +1,98 @@
+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';
 
-/// 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 {
+  /// 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.
   const QuickCreateButton({
     super.key,
     required this.text,

lib/presentation/widgets/custom_alert_dialog.dart

@@ -0,0 +1,39 @@
+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,12 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
 
-/// 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 {
+  /// 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.
   const NavbarItem({
     super.key,
     required this.index,
@@ -35,7 +36,45 @@ 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(
@@ -48,19 +87,29 @@ class _NavbarItemState extends State<NavbarItem> {
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Icon(
+              ScaleTransition(
-                widget.icon,
+                scale: widget.isSelected
-                color: widget.isSelected ? Colors.white : Colors.black,
+                    ? _scaleAnimation
+                    : const AlwaysStoppedAnimation(1.0),
+                child: Icon(
+                  widget.icon,
+                  color: widget.isSelected
+                      ? CustomTheme.navBarItemSelectedColor
+                      : CustomTheme.navBarItemUnselectedColor,
+                  size: 32,
+                ),
               ),
               const SizedBox(height: 4),
               Text(
                 widget.label,
                 style: TextStyle(
-                  color: widget.isSelected ? Colors.white : Colors.black,
+                  color: widget.isSelected
-                  fontSize: 12,
+                      ? CustomTheme.navBarItemSelectedColor
+                      : CustomTheme.navBarItemUnselectedColor,
+                  fontSize: widget.isSelected ? 12 : 11,
                   fontWeight: widget.isSelected
                       ? FontWeight.bold
-                      : FontWeight.normal,
+                      : FontWeight.w500,
                 ),
               ),
             ],
@@ -69,4 +118,10 @@ 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';
 
-/// 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, all
-///   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 changes,
-///   providing the updated list of selected players.
 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,
+  ///   all 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
+  ///   changes, providing the updated list of selected players.
   const PlayerSelection({
     super.key,
     this.availablePlayers,
@@ -181,6 +181,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                   icon: Icons.info,
                   title: loc.info,
                   message: _getInfoText(context),
+                  fullscreen: false,
                 ),
                 child: ListView.builder(
                   itemCount: suggestedPlayers.length,
@@ -294,6 +295,7 @@ 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,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// 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.
-/// - [trailingButtonShown]: Whether to show the trailing button.
-/// - [trailingButtonicon]: The icon for the trailing button.
-/// - [trailingButtonEnabled]: Whether the trailing button is in enabled state.
-/// - [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 {
+  /// 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.
+  /// - [trailingButtonShown]: Whether to show the trailing button.
+  /// - [trailingButtonicon]: The icon for the trailing button.
+  /// - [trailingButtonEnabled]: Whether the trailing button is in enabled state.
+  /// - [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.
   const CustomSearchBar({
     super.key,
     required this.controller,

lib/presentation/widgets/text_input/text_input_field.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// A custom text input field widget that encapsulates a [TextField] with specific styling.
-/// - [controller]: The controller for the text input field.
-/// - [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
 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]: The callback invoked when the text in the field changes.
+  /// - [hintText]: The hint text displayed in the text input field when it is empty
   const TextInputField({
     super.key,
     required this.controller,

lib/presentation/widgets/tiles/choose_tile.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// 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 {
+  /// 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.
   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';
 
-/// 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 {
+  /// 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.
   const CustomRadioListTile({
     super.key,
     required this.text,

lib/presentation/widgets/tiles/group_tile.dart

@@ -3,10 +3,10 @@ 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';
 
-/// 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.
 class GroupTile extends StatelessWidget {
+  /// 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.
   const GroupTile({super.key, required this.group, this.isHighlighted = false});
 
   /// The group data to be displayed.

lib/presentation/widgets/tiles/info_tile.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// 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.
-/// - [content]: The content widget displayed below the title.
-/// - [padding]: Optional padding for the tile content.
-/// - [height]: Optional height for the tile.
-/// - [width]: Optional width for the tile.
 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.
+  /// - [content]: The content widget displayed below the title.
+  /// - [padding]: Optional padding for the tile content.
+  /// - [height]: Optional height for the tile.
+  /// - [width]: Optional width for the tile.
   const InfoTile({
     super.key,
     required this.title,

lib/presentation/widgets/tiles/license_tile.dart

@@ -0,0 +1,109 @@
+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';
+
+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: [
+            Container(
+              width: 50,
+              height: 50,
+              decoration: BoxDecoration(
+                color: CustomTheme.primaryColor.withAlpha(40),
+                borderRadius: BorderRadius.circular(10),
+              ),
+              child: Icon(
+                Icons.description,
+                color: CustomTheme.primaryColor,
+                size: 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

@@ -1,95 +0,0 @@
-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,12 +6,20 @@ 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';
 
-/// 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.
 class MatchTile extends StatefulWidget {
-  const MatchTile({super.key, required this.match, required this.onTap});
+  /// 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.
+  /// - [compact]: Whether to display the tile in a compact mode
+  const MatchTile({
+    super.key,
+    required this.match,
+    required this.onTap,
+    this.width,
+    this.compact = false,
+  });
 
   /// The match data to be displayed.
   final Match match;
@@ -19,6 +27,12 @@ class MatchTile extends StatefulWidget {
   /// The callback invoked when the tile is tapped.
   final VoidCallback onTap;
 
+  /// Optional width for the tile.
+  final double? width;
+
+  /// Whether to display the tile in a compact mode
+  final bool compact;
+
   @override
   State<MatchTile> createState() => _MatchTileState();
 }
@@ -41,13 +55,10 @@ class _MatchTileState extends State<MatchTile> {
     return GestureDetector(
       onTap: widget.onTap,
       child: Container(
-        margin: CustomTheme.tileMargin,
+        margin: EdgeInsets.zero,
+        width: widget.width,
         padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
+        decoration: CustomTheme.standardBoxDecoration,
-          color: CustomTheme.boxColor,
-          border: Border.all(color: CustomTheme.boxBorder),
-          borderRadius: BorderRadius.circular(12),
-        ),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -80,7 +91,22 @@ class _MatchTileState extends State<MatchTile> {
                   const SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      group.name,
+                      '${group.name}${widget.match.players != null ? ' + ${widget.match.players?.length}' : ''}',
+                      style: const TextStyle(fontSize: 14, color: Colors.grey),
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 12),
+            ] else if (widget.compact) ...[
+              Row(
+                children: [
+                  const Icon(Icons.person, size: 16, color: Colors.grey),
+                  const SizedBox(width: 6),
+                  Expanded(
+                    child: Text(
+                      '${widget.match.players!.length} ${loc.players}',
                       style: const TextStyle(fontSize: 14, color: Colors.grey),
                       overflow: TextOverflow.ellipsis,
                     ),
@@ -127,9 +153,46 @@ class _MatchTileState extends State<MatchTile> {
                 ),
               ),
               const SizedBox(height: 12),
+            ] else ...[
+              Container(
+                padding: const EdgeInsets.symmetric(
+                  vertical: 8,
+                  horizontal: 12,
+                ),
+                decoration: BoxDecoration(
+                  color: Colors.amber.withValues(alpha: 0.1),
+                  borderRadius: BorderRadius.circular(8),
+                  border: Border.all(
+                    color: Colors.amber.withValues(alpha: 0.3),
+                    width: 1,
+                  ),
+                ),
+                child: Row(
+                  children: [
+                    const Icon(
+                      Icons.watch_later,
+                      size: 20,
+                      color: Colors.amber,
+                    ),
+                    const SizedBox(width: 8),
+                    Expanded(
+                      child: Text(
+                        loc.match_in_progress,
+                        style: const TextStyle(
+                          fontSize: 14,
+                          fontWeight: FontWeight.w600,
+                          color: CustomTheme.textColor,
+                        ),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const SizedBox(height: 12),
             ],
 
-            if (_allPlayers.isNotEmpty) ...[
+            if (_allPlayers.isNotEmpty && widget.compact == false) ...[
               Text(
                 loc.players,
                 style: const TextStyle(

lib/presentation/widgets/tiles/quick_info_tile.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// 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.
-/// - [value]: The numeric value displayed below the title.
-/// - [height]: Optional height for the tile.
-/// - [width]: Optional width for the tile.
-/// - [padding]: Optional padding for the tile content.
 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.
+  /// - [value]: The numeric value displayed below the title.
+  /// - [height]: Optional height for the tile.
+  /// - [width]: Optional width for the tile.
+  /// - [padding]: Optional padding for the tile content.
   const QuickInfoTile({
     super.key,
     required this.title,

lib/presentation/widgets/tiles/settings_list_tile.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// 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 {
+  /// 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.
   const SettingsListTile({
     super.key,
     required this.icon,
@@ -38,7 +38,7 @@ class SettingsListTile extends StatelessWidget {
             onTap: onPressed ?? () {},
             child: Container(
               margin: EdgeInsets.zero,
-              padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 14),
+              padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
               decoration: CustomTheme.standardBoxDecoration,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -47,12 +47,17 @@ class SettingsListTile extends StatelessWidget {
                     mainAxisSize: MainAxisSize.min,
                     children: [
                       Container(
-                        padding: const EdgeInsets.all(8),
+                        width: 44,
+                        height: 44,
                         decoration: BoxDecoration(
-                          color: CustomTheme.primaryColor,
+                          color: CustomTheme.primaryColor.withAlpha(40),
-                          shape: BoxShape.circle,
+                          borderRadius: BorderRadius.circular(10),
+                        ),
+                        child: Icon(
+                          icon,
+                          size: 28,
+                          color: CustomTheme.primaryColor.withGreen(40),
                         ),
-                        child: Icon(icon, size: 24),
                       ),
                       const SizedBox(width: 16),
                       Text(title, style: const TextStyle(fontSize: 18)),

lib/presentation/widgets/tiles/statistics_tile.dart

@@ -4,14 +4,14 @@ import 'package:flutter/material.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart';
 
-/// 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.
-/// - [width]: The width of the tile.
-/// - [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 {
+  /// 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.
+  /// - [width]: The width of the tile.
+  /// - [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.
   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';
 
-/// 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 {
+  /// 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.
   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';
 
-/// 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 {
+  /// 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.
   const TextIconTile({
     super.key,
     required this.text,

lib/presentation/widgets/tiles/title_description_list_tile.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// 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.
-/// - [onPressed]: The callback invoked when the tile is tapped.
-/// - [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 {
+  /// 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.
+  /// - [onPressed]: The callback invoked when the tile is tapped.
+  /// - [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.
   const TitleDescriptionListTile({
     super.key,
     required this.title,

lib/presentation/widgets/top_centered_message.dart

@@ -1,15 +1,16 @@
 import 'package:flutter/material.dart';
 
-/// 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 {
+  /// 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.
   const TopCenteredMessage({
     super.key,
     required this.icon,
     required this.title,
     required this.message,
+    this.fullscreen = true,
   });
 
   /// The icon to display above the title.
@@ -21,13 +22,18 @@ 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: const EdgeInsets.only(top: 100),
+      padding: fullscreen ? const EdgeInsets.only(top: 100) : null,
       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),

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.1+21
+version: 0.0.7+212
 
 environment:
   sdk: ^3.8.1
@@ -9,31 +9,32 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  material_symbols_icons: ^4.2815.1
+  flutter_localizations:
-
+    sdk: flutter
-  # The following adds the Cupertino Icons font to your application.
+  clock: ^1.1.2
-  # Use with the CupertinoIcons class for iOS style icons.
+  cupertino_icons: ^1.0.6
-  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
-  flutter_lints: ^5.0.0
-  drift_dev: ^2.27.0
   build_runner: ^2.5.4
+  dart_pubspec_licenses: ^3.0.14
+  drift_dev: ^2.27.0
+  flutter_lints: ^5.0.0
 
 flutter:
   uses-material-design: true

test/db_tests/group_match_test.dart

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