Merge dev & implement db

2026-03-07 23:33:25 +01:00
47 changed files with 971 additions and 32895 deletions
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,9 +1,5 @@
 include: package:flutter_lints/flutter.yaml

-analyzer:
-  exclude:
-    - lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
-
 linter:
  rules:
    avoid_print: false
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -20,5 +20,7 @@
  <string>????</string>
  <key>CFBundleVersion</key>
  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>13.0</string>
 </dict>
 </plist>
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -2,15 +2,12 @@ import Flutter
 import UIKit

@main
-@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
+@objc class AppDelegate: FlutterAppDelegate {
  override func application(
    _ application: UIApplication,
    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
  ) -> Bool {
+    GeneratedPluginRegistrant.register(with: self)
    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
  }
-
-  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
-    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
-  }
 }
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -31,27 +31,6 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneClassName</key>
-					<string>UIWindowScene</string>
-					<key>UISceneConfigurationName</key>
-					<string>flutter</string>
-					<key>UISceneDelegateClassName</key>
-					<string>FlutterSceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
--- a/lib/core/common.dart
+++ b/lib/core/common.dart
@@ -1,90 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:tallee/core/enums.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-
-/// Translates a [Ruleset] enum value to its corresponding localized string.
-String translateRulesetToString(Ruleset ruleset, BuildContext context) {
-  final loc = AppLocalizations.of(context);
-  switch (ruleset) {
-    case Ruleset.highestScore:
-      return loc.highest_score;
-    case Ruleset.lowestScore:
-      return loc.lowest_score;
-    case Ruleset.singleWinner:
-      return loc.single_winner;
-    case Ruleset.singleLoser:
-      return loc.single_loser;
-    case Ruleset.multipleWinners:
-      return loc.multiple_winners;
-  }
-}
-
-/// Translates a [GameColor] enum value to its corresponding localized string.
-String translateGameColorToString(GameColor color, BuildContext context) {
-  final loc = AppLocalizations.of(context);
-  switch (color) {
-    case GameColor.red:
-      return loc.color_red;
-    case GameColor.blue:
-      return loc.color_blue;
-    case GameColor.green:
-      return loc.color_green;
-    case GameColor.yellow:
-      return loc.color_yellow;
-    case GameColor.purple:
-      return loc.color_purple;
-    case GameColor.orange:
-      return loc.color_orange;
-    case GameColor.pink:
-      return loc.color_pink;
-    case GameColor.teal:
-      return loc.color_teal;
-  }
-}
-
-/// Returns the [Color] object corresponding to a [GameColor] enum value.
-Color getColorFromGameColor(GameColor color) {
-  switch (color) {
-    case GameColor.red:
-      return Colors.red;
-    case GameColor.blue:
-      return Colors.blue;
-    case GameColor.green:
-      return Colors.green;
-    case GameColor.yellow:
-      return Colors.yellow;
-    case GameColor.purple:
-      return Colors.purple;
-    case GameColor.orange:
-      return Colors.orange;
-    case GameColor.pink:
-      return Colors.pink;
-    case GameColor.teal:
-      return Colors.teal;
-  }
-}
-
-/// Counts how many players in the match are not part of the group
-/// Returns the count as a string, or an empty string if there is no group
-String getExtraPlayerCount(Match match) {
-  int count = 0;
-
-  if (match.group == null) {
-    return '';
-  }
-
-  final groupMembers = match.group!.members;
-  final players = match.players;
-
-  for (var player in players) {
-    if (!groupMembers.any((member) => member.id == player.id)) {
-      count++;
-    }
-  }
-
-  if (count == 0) {
-    return '';
-  }
-  return ' + ${count.toString()}';
-}
--- a/lib/core/constants.dart
+++ b/lib/core/constants.dart
@@ -19,7 +19,4 @@ class Constants {

  /// Maximum length for team names
  static const int MAX_TEAM_NAME_LENGTH = 32;
-
-  /// Maximum length for game descriptions
-  static const int MAX_GAME_DESCRIPTION_LENGTH = 256;
 }
--- a/lib/core/custom_theme.dart
+++ b/lib/core/custom_theme.dart
@@ -27,9 +27,6 @@ class CustomTheme {
  /// Text color used throughout the app
  static const Color textColor = Color(0xFFFFFFFF);

-  /// Text color used throughout the app
-  static const Color hintColor = Color(0xFF888888);
-
  /// Background color for the navigation bar
  static const Color navBarBackgroundColor = Color(0xFF131313);

@@ -68,7 +65,7 @@ class CustomTheme {
    boxShadow: [BoxShadow(color: primaryColor.withAlpha(120), blurRadius: 12)],
  );

-  // ==================== Component Themes ====================
+  // ==================== App Bar Theme ====================
  static const AppBarTheme appBarTheme = AppBarTheme(
    backgroundColor: backgroundColor,
    foregroundColor: textColor,
@@ -83,23 +80,4 @@ class CustomTheme {
    ),
    iconTheme: IconThemeData(color: textColor),
  );
-
-  static const SearchBarThemeData searchBarTheme = SearchBarThemeData(
-    textStyle: WidgetStatePropertyAll(TextStyle(color: CustomTheme.textColor)),
-    hintStyle: WidgetStatePropertyAll(TextStyle(color: CustomTheme.hintColor)),
-  );
-
-  static final RadioThemeData radioTheme = RadioThemeData(
-    fillColor: WidgetStateProperty.resolveWith<Color>((states) {
-      if (states.contains(WidgetState.selected)) {
-        return CustomTheme.primaryColor;
-      }
-      return CustomTheme.textColor;
-    }),
-  );
-
-  static const InputDecorationTheme inputDecorationTheme = InputDecorationTheme(
-    labelStyle: TextStyle(color: CustomTheme.textColor),
-    hintStyle: TextStyle(color: CustomTheme.hintColor),
-  );
 }
--- a/lib/core/enums.dart
+++ b/lib/core/enums.dart
@@ -1,3 +1,6 @@
+import 'package:flutter/material.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+
 /// Button types used for styling the [CustomWidthButton]
 /// - [ButtonType.primary]: Primary button style.
 /// - [ButtonType.secondary]: Secondary button style.
@@ -32,13 +35,7 @@ enum ExportResult { success, canceled, unknownException }
 /// - [Ruleset.singleWinner]: The match is won by a single player.
 /// - [Ruleset.singleLoser]: The match has a single loser.
 /// - [Ruleset.multipleWinners]: Multiple players can be winners.
-enum Ruleset {
-  highestScore,
-  lowestScore,
-  singleWinner,
-  singleLoser,
-  multipleWinners,
-}
+enum Ruleset { highestScore, lowestScore, singleWinner, singleLoser, multipleWinners }

 /// Different colors available for games
 /// - [GameColor.red]: Red color
@@ -50,3 +47,20 @@ enum Ruleset {
 /// - [GameColor.pink]: Pink color
 /// - [GameColor.teal]: Teal color
 enum GameColor { red, blue, green, yellow, purple, orange, pink, teal }
+
+/// Translates a [Ruleset] enum value to its corresponding localized string.
+String translateRulesetToString(Ruleset ruleset, BuildContext context) {
+  final loc = AppLocalizations.of(context);
+  switch (ruleset) {
+    case Ruleset.highestScore:
+      return loc.highest_score;
+    case Ruleset.lowestScore:
+      return loc.lowest_score;
+    case Ruleset.singleWinner:
+      return loc.single_winner;
+    case Ruleset.singleLoser:
+      return loc.single_loser;
+    case Ruleset.multipleWinners:
+      return loc.multiple_winners;
+  }
+}
--- a/lib/data/dao/group_dao.dart
+++ b/lib/data/dao/group_dao.dart
@@ -205,8 +205,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
    return rowsAffected > 0;
  }

-
-
  /// Retrieves the number of groups in the database.
  Future<int> getGroupCount() async {
    final count =
@@ -235,10 +233,13 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
  /// Replaces all players in a group with the provided list of players.
  /// Removes all existing players from the group and adds the new players.
  /// Also adds any new players to the player table if they don't exist.
-  Future<void> replaceGroupPlayers({
+  /// Returns `true` if the group exists and players were replaced, `false` otherwise.
+  Future<bool> replaceGroupPlayers({
    required String groupId,
    required List<Player> newPlayers,
  }) async {
+    if (!await groupExists(groupId: groupId)) return false;
+
    await db.transaction(() async {
      // Remove all existing players from the group
      final deleteQuery = delete(db.playerGroupTable)
@@ -270,5 +271,6 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
        ),
      );
    });
+    return true;
  }
 }
--- a/lib/data/dao/match_dao.dart
+++ b/lib/data/dao/match_dao.dart
@@ -27,9 +27,9 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
        if (row.groupId != null) {
          group = await db.groupDao.getGroupById(groupId: row.groupId!);
        }
-        final players =
-            await db.playerMatchDao.getPlayersOfMatch(matchId: row.id) ?? [];
-        final winner = await getWinner(matchId: row.id);
+        final players = await db.playerMatchDao.getPlayersOfMatch(
+          matchId: row.id,
+        ) ?? [];
        return Match(
          id: row.id,
          name: row.name ?? '',
@@ -39,7 +39,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
          notes: row.notes ?? '',
          createdAt: row.createdAt,
          endedAt: row.endedAt,
-          winner: winner,
        );
      }),
    );
@@ -57,10 +56,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
      group = await db.groupDao.getGroupById(groupId: result.groupId!);
    }

-    final players =
-        await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
-
-    final winner = await getWinner(matchId: matchId);
+    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];

    return Match(
      id: result.id,
@@ -71,7 +67,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
      notes: result.notes ?? '',
      createdAt: result.createdAt,
      endedAt: result.endedAt,
-      winner: winner,
    );
  }

@@ -99,10 +94,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
          playerId: p.id,
        );
      }
-
-      if (match.winner != null) {
-        await setWinner(matchId: match.id, winnerId: match.winner!.id);
-      }
    });
  }

@@ -121,20 +112,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {

      if (uniqueGames.isNotEmpty) {
        await db.batch(
-          (b) => b.insertAll(
+              (b) => b.insertAll(
            db.gameTable,
            uniqueGames.values
                .map(
                  (game) => GameTableCompanion.insert(
-                    id: game.id,
-                    name: game.name,
-                    ruleset: game.ruleset.name,
-                    description: game.description,
-                    color: game.color.name,
-                    icon: game.icon,
-                    createdAt: game.createdAt,
-                  ),
-                )
+                id: game.id,
+                name: game.name,
+                ruleset: game.ruleset.name,
+                description: game.description,
+                color: game.color.name,
+                icon: game.icon,
+                createdAt: game.createdAt,
+              ),
+            )
                .toList(),
            mode: InsertMode.insertOrIgnore,
          ),
@@ -143,18 +134,18 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {

      // Add all groups of the matches in batch
      await db.batch(
-        (b) => b.insertAll(
+            (b) => b.insertAll(
          db.groupTable,
          matches
              .where((match) => match.group != null)
              .map(
                (match) => GroupTableCompanion.insert(
-                  id: match.group!.id,
-                  name: match.group!.name,
-                  description: match.group!.description,
-                  createdAt: match.group!.createdAt,
-                ),
-              )
+              id: match.group!.id,
+              name: match.group!.name,
+              description: match.group!.description,
+              createdAt: match.group!.createdAt,
+            ),
+          )
              .toList(),
          mode: InsertMode.insertOrIgnore,
        ),
@@ -162,20 +153,20 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {

      // Add all matches in batch
      await db.batch(
-        (b) => b.insertAll(
+            (b) => b.insertAll(
          matchTable,
          matches
              .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,
-                  endedAt: Value(match.endedAt),
-                ),
-              )
+              id: match.id,
+              gameId: match.game.id,
+              groupId: Value(match.group?.id),
+              name: Value(match.name),
+              notes: Value(match.notes),
+              createdAt: match.createdAt,
+              endedAt: Value(match.endedAt),
+            ),
+          )
              .toList(),
          mode: InsertMode.insertOrReplace,
        ),
@@ -197,17 +188,17 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {

      if (uniquePlayers.isNotEmpty) {
        await db.batch(
-          (b) => b.insertAll(
+              (b) => b.insertAll(
            db.playerTable,
            uniquePlayers.values
                .map(
                  (p) => PlayerTableCompanion.insert(
-                    id: p.id,
-                    name: p.name,
-                    description: p.description,
-                    createdAt: p.createdAt,
-                  ),
-                )
+                id: p.id,
+                name: p.name,
+                description: p.description,
+                createdAt: p.createdAt,
+              ),
+            )
                .toList(),
            mode: InsertMode.insertOrIgnore,
          ),
@@ -262,9 +253,9 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
  /// Retrieves the number of matches in the database.
  Future<int> getMatchCount() async {
    final count =
-        await (selectOnly(matchTable)..addColumns([matchTable.id.count()]))
-            .map((row) => row.read(matchTable.id.count()))
-            .getSingle();
+    await (selectOnly(matchTable)..addColumns([matchTable.id.count()]))
+        .map((row) => row.read(matchTable.id.count()))
+        .getSingle();
    return count ?? 0;
  }

@@ -324,16 +315,15 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
  }

  /// Updates the group of the match with the given [matchId].
-  /// Replaces the existing group association with the new group specified by [newGroupId].
  /// 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? newGroupId,
+    required String? groupId,
  }) async {
    final query = update(matchTable)..where((g) => g.id.equals(matchId));
    final rowsAffected = await query.write(
-      MatchTableCompanion(groupId: Value(newGroupId)),
+      MatchTableCompanion(groupId: Value(groupId)),
    );
    return rowsAffected > 0;
  }
@@ -389,12 +379,10 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {

      // Add the new players to the match
      await Future.wait(
-        newPlayers.map(
-          (player) => db.playerMatchDao.addPlayerToMatch(
-            matchId: matchId,
-            playerId: player.id,
-          ),
-        ),
+        newPlayers.map((player) => db.playerMatchDao.addPlayerToMatch(
+          matchId: matchId,
+          playerId: player.id,
+        )),
      );
    });
  }
@@ -406,8 +394,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
  /// Checks if a match has a winner.
  /// Returns true if any player in the match has their score set to 1.
  Future<bool> hasWinner({required String matchId}) async {
-    final players =
-        await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
+    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];

    for (final player in players) {
      final score = await db.playerMatchDao.getPlayerScore(
@@ -424,8 +411,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
  /// Gets the winner of a match.
  /// Returns the player with score 1, or null if no winner is set.
  Future<Player?> getWinner({required String matchId}) async {
-    final players =
-        await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
+    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];

    for (final player in players) {
      final score = await db.playerMatchDao.getPlayerScore(
@@ -447,8 +433,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
    required String winnerId,
  }) async {
    await db.transaction(() async {
-      final players =
-          await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
+      final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];

      // Set all players' scores to 0
      for (final player in players) {
@@ -485,4 +470,4 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
    );
    return success;
  }
-}
+}
--- a/lib/data/dto/game.dart
+++ b/lib/data/dto/game.dart
@@ -1,6 +1,6 @@
 import 'package:clock/clock.dart';
-import 'package:tallee/core/enums.dart';
 import 'package:uuid/uuid.dart';
+import 'package:tallee/core/enums.dart';

 class Game {
  final String id;
@@ -18,11 +18,10 @@ class Game {
    required this.ruleset,
    String? description,
    required this.color,
-    String? icon,
+    required this.icon,
  }) : id = id ?? const Uuid().v4(),
       createdAt = createdAt ?? clock.now(),
-       description = description ?? '',
-       icon = icon ?? '';
+       description = description ?? '';

  @override
  String toString() {
@@ -50,3 +49,4 @@ class Game {
    'icon': icon,
  };
 }
+
--- a/lib/data/dto/match.dart
+++ b/lib/data/dto/match.dart
@@ -27,8 +27,8 @@ class Match {
    String? notes,
    this.winner,
  }) : id = id ?? const Uuid().v4(),
-       createdAt = createdAt ?? clock.now(),
-       notes = notes ?? '';
+        createdAt = createdAt ?? clock.now(),
+        notes = notes ?? '';

  @override
  String toString() {
@@ -38,21 +38,14 @@ class Match {
  /// Creates a Match instance from a JSON object (ID references format).
  /// Related objects are reconstructed from IDs by the DataTransferService.
  Match.fromJson(Map<String, dynamic> json)
-    : id = json['id'],
-      createdAt = DateTime.parse(json['createdAt']),
-      endedAt = json['endedAt'] != null
-          ? DateTime.parse(json['endedAt'])
-          : null,
-      name = json['name'],
-      game = Game(
-        name: '',
-        ruleset: Ruleset.singleWinner,
-        description: '',
-        color: GameColor.blue,
-      ), // Populated during import via DataTransferService
-      group = null, // Populated during import via DataTransferService
-      players = [], // Populated during import via DataTransferService
-      notes = json['notes'] ?? '';
+      : id = json['id'],
+        createdAt = DateTime.parse(json['createdAt']),
+        endedAt = json['endedAt'] != null ? DateTime.parse(json['endedAt']) : null,
+        name = json['name'],
+        game = Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''), // Populated during import via DataTransferService
+        group = null, // Populated during import via DataTransferService
+        players = [], // Populated during import via DataTransferService
+        notes = json['notes'] ?? '';

  /// Converts the Match instance to a JSON object using normalized format (ID references only).
  Map<String, dynamic> toJson() => {
--- a/lib/l10n/arb/app_de.arb
+++ b/lib/l10n/arb/app_de.arb
@@ -9,9 +9,7 @@
  "choose_game": "Spielvorlage wählen",
  "choose_group": "Gruppe wählen",
  "choose_ruleset": "Regelwerk wählen",
-  "choose_color": "Farbe wählen",
  "could_not_add_player": "Spieler:in {playerName} konnte nicht hinzugefügt werden",
-  "create_game": "Spielvorlage erstellen",
  "create_group": "Gruppe erstellen",
  "create_match": "Spiel erstellen",
  "create_new_group": "Neue Gruppe erstellen",
@@ -25,16 +23,10 @@
  "delete": "Löschen",
  "delete_all_data": "Alle Daten löschen",
  "delete_group": "Diese Gruppe löschen",
-  "delete_match": "Spiel löschen",
-  "delete_game": "Spielvorlage löschen",
-  "delete_group": "Gruppe löschen",
-  "description": "Beschreibung",
-  "edit_game": "Spielvorlage bearbeiten",
  "edit_group": "Gruppe bearbeiten",
-  "edit_match": "Gruppe bearbeiten",
-  "enter_results": "Ergebnisse eintragen",
+  "delete_group": "Gruppe löschen",
+  "edit_group": "Gruppe bearbeiten",
  "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
-  "error_deleting_game": "Fehler beim Löschen der Spielvorlage, bitte erneut versuchen",
  "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",
  "error_editing_group": "Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen",
  "error_reading_file": "Fehler beim Lesen der Datei",
@@ -58,7 +50,6 @@
  "licenses": "Lizenzen",
  "match_in_progress": "Spiel läuft...",
  "match_name": "Spieltitel",
-  "match_profile": "Spielprofil",
  "matches": "Spiele",
  "members": "Mitglieder",
  "most_points": "Höchste Punkte",
@@ -71,7 +62,6 @@
  "no_players_found_with_that_name": "Keine Spieler:in mit diesem Namen gefunden",
  "no_players_selected": "Keine Spieler:innen ausgewählt",
  "no_recent_matches_available": "Keine letzten Spiele verfügbar",
-  "no_results_entered_yet": "Noch keine Ergebnisse eingetragen",
  "no_second_match_available": "Kein zweites Spiel verfügbar",
  "no_statistics_available": "Keine Statistiken verfügbar",
  "none": "Kein",
@@ -84,14 +74,11 @@
  "privacy_policy": "Datenschutzerklärung",
  "quick_create": "Schnellzugriff",
  "recent_matches": "Letzte Spiele",
-  "result": "Ergebnis",
-  "results": "Ergebnisse",
  "ruleset": "Regelwerk",
  "ruleset_least_points": "Umgekehrte Wertung: Der/die Spieler:in mit den wenigsten Punkten gewinnt.",
  "ruleset_most_points": "Traditionelles Regelwerk: Der/die Spieler:in mit den meisten Punkten gewinnt.",
  "ruleset_single_loser": "Genau ein:e Verlierer:in wird bestimmt; der letzte Platz erhält die Strafe oder Konsequenz.",
  "ruleset_single_winner": "Genau ein:e Gewinner:in wird gewählt; Unentschieden werden durch einen vordefinierten Tie-Breaker aufgelöst.",
-  "save_changes": "Änderungen speichern",
  "search_for_groups": "Nach Gruppen suchen",
  "search_for_players": "Nach Spieler:innen suchen",
  "select_winner": "Gewinner:in wählen:",
@@ -113,14 +100,5 @@
  "winner": "Gewinner:in",
  "winrate": "Siegquote",
  "wins": "Siege",
-  "yesterday_at": "Gestern um",
-  "color_red": "Rot",
-  "color_blue": "Blau",
-  "color_green": "Grün",
-  "color_yellow": "Gelb",
-  "color_purple": "Lila",
-  "color_orange": "Orange",
-  "color_pink": "Rosa",
-  "color_teal": "Türkis",
-  "color": "Farbe"
+  "yesterday_at": "Gestern um"
 }
--- a/lib/l10n/arb/app_en.arb
+++ b/lib/l10n/arb/app_en.arb
@@ -27,15 +27,9 @@
  "@choose_ruleset": {
    "description": "Label for choosing a ruleset"
  },
-  "@choose_color": {
-    "description": "Label for choosing a color"
-  },
  "@could_not_add_player": {
    "description": "Error message when adding a player fails"
  },
-  "@create_game": {
-    "description": "Button text to create a game"
-  },
  "@create_group": {
    "description": "Button text to create a group"
  },
@@ -77,36 +71,15 @@
  "@delete_all_data": {
    "description": "Confirmation dialog for deleting all data"
  },
-  "@delete_game": {
-    "description": "Button text to delete a game"
-  },
  "@delete_group": {
    "description": "Confirmation dialog for deleting a group"
  },
-  "@delete_match": {
-    "description": "Button text to delete a match"
-  },
-  "description": {
-    "description": "Description label"
-  },
-  "edit_game": {
-    "description": "Button text to edit a game"
-   },
  "@edit_group": {
      "description": "Button & Appbar label for editing a group"
  },
-  "@edit_match": {
-      "description": "Button & Appbar label for editing a match"
-  },
-  "@enter_results": {
-    "description": "Button text to enter match results"
-  },
  "@error_creating_group": {
    "description": "Error message when group creation fails"
  },
-  "@error_deleting_game": {
-    "description": "Error message when game deletion fails"
-  },
  "@error_deleting_group": {
      "description": "Error message when group deletion fails"
  },
@@ -176,9 +149,6 @@
  "@match_name": {
    "description": "Placeholder for match name input"
  },
-  "@match_profile": {
-    "description": "Title for match profile view"
-  },
  "@matches": {
    "description": "Label for matches"
  },
@@ -215,9 +185,6 @@
  "@no_recent_matches_available": {
    "description": "Message when no recent matches exist"
  },
-  "@no_results_entered_yet": {
-    "description": "Message when no results have been entered yet"
-  },
  "@no_second_match_available": {
    "description": "Message when no second match exists"
  },
@@ -259,9 +226,6 @@
  "@recent_matches": {
    "description": "Title for recent matches section"
  },
-  "@results": {
-    "description": "Label for match results"
-  },
  "@ruleset": {
    "description": "Ruleset label"
  },
@@ -277,9 +241,6 @@
  "@ruleset_single_winner": {
    "description": "Description for single winner ruleset"
  },
-  "@save_changes": {
-    "description": "Save changes button text"
-  },
  "@search_for_groups": {
    "description": "Hint text for group search input field"
  },
@@ -343,9 +304,6 @@
  "@yesterday_at": {
    "description": "Date format for yesterday"
  },
-  "@color": {
-    "description": "Color label"
-  },
  "all_players": "All players",
  "all_players_selected": "All players selected",
  "amount_of_matches": "Amount of Matches",
@@ -355,9 +313,7 @@
  "choose_game": "Choose Game",
  "choose_group": "Choose Group",
  "choose_ruleset": "Choose Ruleset",
-  "choose_color": "Choose Color",
  "could_not_add_player": "Could not add player",
-  "create_game": "Create Game",
  "create_group": "Create Group",
  "create_match": "Create match",
  "create_new_group": "Create new group",
@@ -370,16 +326,9 @@
  "days_ago": "{count} days ago",
  "delete": "Delete",
  "delete_all_data": "Delete all data",
-  "delete_game": "Delete Game",
  "delete_group": "Delete Group",
-  "delete_match": "Delete Match",
-  "description": "Description",
-  "edit_game": "Edit Game",
  "edit_group": "Edit Group",
-  "edit_match": "Edit Match",
-  "enter_results": "Enter Results",
  "error_creating_group": "Error while creating group, please try again",
-  "error_deleting_game": "Error while deleting game, please try again",
  "error_deleting_group": "Error while deleting group, please try again",
  "error_editing_group": "Error while editing group, please try again",
  "error_reading_file": "Error reading file",
@@ -403,7 +352,6 @@
  "licenses": "Licenses",
  "match_in_progress": "Match in progress...",
  "match_name": "Match name",
-  "match_profile": "Match Profile",
  "matches": "Matches",
  "members": "Members",
  "most_points": "Most Points",
@@ -416,7 +364,6 @@
  "no_players_found_with_that_name": "No players found with that name",
  "no_players_selected": "No players selected",
  "no_recent_matches_available": "No recent matches available",
-  "no_results_entered_yet": "No results entered yet",
  "no_second_match_available": "No second match available",
  "no_statistics_available": "No statistics available",
  "none": "None",
@@ -429,13 +376,11 @@
  "privacy_policy": "Privacy Policy",
  "quick_create": "Quick Create",
  "recent_matches": "Recent Matches",
-  "results": "Results",
  "ruleset": "Ruleset",
  "ruleset_least_points": "Inverse scoring: the player with the fewest points wins.",
  "ruleset_most_points": "Traditional ruleset: the player with the most points wins.",
  "ruleset_single_loser": "Exactly one loser is determined; last place receives the penalty or consequence.",
  "ruleset_single_winner": "Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.",
-  "save_changes": "Save Changes",
  "search_for_groups": "Search for groups",
  "search_for_players": "Search for players",
  "select_winner": "Select Winner:",
@@ -457,14 +402,5 @@
  "winner": "Winner",
  "winrate": "Winrate",
  "wins": "Wins",
-  "yesterday_at": "Yesterday at",
-  "color_red": "Red",
-  "color_blue": "Blue",
-  "color_green": "Green",
-  "color_yellow": "Yellow",
-  "color_purple": "Purple",
-  "color_orange": "Orange",
-  "color_pink": "Pink",
-  "color_teal": "Teal",
-  "color": "Color"
+  "yesterday_at": "Yesterday at"
 }
--- a/lib/l10n/generated/app_localizations.dart
+++ b/lib/l10n/generated/app_localizations.dart
@@ -98,18 +98,6 @@ abstract class AppLocalizations {
    Locale('en'),
  ];

-  /// No description provided for @description.
-  ///
-  /// In en, this message translates to:
-  /// **'Description'**
-  String get description;
-
-  /// No description provided for @edit_game.
-  ///
-  /// In en, this message translates to:
-  /// **'Edit Game'**
-  String get edit_game;
-
  /// Label for all players list
  ///
  /// In en, this message translates to:
@@ -164,24 +152,12 @@ abstract class AppLocalizations {
  /// **'Choose Ruleset'**
  String get choose_ruleset;

-  /// Label for choosing a color
-  ///
-  /// In en, this message translates to:
-  /// **'Choose Color'**
-  String get choose_color;
-
  /// Error message when adding a player fails
  ///
  /// In en, this message translates to:
  /// **'Could not add player'**
  String could_not_add_player(Object playerName);

-  /// Button text to create a game
-  ///
-  /// In en, this message translates to:
-  /// **'Create Game'**
-  String get create_game;
-
  /// Button text to create a group
  ///
  /// In en, this message translates to:
@@ -254,54 +230,24 @@ abstract class AppLocalizations {
  /// **'Delete all data'**
  String get delete_all_data;

-  /// Button text to delete a game
-  ///
-  /// In en, this message translates to:
-  /// **'Delete Game'**
-  String get delete_game;
-
  /// Confirmation dialog for deleting a group
  ///
  /// In en, this message translates to:
  /// **'Delete Group'**
  String get delete_group;

-  /// Button text to delete a match
-  ///
-  /// In en, this message translates to:
-  /// **'Delete Match'**
-  String get delete_match;
-
  /// Button & Appbar label for editing a group
  ///
  /// In en, this message translates to:
  /// **'Edit Group'**
  String get edit_group;

-  /// Button & Appbar label for editing a match
-  ///
-  /// In en, this message translates to:
-  /// **'Edit Match'**
-  String get edit_match;
-
-  /// Button text to enter match results
-  ///
-  /// In en, this message translates to:
-  /// **'Enter Results'**
-  String get enter_results;
-
  /// Error message when group creation fails
  ///
  /// In en, this message translates to:
  /// **'Error while creating group, please try again'**
  String get error_creating_group;

-  /// Error message when game deletion fails
-  ///
-  /// In en, this message translates to:
-  /// **'Error while deleting game, please try again'**
-  String get error_deleting_game;
-
  /// Error message when group deletion fails
  ///
  /// In en, this message translates to:
@@ -440,12 +386,6 @@ abstract class AppLocalizations {
  /// **'Match name'**
  String get match_name;

-  /// Title for match profile view
-  ///
-  /// In en, this message translates to:
-  /// **'Match Profile'**
-  String get match_profile;
-
  /// Label for matches
  ///
  /// In en, this message translates to:
@@ -518,12 +458,6 @@ abstract class AppLocalizations {
  /// **'No recent matches available'**
  String get no_recent_matches_available;

-  /// Message when no results have been entered yet
-  ///
-  /// In en, this message translates to:
-  /// **'No results entered yet'**
-  String get no_results_entered_yet;
-
  /// Message when no second match exists
  ///
  /// In en, this message translates to:
@@ -596,12 +530,6 @@ abstract class AppLocalizations {
  /// **'Recent Matches'**
  String get recent_matches;

-  /// Label for match results
-  ///
-  /// In en, this message translates to:
-  /// **'Results'**
-  String get results;
-
  /// Ruleset label
  ///
  /// In en, this message translates to:
@@ -632,12 +560,6 @@ abstract class AppLocalizations {
  /// **'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.'**
  String get ruleset_single_winner;

-  /// Save changes button text
-  ///
-  /// In en, this message translates to:
-  /// **'Save Changes'**
-  String get save_changes;
-
  /// Hint text for group search input field
  ///
  /// In en, this message translates to:
@@ -769,60 +691,6 @@ abstract class AppLocalizations {
  /// In en, this message translates to:
  /// **'Yesterday at'**
  String get yesterday_at;
-
-  /// No description provided for @color_red.
-  ///
-  /// In en, this message translates to:
-  /// **'Red'**
-  String get color_red;
-
-  /// No description provided for @color_blue.
-  ///
-  /// In en, this message translates to:
-  /// **'Blue'**
-  String get color_blue;
-
-  /// No description provided for @color_green.
-  ///
-  /// In en, this message translates to:
-  /// **'Green'**
-  String get color_green;
-
-  /// No description provided for @color_yellow.
-  ///
-  /// In en, this message translates to:
-  /// **'Yellow'**
-  String get color_yellow;
-
-  /// No description provided for @color_purple.
-  ///
-  /// In en, this message translates to:
-  /// **'Purple'**
-  String get color_purple;
-
-  /// No description provided for @color_orange.
-  ///
-  /// In en, this message translates to:
-  /// **'Orange'**
-  String get color_orange;
-
-  /// No description provided for @color_pink.
-  ///
-  /// In en, this message translates to:
-  /// **'Pink'**
-  String get color_pink;
-
-  /// No description provided for @color_teal.
-  ///
-  /// In en, this message translates to:
-  /// **'Teal'**
-  String get color_teal;
-
-  /// Color label
-  ///
-  /// In en, this message translates to:
-  /// **'Color'**
-  String get color;
 }

 class _AppLocalizationsDelegate
--- a/lib/l10n/generated/app_localizations_de.dart
+++ b/lib/l10n/generated/app_localizations_de.dart
@@ -8,12 +8,6 @@ import 'app_localizations.dart';
 class AppLocalizationsDe extends AppLocalizations {
  AppLocalizationsDe([String locale = 'de']) : super(locale);

-  @override
-  String get description => 'Beschreibung';
-
-  @override
-  String get edit_game => 'Spielvorlage bearbeiten';
-
  @override
  String get all_players => 'Alle Spieler:innen';

@@ -41,17 +35,11 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get choose_ruleset => 'Regelwerk wählen';

-  @override
-  String get choose_color => 'Farbe wählen';
-
  @override
  String could_not_add_player(Object playerName) {
    return 'Spieler:in $playerName konnte nicht hinzugefügt werden';
  }

-  @override
-  String get create_game => 'Spielvorlage erstellen';
-
  @override
  String get create_group => 'Gruppe erstellen';

@@ -90,32 +78,16 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get delete_all_data => 'Alle Daten löschen';

-  @override
-  String get delete_game => 'Spielvorlage löschen';
-
  @override
  String get delete_group => 'Gruppe löschen';

-  @override
-  String get delete_match => 'Spiel löschen';
-
  @override
  String get edit_group => 'Gruppe bearbeiten';

-  @override
-  String get edit_match => 'Gruppe bearbeiten';
-
-  @override
-  String get enter_results => 'Ergebnisse eintragen';
-
  @override
  String get error_creating_group =>
      'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';

-  @override
-  String get error_deleting_game =>
-      'Fehler beim Löschen der Spielvorlage, bitte erneut versuchen';
-
  @override
  String get error_deleting_group =>
      'Fehler beim Löschen der Gruppe, bitte erneut versuchen';
@@ -187,9 +159,6 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get match_name => 'Spieltitel';

-  @override
-  String get match_profile => 'Spielprofil';
-
  @override
  String get matches => 'Spiele';

@@ -227,9 +196,6 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get no_recent_matches_available => 'Keine letzten Spiele verfügbar';

-  @override
-  String get no_results_entered_yet => 'Noch keine Ergebnisse eingetragen';
-
  @override
  String get no_second_match_available => 'Kein zweites Spiel verfügbar';

@@ -268,9 +234,6 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get recent_matches => 'Letzte Spiele';

-  @override
-  String get results => 'Ergebnisse';
-
  @override
  String get ruleset => 'Regelwerk';

@@ -290,9 +253,6 @@ class AppLocalizationsDe extends AppLocalizations {
  String get ruleset_single_winner =>
      'Genau ein:e Gewinner:in wird gewählt; Unentschieden werden durch einen vordefinierten Tie-Breaker aufgelöst.';

-  @override
-  String get save_changes => 'Änderungen speichern';
-
  @override
  String get search_for_groups => 'Nach Gruppen suchen';

@@ -362,31 +322,4 @@ class AppLocalizationsDe extends AppLocalizations {

  @override
  String get yesterday_at => 'Gestern um';
-
-  @override
-  String get color_red => 'Rot';
-
-  @override
-  String get color_blue => 'Blau';
-
-  @override
-  String get color_green => 'Grün';
-
-  @override
-  String get color_yellow => 'Gelb';
-
-  @override
-  String get color_purple => 'Lila';
-
-  @override
-  String get color_orange => 'Orange';
-
-  @override
-  String get color_pink => 'Rosa';
-
-  @override
-  String get color_teal => 'Türkis';
-
-  @override
-  String get color => 'Farbe';
 }
--- a/lib/l10n/generated/app_localizations_en.dart
+++ b/lib/l10n/generated/app_localizations_en.dart
@@ -8,12 +8,6 @@ import 'app_localizations.dart';
 class AppLocalizationsEn extends AppLocalizations {
  AppLocalizationsEn([String locale = 'en']) : super(locale);

-  @override
-  String get description => 'Description';
-
-  @override
-  String get edit_game => 'Edit Game';
-
  @override
  String get all_players => 'All players';

@@ -41,17 +35,11 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get choose_ruleset => 'Choose Ruleset';

-  @override
-  String get choose_color => 'Choose Color';
-
  @override
  String could_not_add_player(Object playerName) {
    return 'Could not add player';
  }

-  @override
-  String get create_game => 'Create Game';
-
  @override
  String get create_group => 'Create Group';

@@ -90,32 +78,16 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get delete_all_data => 'Delete all data';

-  @override
-  String get delete_game => 'Delete Game';
-
  @override
  String get delete_group => 'Delete Group';

-  @override
-  String get delete_match => 'Delete Match';
-
  @override
  String get edit_group => 'Edit Group';

-  @override
-  String get edit_match => 'Edit Match';
-
-  @override
-  String get enter_results => 'Enter Results';
-
  @override
  String get error_creating_group =>
      'Error while creating group, please try again';

-  @override
-  String get error_deleting_game =>
-      'Error while deleting game, please try again';
-
  @override
  String get error_deleting_group =>
      'Error while deleting group, please try again';
@@ -187,9 +159,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get match_name => 'Match name';

-  @override
-  String get match_profile => 'Match Profile';
-
  @override
  String get matches => 'Matches';

@@ -227,9 +196,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get no_recent_matches_available => 'No recent matches available';

-  @override
-  String get no_results_entered_yet => 'No results entered yet';
-
  @override
  String get no_second_match_available => 'No second match available';

@@ -268,9 +234,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get recent_matches => 'Recent Matches';

-  @override
-  String get results => 'Results';
-
  @override
  String get ruleset => 'Ruleset';

@@ -290,9 +253,6 @@ class AppLocalizationsEn extends AppLocalizations {
  String get ruleset_single_winner =>
      'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.';

-  @override
-  String get save_changes => 'Save Changes';
-
  @override
  String get search_for_groups => 'Search for groups';

@@ -361,31 +321,4 @@ class AppLocalizationsEn extends AppLocalizations {

  @override
  String get yesterday_at => 'Yesterday at';
-
-  @override
-  String get color_red => 'Red';
-
-  @override
-  String get color_blue => 'Blue';
-
-  @override
-  String get color_green => 'Green';
-
-  @override
-  String get color_yellow => 'Yellow';
-
-  @override
-  String get color_purple => 'Purple';
-
-  @override
-  String get color_orange => 'Orange';
-
-  @override
-  String get color_pink => 'Pink';
-
-  @override
-  String get color_teal => 'Teal';
-
-  @override
-  String get color => 'Color';
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -29,31 +29,19 @@ class GameTracker extends StatelessWidget {
            return supportedLocale;
          }
        }
-        return supportedLocales.firstWhere(
-          (locale) => locale.languageCode == 'en',
-        );
+        return supportedLocales.firstWhere((locale) => locale.languageCode == 'en');
      },
      debugShowCheckedModeBanner: false,
      onGenerateTitle: (context) => AppLocalizations.of(context).app_name,
-      themeMode: ThemeMode.dark,
+      themeMode: ThemeMode.dark, // forces dark mode
      theme: ThemeData(
-        // main colors
        primaryColor: CustomTheme.primaryColor,
        scaffoldBackgroundColor: CustomTheme.backgroundColor,
-        // themes
        appBarTheme: CustomTheme.appBarTheme,
-        inputDecorationTheme: CustomTheme.inputDecorationTheme,
-        searchBarTheme: CustomTheme.searchBarTheme,
-        radioTheme: CustomTheme.radioTheme,
-        // color scheme
        colorScheme: ColorScheme.fromSeed(
-          seedColor: CustomTheme.textColor,
+          seedColor: CustomTheme.primaryColor,
          brightness: Brightness.dark,
-          primary: CustomTheme.primaryColor,
-          onPrimary: CustomTheme.textColor,
-          surface: CustomTheme.backgroundColor,
-          onSurface: CustomTheme.textColor,
-        ),
+        ).copyWith(surface: CustomTheme.backgroundColor),
        pageTransitionsTheme: const PageTransitionsTheme(
          builders: {
            TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart
@@ -38,7 +38,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
      ),
      KeyedSubtree(
        key: ValueKey('groups_$tabKeyCount'),
-        child: const GroupView(),
+        child: const GroupsView(),
      ),
      KeyedSubtree(
        key: ValueKey('stats_$tabKeyCount'),
@@ -141,7 +141,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
  }

  /// Returns the title of the current tab based on [currentIndex].
-  String _currentTabTitle(BuildContext context) {
+  String _currentTabTitle(context) {
    final loc = AppLocalizations.of(context);
    switch (currentIndex) {
      case 0:
--- a/lib/presentation/views/main_menu/group_view/create_group_view.dart
+++ b/lib/presentation/views/main_menu/group_view/create_group_view.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
@@ -122,6 +123,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                child: TextInputField(
                  controller: _groupNameController,
                  hintText: loc.group_name,
+                  maxLength: Constants.MAX_GROUP_NAME_LENGTH,
                ),
              ),
              Expanded(
@@ -145,12 +147,15 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                        (selectedPlayers.length < 2))
                    ? null
                    : () async {
-                        late Group? updatedGroup;
+                        Group? updatedGroup = null;
+                        bool successfullNameChange = true;
+                        bool successfullMemberChange = true;
                        late bool success;
                        if (widget.groupToEdit == null) {
                          success = await db.groupDao.addGroup(
                            group: Group(
                              name: _groupNameController.text.trim(),
+                              description: '',
                              members: selectedPlayers,
                            ),
                          );
@@ -161,13 +166,24 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                            description: '',
                            members: selectedPlayers,
                          );
-                          //TODO: Implement group editing in database
-                          /*
-                          success = await db.groupDao.updateGroup(
-                            group: updatedGroup,
-                          );
-                          */
-                          success = true;
+                          if (widget.groupToEdit!.name !=
+                              _groupNameController.text.trim()) {
+                            successfullNameChange = await db.groupDao
+                                .updateGroupName(
+                                  groupId: widget.groupToEdit!.id,
+                                  newName: _groupNameController.text.trim(),
+                                );
+                          }
+
+                          if (widget.groupToEdit!.members != selectedPlayers) {
+                            successfullMemberChange = await db.groupDao
+                                .replaceGroupPlayers(
+                                  groupId: widget.groupToEdit!.id,
+                                  newPlayers: selectedPlayers,
+                                );
+                          }
+                          success =
+                              successfullNameChange && successfullMemberChange;
                        }
                        if (!context.mounted) return;
                        if (success) {
--- a/lib/presentation/views/main_menu/group_view/group_detail_view.dart
+++ b/lib/presentation/views/main_menu/group_view/group_detail_view.dart
@@ -43,7 +43,6 @@ class _GroupDetailViewState extends State<GroupDetailView> {
  /// Total matches played in this group
  int totalMatches = 0;

-  /// The best player in this group
  String bestPlayer = '';

  @override
--- a/lib/presentation/views/main_menu/group_view/group_view.dart
+++ b/lib/presentation/views/main_menu/group_view/group_view.dart
@@ -14,15 +14,15 @@ import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:tallee/presentation/widgets/tiles/group_tile.dart';
 import 'package:tallee/presentation/widgets/top_centered_message.dart';

-class GroupView extends StatefulWidget {
+class GroupsView extends StatefulWidget {
  /// A view that displays a list of groups
-  const GroupView({super.key});
+  const GroupsView({super.key});

  @override
-  State<GroupView> createState() => _GroupViewState();
+  State<GroupsView> createState() => _GroupsViewState();
 }

-class _GroupViewState extends State<GroupView> {
+class _GroupsViewState extends State<GroupsView> {
  late final AppDatabase db;

  /// Loaded groups from the database
--- a/lib/presentation/views/main_menu/home_view.dart
+++ b/lib/presentation/views/main_menu/home_view.dart
@@ -42,12 +42,7 @@ class _HomeViewState extends State<HomeView> {
    2,
    Match(
      name: 'Skeleton Match',
-      game: Game(
-        name: '',
-        ruleset: Ruleset.singleWinner,
-        description: '',
-        color: GameColor.blue,
-      ),
+      game: Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
      group: Group(
        name: 'Skeleton Group',
        description: '',
@@ -109,9 +104,7 @@ class _HomeViewState extends State<HomeView> {
                        if (recentMatches.isNotEmpty)
                          for (Match match in recentMatches)
                            Padding(
-                              padding: const EdgeInsets.symmetric(
-                                vertical: 6.0,
-                              ),
+                              padding: const EdgeInsets.symmetric(vertical: 6.0),
                              child: MatchTile(
                                compact: true,
                                width: constraints.maxWidth * 0.9,
@@ -120,8 +113,7 @@ class _HomeViewState extends State<HomeView> {
                                  await Navigator.of(context).push(
                                    adaptivePageRoute(
                                      fullscreenDialog: true,
-                                      builder: (context) =>
-                                          MatchResultView(match: match),
+                                      builder: (context) => MatchResultView(match: match),
                                    ),
                                  );
                                  await updatedWinnerInRecentMatches(match.id);
@@ -129,10 +121,7 @@ class _HomeViewState extends State<HomeView> {
                              ),
                            )
                        else
-                          Center(
-                            heightFactor: 5,
-                            child: Text(loc.no_recent_matches_available),
-                          ),
+                          Center(heightFactor: 5, child: Text(loc.no_recent_matches_available)),
                      ],
                    ),
                  ),
@@ -148,40 +137,22 @@ class _HomeViewState extends State<HomeView> {
                        Row(
                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                          children: [
-                            QuickCreateButton(
-                              text: 'Category 1',
-                              onPressed: () {},
-                            ),
-                            QuickCreateButton(
-                              text: 'Category 2',
-                              onPressed: () {},
-                            ),
+                            QuickCreateButton(text: 'Category 1', onPressed: () {}),
+                            QuickCreateButton(text: 'Category 2', onPressed: () {}),
                          ],
                        ),
                        Row(
                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                          children: [
-                            QuickCreateButton(
-                              text: 'Category 3',
-                              onPressed: () {},
-                            ),
-                            QuickCreateButton(
-                              text: 'Category 4',
-                              onPressed: () {},
-                            ),
+                            QuickCreateButton(text: 'Category 3', onPressed: () {}),
+                            QuickCreateButton(text: 'Category 4', onPressed: () {}),
                          ],
                        ),
                        Row(
                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                          children: [
-                            QuickCreateButton(
-                              text: 'Category 5',
-                              onPressed: () {},
-                            ),
-                            QuickCreateButton(
-                              text: 'Category 6',
-                              onPressed: () {},
-                            ),
+                            QuickCreateButton(text: 'Category 5', onPressed: () {}),
+                            QuickCreateButton(text: 'Category 6', onPressed: () {}),
                          ],
                        ),
                      ],
@@ -210,11 +181,9 @@ class _HomeViewState extends State<HomeView> {
      matchCount = results[0] as int;
      groupCount = results[1] as int;
      loadedRecentMatches = results[2] as List<Match>;
-      recentMatches =
-          (loadedRecentMatches
-                ..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
-              .take(2)
-              .toList();
+      recentMatches = (loadedRecentMatches..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
+          .take(2)
+          .toList();
      if (mounted) {
        setState(() {
          isLoading = false;
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart
@@ -1,33 +1,25 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/common.dart';
 import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/dto/game.dart';
+import 'package:tallee/core/enums.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/game_view/create_game_view.dart';
 import 'package:tallee/presentation/widgets/text_input/custom_search_bar.dart';
 import 'package:tallee/presentation/widgets/tiles/title_description_list_tile.dart';

 class ChooseGameView extends StatefulWidget {
  /// A view that allows the user to choose a game from a list of available games
-  /// - [games]: The list of available games
-  /// - [initialSelectedGameId]: The id of the initially selected game
-  /// - [onGamesUpdated]: Optional callback invoked when the games are updated
+  /// - [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.initialSelectedGameId,
-    this.onGamesUpdated,
+    required this.initialGameIndex,
  });

  /// A list of tuples containing the game name, description and ruleset
-  final List<Game> games;
+  final List<(String, String, Ruleset)> games;

  /// The index of the initially selected game
-  final String initialSelectedGameId;
-
-  /// Optional callback invoked when the games are updated
-  final VoidCallback? onGamesUpdated;
+  final int initialGameIndex;

  @override
  State<ChooseGameView> createState() => _ChooseGameViewState();
@@ -37,18 +29,12 @@ class _ChooseGameViewState extends State<ChooseGameView> {
  /// Controller for the search bar
  final TextEditingController searchBarController = TextEditingController();

-  /// Currently selected game id
-  late String selectedGameId;
-
-  /// Games filtered according to the current search query
-  late List<Game> filteredGames;
+  /// Currently selected game index
+  late int selectedGameIndex;

  @override
  void initState() {
-    selectedGameId = widget.initialSelectedGameId;
-
-    // Start with all games visible
-    filteredGames = List<Game>.from(widget.games);
+    selectedGameIndex = widget.initialGameIndex;
    super.initState();
  }

@@ -62,32 +48,9 @@ class _ChooseGameViewState extends State<ChooseGameView> {
        leading: IconButton(
          icon: const Icon(Icons.arrow_back_ios),
          onPressed: () {
-            Navigator.of(context).pop(selectedGameId);
+            Navigator.of(context).pop(selectedGameIndex);
          },
        ),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.add),
-            onPressed: () async {
-              final result = await Navigator.push(
-                context,
-                adaptivePageRoute(
-                  builder: (context) => CreateGameView(
-                    onGameChanged: () {
-                      widget.onGamesUpdated?.call();
-                    },
-                  ),
-                ),
-              );
-              if (result != null && result.game != null) {
-                setState(() {
-                  widget.games.insert(0, result.game);
-                });
-                _refreshFromSource();
-              }
-            },
-          ),
-        ],
        title: Text(loc.choose_game),
      ),
      body: PopScope(
@@ -98,7 +61,7 @@ class _ChooseGameViewState extends State<ChooseGameView> {
          if (didPop) {
            return;
          }
-          Navigator.of(context).pop(selectedGameId);
+          Navigator.of(context).pop(selectedGameIndex);
        },
        child: Column(
          children: [
@@ -107,63 +70,30 @@ class _ChooseGameViewState extends State<ChooseGameView> {
              child: CustomSearchBar(
                controller: searchBarController,
                hintText: loc.game_name,
-                onChanged: (value) {
-                  _applySearchFilter(value);
-                },
              ),
            ),
            const SizedBox(height: 5),
            Expanded(
              child: ListView.builder(
-                itemCount: filteredGames.length,
+                itemCount: widget.games.length,
                itemBuilder: (BuildContext context, int index) {
-                  final game = filteredGames[index];
                  return TitleDescriptionListTile(
-                    title: game.name,
-                    description: game.description,
-                    badgeText: translateRulesetToString(game.ruleset, context),
-                    isHighlighted: selectedGameId == game.id,
-                    onTap: () async {
+                    title: widget.games[index].$1,
+                    description: widget.games[index].$2,
+                    badgeText: translateRulesetToString(
+                      widget.games[index].$3,
+                      context,
+                    ),
+                    isHighlighted: selectedGameIndex == index,
+                    onPressed: () async {
                      setState(() {
-                        if (selectedGameId == game.id) {
-                          selectedGameId = '';
+                        if (selectedGameIndex == index) {
+                          selectedGameIndex = -1;
                        } else {
-                          selectedGameId = game.id;
+                          selectedGameIndex = index;
                        }
                      });
                    },
-                    onLongPress: () async {
-                      final result = await Navigator.push(
-                        context,
-                        adaptivePageRoute(
-                          builder: (context) => CreateGameView(
-                            gameToEdit: game,
-                            onGameChanged: () {
-                              widget.onGamesUpdated?.call();
-                            },
-                          ),
-                        ),
-                      );
-                      if (result != null && result.game != null) {
-                        // Find the index in the original list to mutate
-                        final originalIndex = widget.games.indexWhere(
-                          (g) => g.id == game.id,
-                        );
-                        if (originalIndex == -1) {
-                          return;
-                        }
-                        if (result.delete) {
-                          setState(() {
-                            widget.games.removeAt(originalIndex);
-                          });
-                        } else {
-                          setState(() {
-                            widget.games[originalIndex] = result.game;
-                          });
-                        }
-                        _refreshFromSource();
-                      }
-                    },
                  );
                },
              ),
@@ -173,28 +103,4 @@ class _ChooseGameViewState extends State<ChooseGameView> {
      ),
    );
  }
-
-  /// Applies the search filter to the games list based on [query].
-  void _applySearchFilter(String query) {
-    final q = query.toLowerCase().trim();
-    if (q.isEmpty) {
-      setState(() {
-        filteredGames = List<Game>.from(widget.games);
-      });
-      return;
-    }
-
-    setState(() {
-      filteredGames = widget.games.where((game) {
-        final name = game.name.toLowerCase();
-        final description = game.description.toLowerCase();
-        return name.contains(q) || description.contains(q);
-      }).toList();
-    });
-  }
-
-  /// Re-applies the current filter after the underlying games list changed.
-  void _refreshFromSource() {
-    _applySearchFilter(searchBarController.text);
-  }
 }
--- a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
@@ -18,63 +18,54 @@ import 'package:tallee/presentation/widgets/player_selection.dart';
 import 'package:tallee/presentation/widgets/text_input/text_input_field.dart';
 import 'package:tallee/presentation/widgets/tiles/choose_tile.dart';

-/// A stateful widget for creating or editing a match.
 class CreateMatchView extends StatefulWidget {
-  /// Constructor for `CreateMatchView`.
-  ///
-  /// [onWinnerChanged] is an optional callback invoked when the winner is changed.
-  /// [matchToEdit] is an optional match to prefill the fields.
-  /// [onMatchUpdated] is an optional callback invoked when the match is updated.
-  const CreateMatchView({
-    super.key,
-    this.onWinnerChanged,
-    this.matchToEdit,
-    this.onMatchUpdated,
-  });
+  /// 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.
+  /// Optional callback invoked when the winner is changed
  final VoidCallback? onWinnerChanged;

-  /// Optional callback invoked when the match is updated.
-  final void Function(Match)? onMatchUpdated;
-
-  /// An optional match to prefill the fields.
-  final Match? matchToEdit;
-
  @override
  State<CreateMatchView> createState() => _CreateMatchViewState();
 }

-/// The state class for `CreateMatchView`, managing the UI and logic for creating or editing a match.
 class _CreateMatchViewState extends State<CreateMatchView> {
-  /// The database instance for accessing match data.
  late final AppDatabase db;

-  /// Controller for the match name input field.
+  /// Controller for the match name input field
  final TextEditingController _matchNameController = TextEditingController();

-  /// Hint text for the match name input field.
+  /// Hint text for the match name input field
  String? hintText;

-  /// List of all games from the database.
-  List<Game> gamesList = [];
-
-  /// List of all groups from the database.
+  /// List of all groups from the database
  List<Group> groupsList = [];

-  /// List of all players from the database.
+  /// List of all players from the database
  List<Player> playerList = [];

-  /// The currently selected group.
+  /// List of players filtered based on the selected group
+  /// If a group is selected, this list contains all players from [playerList]
+  /// who are not members of the selected group. If no group is selected,
+  /// this list is identical to [playerList].
+  List<Player> filteredPlayerList = [];
+
+  /// The currently selected group
  Group? selectedGroup;

-  /// The currently selected game.
-  Game? selectedGame;
+  /// The index of the currently selected group in [groupsList] to mark it in
+  /// the [ChooseGroupView]
+  String selectedGroupId = '';

-  /// The currently selected players.
+  /// The index of the currently selected game in [games] to mark it in
+  /// the [ChooseGameView]
+  int selectedGameIndex = -1;
+
+  /// The currently selected players
  List<Player> selectedPlayers = [];

-  /// GlobalKey for ScaffoldMessenger to show snackbars.
+  /// GlobalKey for ScaffoldMessenger to show snackbars
  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();

  @override
@@ -86,21 +77,15 @@ class _CreateMatchViewState extends State<CreateMatchView> {

    db = Provider.of<AppDatabase>(context, listen: false);

-    // Load games, groups, and players from the database.
    Future.wait([
-      db.gameDao.getAllGames(),
      db.groupDao.getAllGroups(),
      db.playerDao.getAllPlayers(),
    ]).then((result) async {
-      gamesList = result[0] as List<Game>;
-      gamesList.sort((a, b) => b.createdAt.compareTo(a.createdAt));
-      groupsList = result[1] as List<Group>;
-      playerList = result[2] as List<Player>;
-
-      // If a match is provided, prefill the fields.
-      if (widget.matchToEdit != null) {
-        prefillMatchDetails();
-      }
+      groupsList = result[0] as List<Group>;
+      playerList = result[1] as List<Player>;
+      setState(() {
+        filteredPlayerList = List.from(playerList);
+      });
    });
  }

@@ -117,27 +102,24 @@ class _CreateMatchViewState extends State<CreateMatchView> {
    hintText ??= loc.match_name;
  }

+  List<(String, String, Ruleset)> games = [
+    ('Example Game 1', 'This is a description', Ruleset.lowestScore),
+    ('Example Game 2', '', Ruleset.singleWinner),
+  ];
+
  @override
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context);
-    final buttonText = widget.matchToEdit != null
-        ? loc.save_changes
-        : loc.create_match;
-    final viewTitle = widget.matchToEdit != null
-        ? loc.edit_match
-        : loc.create_new_match;
-
    return ScaffoldMessenger(
      key: _scaffoldMessengerKey,
      child: Scaffold(
        resizeToAvoidBottomInset: false,
        backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(title: Text(viewTitle)),
+        appBar: AppBar(title: Text(loc.create_new_match)),
        body: SafeArea(
          child: Column(
            mainAxisAlignment: MainAxisAlignment.start,
            children: [
-              // Match name input field.
              Container(
                margin: CustomTheme.tileMargin,
                child: TextInputField(
@@ -146,96 +128,125 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                  maxLength: Constants.MAX_MATCH_NAME_LENGTH,
                ),
              ),
-              // Game selection tile.
              ChooseTile(
                title: loc.game,
-                trailingText: selectedGame == null
+                trailingText: selectedGameIndex == -1
                    ? loc.none
-                    : selectedGame!.name,
+                    : games[selectedGameIndex].$1,
                onPressed: () async {
-                  final String? selectedGameId = await Navigator.of(context)
-                      .push(
-                        adaptivePageRoute(
-                          builder: (context) => ChooseGameView(
-                            games: gamesList,
-                            initialSelectedGameId: selectedGame?.id ?? '',
-                            onGamesUpdated: loadGames,
-                          ),
-                        ),
-                      );
-
-                  try {
-                    selectedGame = gamesList.firstWhere(
-                      (g) => g.id == selectedGameId,
-                    );
-                  } catch (_) {
-                    selectedGame = null;
-                  }
-
+                  selectedGameIndex = await Navigator.of(context).push(
+                    adaptivePageRoute(
+                      builder: (context) => ChooseGameView(
+                        games: games,
+                        initialGameIndex: selectedGameIndex,
+                      ),
+                    ),
+                  );
                  setState(() {
-                    if (selectedGame != null) {
-                      hintText = selectedGame!.name;
+                    if (selectedGameIndex != -1) {
+                      hintText = games[selectedGameIndex].$1;
                    } else {
                      hintText = loc.match_name;
                    }
                  });
                },
              ),
-              // Group selection tile.
              ChooseTile(
                title: loc.group,
                trailingText: selectedGroup == null
                    ? loc.none_group
                    : selectedGroup!.name,
                onPressed: () async {
-                  selectedPlayers.removeWhere(
-                    (player) =>
-                        selectedGroup?.members.any(
-                          (member) => member.id == player.id,
-                        ) ??
-                        false,
-                  );
-
                  selectedGroup = await Navigator.of(context).push(
                    adaptivePageRoute(
                      builder: (context) => ChooseGroupView(
                        groups: groupsList,
-                        initialGroupId: selectedGroup?.id ?? '',
+                        initialGroupId: selectedGroupId,
                      ),
                    ),
                  );
-
-                  setState(() {
-                    if (selectedGroup != null) {
-                      setState(() {
-                        selectedPlayers += [...selectedGroup!.members];
-                      });
-                    }
-                  });
+                  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(() {});
                },
              ),
-              // Player selection widget.
              Expanded(
                child: PlayerSelection(
                  key: ValueKey(selectedGroup?.id ?? 'no_group'),
                  initialSelectedPlayers: selectedPlayers,
+                  availablePlayers: filteredPlayerList,
                  onChanged: (value) {
                    setState(() {
                      selectedPlayers = value;
-                      removeGroupWhenNoMemberLeft();
                    });
                  },
                ),
              ),
-              // Create or save button.
              CustomWidthButton(
-                text: buttonText,
+                text: loc.create_match,
                sizeRelativeToWidth: 0.95,
                buttonType: ButtonType.primary,
                onPressed: _enableCreateGameButton()
-                    ? () {
-                        buttonNavigation(context);
-                      }
+                    ? () async {
+                  // Use a game from the games list
+                  Game? gameToUse;
+                  if (selectedGameIndex == -1) {
+                    // Use the first game as default if none selected
+                    final selectedGame = games[0];
+                    gameToUse = Game(
+                      name: selectedGame.$1,
+                      description: selectedGame.$2,
+                      ruleset: selectedGame.$3,
+                      color: GameColor.blue,
+                      icon: '',
+                    );
+                  } else {
+                    // Use the selected game from the list
+                    final selectedGame = games[selectedGameIndex];
+                    gameToUse = Game(
+                      name: selectedGame.$1,
+                      description: selectedGame.$2,
+                      ruleset: selectedGame.$3,
+                      color: GameColor.blue,
+                      icon: '',
+                    );
+                  }
+                  // Add the game to the database if it doesn't exist
+                  await db.gameDao.addGame(game: gameToUse);
+
+                  Match match = Match(
+                    name: _matchNameController.text.isEmpty
+                        ? (hintText ?? '')
+                        : _matchNameController.text.trim(),
+                    createdAt: DateTime.now(),
+                    game: gameToUse,
+                    group: selectedGroup,
+                    players: selectedPlayers,
+                    notes: '',
+                  );
+                  await db.matchDao.addMatch(match: match);
+                  if (context.mounted) {
+                    Navigator.pushReplacement(
+                      context,
+                      adaptivePageRoute(
+                        fullscreenDialog: true,
+                        builder: (context) => MatchResultView(
+                          match: match,
+                          onWinnerChanged: widget.onWinnerChanged,
+                        ),
+                      ),
+                    );
+                  }
+                }
                    : null,
              ),
            ],
@@ -249,148 +260,9 @@ class _CreateMatchViewState extends State<CreateMatchView> {
  ///
  /// Returns `true` if:
  /// - A ruleset is selected AND
-  /// - Either a group is selected OR at least 2 players are selected.
+  /// - Either a group is selected OR at least 2 players are selected
  bool _enableCreateGameButton() {
    return (selectedGroup != null ||
-        (selectedPlayers.length > 1) && selectedGame != null);
+        (selectedPlayers.length > 1));
  }
-
-  /// Handles navigation when the create or save button is pressed.
-  ///
-  /// If a match is being edited, updates the match in the database.
-  /// Otherwise, creates a new match and navigates to the MatchResultView.
-  void buttonNavigation(BuildContext context) async {
-    if (widget.matchToEdit != null) {
-      await updateMatch();
-      if (context.mounted) {
-        Navigator.pop(context);
-      }
-    } else {
-      final match = await createMatch();
-
-      if (context.mounted) {
-        Navigator.pushReplacement(
-          context,
-          adaptivePageRoute(
-            fullscreenDialog: true,
-            builder: (context) => MatchResultView(
-              match: match,
-              onWinnerChanged: widget.onWinnerChanged,
-            ),
-          ),
-        );
-      }
-    }
-  }
-
-  /// Updates the existing match in the database.
-  Future<void> updateMatch() async {
-    final updatedMatch = Match(
-      id: widget.matchToEdit!.id,
-      name: _matchNameController.text.isEmpty
-          ? (hintText ?? '')
-          : _matchNameController.text.trim(),
-      group: selectedGroup,
-      players: selectedPlayers,
-      game: selectedGame!,
-      winner: widget.matchToEdit!.winner,
-      createdAt: widget.matchToEdit!.createdAt,
-      endedAt: widget.matchToEdit!.endedAt,
-      notes: widget.matchToEdit!.notes,
-    );
-
-    if (widget.matchToEdit!.name != updatedMatch.name) {
-      await db.matchDao.updateMatchName(
-        matchId: widget.matchToEdit!.id,
-        newName: updatedMatch.name,
-      );
-    }
-
-    if (widget.matchToEdit!.group?.id != updatedMatch.group?.id) {
-      await db.matchDao.updateMatchGroup(
-        matchId: widget.matchToEdit!.id,
-        newGroupId: updatedMatch.group?.id,
-      );
-    }
-
-    if (widget.matchToEdit!.game.id != updatedMatch.game.id) {
-      await db.matchDao.updateMatchGame(
-        matchId: widget.matchToEdit!.id,
-        gameId: updatedMatch.game.id,
-      );
-    }
-
-    for (var player in updatedMatch.players) {
-      if (!widget.matchToEdit!.players.any((p) => p.id == player.id)) {
-        await db.playerMatchDao.addPlayerToMatch(
-          matchId: widget.matchToEdit!.id,
-          playerId: player.id,
-        );
-      }
-    }
-
-    for (var player in widget.matchToEdit!.players) {
-      if (!updatedMatch.players.any((p) => p.id == player.id)) {
-        await db.playerMatchDao.removePlayerFromMatch(
-          matchId: widget.matchToEdit!.id,
-          playerId: player.id,
-        );
-        if (widget.matchToEdit!.winner?.id == player.id) {
-          updatedMatch.winner = null;
-        }
-      }
-    }
-
-    widget.onMatchUpdated?.call(updatedMatch);
-  }
-
-  /// Creates a new match and adds it to the database.
-  Future<Match> createMatch() async {
-    Match match = Match(
-      name: _matchNameController.text.isEmpty
-          ? (hintText ?? '')
-          : _matchNameController.text.trim(),
-      createdAt: DateTime.now(),
-      group: selectedGroup,
-      players: selectedPlayers,
-      game: selectedGame!,
-    );
-    await db.matchDao.addMatch(match: match);
-    return match;
-  }
-
-  /// Prefills the input fields if a match was provided to the view.
-  void prefillMatchDetails() {
-    final match = widget.matchToEdit!;
-    _matchNameController.text = match.name;
-    selectedPlayers = match.players;
-    selectedGame = match.game;
-
-    if (match.group != null) {
-      selectedGroup = match.group;
-    }
-  }
-
-  /// Removes the group if none of its members are in the selected players list.
-  Future<void> removeGroupWhenNoMemberLeft() async {
-    if (selectedGroup == null) return;
-
-    if (!selectedPlayers.any(
-      (player) =>
-          selectedGroup!.members.any((member) => member.id == player.id),
-    )) {
-      setState(() {
-        selectedGroup = null;
-      });
-    }
-  }
-
-  /// Loads all games from the database and updates the state.
-  Future<void> loadGames() async {
-    final result = await db.gameDao.getAllGames();
-    result.sort((a, b) => b.createdAt.compareTo(a.createdAt));
-    setState(() {
-      gamesList = result;
-    });
-  }
-}
+}
--- a/lib/presentation/views/main_menu/match_view/create_match/game_view/choose_color_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/game_view/choose_color_view.dart
@@ -1,78 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:tallee/core/common.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/core/enums.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/widgets/tiles/title_description_list_tile.dart';
-
-class ChooseColorView extends StatefulWidget {
-  /// A view that allows the user to choose a color from a list of available game colors
-  /// - [initialColor]: The initially selected color
-  const ChooseColorView({super.key, this.initialColor});
-
-  /// The initially selected color
-  final GameColor? initialColor;
-
-  @override
-  State<ChooseColorView> createState() => _ChooseColorViewState();
-}
-
-class _ChooseColorViewState extends State<ChooseColorView> {
-  /// Currently selected color
-  GameColor? selectedColor;
-
-  @override
-  void initState() {
-    selectedColor = widget.initialColor;
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-    const colors = GameColor.values;
-
-    return Scaffold(
-      backgroundColor: CustomTheme.backgroundColor,
-      appBar: AppBar(
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios),
-          onPressed: () {
-            Navigator.of(context).pop(selectedColor);
-          },
-        ),
-        title: Text(loc.choose_color),
-      ),
-      body: PopScope(
-        canPop: false,
-        onPopInvokedWithResult: (bool didPop, Object? result) {
-          if (didPop) return;
-          Navigator.of(context).pop(selectedColor);
-        },
-        child: ListView.builder(
-          padding: const EdgeInsets.only(bottom: 85),
-          itemCount: colors.length,
-          itemBuilder: (BuildContext context, int index) {
-            final color = colors[index];
-            return TitleDescriptionListTile(
-              onTap: () {
-                setState(() {
-                  if (selectedColor == color) {
-                    selectedColor = null;
-                  } else {
-                    selectedColor = color;
-                  }
-                });
-              },
-              title: translateGameColorToString(color, context),
-              description: '',
-              isHighlighted: selectedColor == color,
-              badgeText: '          ', //Breite für Color Badge
-              badgeColor: getColorFromGameColor(color),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}
--- a/lib/presentation/views/main_menu/match_view/create_match/game_view/choose_ruleset_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/game_view/choose_ruleset_view.dart
@@ -1,99 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:tallee/core/common.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/core/enums.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/widgets/tiles/title_description_list_tile.dart';
-
-class ChooseRulesetView extends StatefulWidget {
-  /// A view that allows the user to choose a ruleset from a list of available rulesets
-  /// - [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();
-}
-
-class _ChooseRulesetViewState extends State<ChooseRulesetView> {
-  /// Currently selected ruleset index
-  late int selectedRulesetIndex;
-
-  @override
-  void initState() {
-    selectedRulesetIndex = widget.initialRulesetIndex;
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-    return DefaultTabController(
-      length: 2,
-      initialIndex: 0,
-      child: Scaffold(
-        backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(
-          leading: IconButton(
-            icon: const Icon(Icons.arrow_back_ios),
-            onPressed: () {
-              Navigator.of(context).pop(
-                selectedRulesetIndex == -1
-                    ? null
-                    : widget.rulesets[selectedRulesetIndex].$1,
-              );
-            },
-          ),
-          title: Text(loc.choose_ruleset),
-        ),
-        body: PopScope(
-          // This fixes that the Android Back Gesture didn't return the
-          // selectedRulesetIndex and therefore the selected Ruleset wasn't saved
-          canPop: false,
-          onPopInvokedWithResult: (bool didPop, Object? result) {
-            if (didPop) {
-              return;
-            }
-            Navigator.of(context).pop(
-              selectedRulesetIndex == -1
-                  ? null
-                  : widget.rulesets[selectedRulesetIndex].$1,
-            );
-          },
-          child: ListView.builder(
-            padding: const EdgeInsets.only(bottom: 85),
-            itemCount: widget.rulesets.length,
-            itemBuilder: (BuildContext context, int index) {
-              return TitleDescriptionListTile(
-                onTap: () async {
-                  setState(() {
-                    if (selectedRulesetIndex == index) {
-                      selectedRulesetIndex = -1;
-                    } else {
-                      selectedRulesetIndex = index;
-                    }
-                  });
-                },
-                title: translateRulesetToString(
-                  widget.rulesets[index].$1,
-                  context,
-                ),
-                description: widget.rulesets[index].$2,
-                isHighlighted: selectedRulesetIndex == index,
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}
--- a/lib/presentation/views/main_menu/match_view/create_match/game_view/create_game_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/game_view/create_game_view.dart
@@ -1,351 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/common.dart';
-import 'package:tallee/core/constants.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/core/enums.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/game.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/game_view/choose_color_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/game_view/choose_ruleset_view.dart';
-import 'package:tallee/presentation/widgets/buttons/custom_width_button.dart';
-import 'package:tallee/presentation/widgets/custom_alert_dialog.dart';
-import 'package:tallee/presentation/widgets/text_input/text_input_field.dart';
-import 'package:tallee/presentation/widgets/tiles/choose_tile.dart';
-
-/// A stateful widget for creating or editing a game.
-/// - [gameToEdit] An optional game to prefill the fields
-/// - [onGameChanged] Callback to invoke when the game is created or edited
-class CreateGameView extends StatefulWidget {
-  const CreateGameView({
-    super.key,
-    this.gameToEdit,
-    required this.onGameChanged,
-  });
-
-  /// An optional game to prefill the fields
-  final Game? gameToEdit;
-
-  /// Callback to invoke when the game is created or edited
-  final VoidCallback onGameChanged;
-
-  @override
-  State<CreateGameView> createState() => _CreateGameViewState();
-}
-
-class _CreateGameViewState extends State<CreateGameView> {
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
-  /// The database instance for accessing game data.
-  late final AppDatabase db;
-
-  /// The currently selected ruleset for the game.
-  Ruleset? selectedRuleset;
-
-  /// The index of the currently selected ruleset.
-  int selectedRulesetIndex = -1;
-
-  /// A list of available rulesets and their localized names.
-  late List<(Ruleset, String)> _rulesets;
-
-  /// The currently selected color for the game.
-  GameColor? selectedColor;
-
-  /// Controller for the game name input field.
-  final _gameNameController = TextEditingController();
-
-  /// Controller for the game description input field.
-  final _descriptionController = TextEditingController();
-
-  /// The ID of the currently selected group.
-  late String selectedGroupId;
-
-  /// A controller for the search bar input field.
-  final TextEditingController controller = TextEditingController();
-
-  /// A list of groups filtered based on the search query.
-  late final List<Group> filteredGroups;
-
-  @override
-  void initState() {
-    super.initState();
-    db = Provider.of<AppDatabase>(context, listen: false);
-    _gameNameController.addListener(() => setState(() {}));
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _rulesets = [
-      (
-        Ruleset.singleWinner,
-        translateRulesetToString(Ruleset.singleWinner, context),
-      ),
-      (
-        Ruleset.singleLoser,
-        translateRulesetToString(Ruleset.singleLoser, context),
-      ),
-      (
-        Ruleset.highestScore,
-        translateRulesetToString(Ruleset.highestScore, context),
-      ),
-      (
-        Ruleset.lowestScore,
-        translateRulesetToString(Ruleset.lowestScore, context),
-      ),
-      (
-        Ruleset.multipleWinners,
-        translateRulesetToString(Ruleset.multipleWinners, context),
-      ),
-    ];
-
-    if (widget.gameToEdit != null) {
-      _gameNameController.text = widget.gameToEdit!.name;
-      _descriptionController.text = widget.gameToEdit!.description;
-      selectedRuleset = widget.gameToEdit!.ruleset;
-      selectedColor = widget.gameToEdit!.color;
-
-      selectedRulesetIndex = _rulesets.indexWhere(
-        (r) => r.$1 == selectedRuleset,
-      );
-    }
-  }
-
-  @override
-  void dispose() {
-    _gameNameController.dispose();
-    _descriptionController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    var loc = AppLocalizations.of(context);
-    final isEditing = widget.gameToEdit != null;
-
-    return ScaffoldMessenger(
-      child: Scaffold(
-        backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(
-          title: Text(isEditing ? loc.edit_game : loc.create_game),
-          actions: widget.gameToEdit == null
-              ? []
-              : [
-                  IconButton(
-                    icon: const Icon(Icons.delete),
-                    onPressed: () async {
-                      if (widget.gameToEdit != null) {
-                        showDialog<bool>(
-                          context: context,
-                          builder: (context) => CustomAlertDialog(
-                            title: loc.delete_game,
-                            content: 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) async {
-                          if (confirmed == true && context.mounted) {
-                            bool success = await db.gameDao.deleteGame(
-                              gameId: widget.gameToEdit!.id,
-                            );
-                            if (!context.mounted) return;
-                            if (success) {
-                              widget.onGameChanged.call();
-                              Navigator.of(
-                                context,
-                              ).pop((game: widget.gameToEdit, delete: true));
-                            } else {
-                              if (!mounted) return;
-                              showSnackbar(message: loc.error_deleting_game);
-                            }
-                          }
-                        });
-                      }
-                    },
-                  ),
-                ],
-        ),
-        body: SafeArea(
-          child: Column(
-            children: [
-              Container(
-                margin: CustomTheme.tileMargin,
-                child: TextInputField(
-                  controller: _gameNameController,
-                  maxLength: Constants.MAX_MATCH_NAME_LENGTH,
-                  hintText: loc.game_name,
-                ),
-              ),
-              ChooseTile(
-                title: loc.ruleset,
-                trailingText: selectedRuleset == null
-                    ? loc.none
-                    : translateRulesetToString(selectedRuleset!, context),
-                onPressed: () async {
-                  final result = await Navigator.of(context).push<Ruleset?>(
-                    adaptivePageRoute(
-                      builder: (context) => ChooseRulesetView(
-                        rulesets: _rulesets,
-                        initialRulesetIndex: selectedRulesetIndex,
-                      ),
-                    ),
-                  );
-                  if (mounted) {
-                    setState(() {
-                      selectedRuleset = result;
-                      selectedRulesetIndex = result == null
-                          ? -1
-                          : _rulesets.indexWhere((r) => r.$1 == result);
-                    });
-                  }
-                },
-              ),
-              ChooseTile(
-                title: loc.color,
-                trailingText: selectedColor == null
-                    ? loc.none
-                    : translateGameColorToString(selectedColor!, context),
-                onPressed: () async {
-                  final result = await Navigator.of(context).push<GameColor?>(
-                    adaptivePageRoute(
-                      builder: (context) =>
-                          ChooseColorView(initialColor: selectedColor),
-                    ),
-                  );
-                  if (mounted) {
-                    setState(() {
-                      selectedColor = result;
-                    });
-                  }
-                },
-              ),
-              Container(
-                margin: CustomTheme.tileMargin,
-                child: TextInputField(
-                  controller: _descriptionController,
-                  hintText: loc.description,
-                  minLines: 6,
-                  maxLines: 6,
-                  maxLength: Constants.MAX_GAME_DESCRIPTION_LENGTH,
-                  showCounterText: true,
-                ),
-              ),
-              const Spacer(),
-              Padding(
-                padding: const EdgeInsets.all(12.0),
-                child: CustomWidthButton(
-                  text: isEditing ? loc.edit_game : loc.create_game,
-                  sizeRelativeToWidth: 1,
-                  buttonType: ButtonType.primary,
-                  onPressed:
-                      _gameNameController.text.trim().isNotEmpty &&
-                          selectedRulesetIndex != -1 &&
-                          selectedColor != null
-                      ? () async {
-                          Game newGame = Game(
-                            name: _gameNameController.text.trim(),
-                            description: _descriptionController.text.trim(),
-                            ruleset: selectedRuleset!,
-                            color: selectedColor!,
-                          );
-                          if (isEditing) {
-                            await handleGameUpdate(newGame);
-                          } else {
-                            await handleGameCreation(newGame);
-                          }
-                          widget.onGameChanged.call();
-                          if (context.mounted) {
-                            Navigator.of(
-                              context,
-                            ).pop((game: newGame, delete: false));
-                          }
-                        }
-                      : null,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  /// Handles updating an existing game in the database.
-  ///
-  /// [newGame] The updated game object.
-  Future<void> handleGameUpdate(Game newGame) async {
-    final oldGame = widget.gameToEdit!;
-
-    if (oldGame.name != newGame.name) {
-      await db.gameDao.updateGameName(
-        gameId: oldGame.id,
-        newName: newGame.name,
-      );
-    }
-
-    if (oldGame.description != newGame.description) {
-      await db.gameDao.updateGameDescription(
-        gameId: oldGame.id,
-        newDescription: newGame.description,
-      );
-    }
-
-    if (oldGame.ruleset != newGame.ruleset) {
-      await db.gameDao.updateGameRuleset(
-        gameId: oldGame.id,
-        newRuleset: newGame.ruleset,
-      );
-    }
-
-    if (oldGame.color != newGame.color) {
-      await db.gameDao.updateGameColor(
-        gameId: oldGame.id,
-        newColor: newGame.color,
-      );
-    }
-
-    if (oldGame.icon != newGame.icon) {
-      await db.gameDao.updateGameIcon(
-        gameId: oldGame.id,
-        newIcon: newGame.icon,
-      );
-    }
-  }
-
-  /// Handles creating a new game in the database.
-  ///
-  /// [newGame] The game object to be created.
-  Future<void> handleGameCreation(Game newGame) async {
-    await db.gameDao.addGame(game: newGame);
-  }
-
-  /// Displays a snackbar with the given message and optional action.
-  ///
-  /// [message] The message to display in the snackbar.
-  void showSnackbar({required String message}) {
-    final messenger = _scaffoldMessengerKey.currentState;
-    if (messenger != null) {
-      messenger.hideCurrentSnackBar();
-      messenger.showSnackBar(
-        SnackBar(
-          content: Text(message, style: const TextStyle(color: Colors.white)),
-          backgroundColor: CustomTheme.boxColor,
-        ),
-      );
-    }
-  }
-}
--- a/lib/presentation/views/main_menu/match_view/match_detail_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_detail_view.dart
@@ -1,267 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/common.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_match_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
-import 'package:tallee/presentation/widgets/buttons/animated_dialog_button.dart';
-import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
-import 'package:tallee/presentation/widgets/colored_icon_container.dart';
-import 'package:tallee/presentation/widgets/custom_alert_dialog.dart';
-import 'package:tallee/presentation/widgets/tiles/info_tile.dart';
-import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
-
-class MatchDetailView extends StatefulWidget {
-  /// A view that displays the profile of a match
-  /// - [match]: The match to display
-  /// - [onMatchUpdate]: Callback to refresh the match list
-  const MatchDetailView({
-    super.key,
-    required this.match,
-    required this.onMatchUpdate,
-  });
-
-  /// The match to display
-  final Match match;
-
-  /// Callback to refresh the match list
-  final VoidCallback onMatchUpdate;
-
-  @override
-  State<MatchDetailView> createState() => _MatchDetailViewState();
-}
-
-class _MatchDetailViewState extends State<MatchDetailView> {
-  late final AppDatabase db;
-
-  late Match match;
-
-  @override
-  void initState() {
-    super.initState();
-    db = Provider.of<AppDatabase>(context, listen: false);
-    match = widget.match;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      backgroundColor: CustomTheme.backgroundColor,
-      appBar: AppBar(
-        title: Text(loc.match_profile),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.delete),
-            onPressed: () async {
-              showDialog<bool>(
-                context: context,
-                builder: (context) => CustomAlertDialog(
-                  title: '${loc.delete_match}?',
-                  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: const TextStyle(
-                          color: CustomTheme.secondaryColor,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ).then((confirmed) async {
-                if (confirmed! && context.mounted) {
-                  await db.matchDao.deleteMatch(matchId: match.id);
-                  if (!context.mounted) return;
-                  Navigator.pop(context);
-                  widget.onMatchUpdate.call();
-                }
-              });
-            },
-          ),
-        ],
-      ),
-      body: SafeArea(
-        child: Stack(
-          alignment: Alignment.center,
-          children: [
-            ListView(
-              padding: const EdgeInsets.only(
-                left: 12,
-                right: 12,
-                top: 20,
-                bottom: 100,
-              ),
-              children: [
-                const Center(
-                  child: ColoredIconContainer(
-                    icon: Icons.sports_esports,
-                    containerSize: 55,
-                    iconSize: 38,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  match.name,
-                  style: const TextStyle(
-                    fontSize: 28,
-                    fontWeight: FontWeight.bold,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 5),
-                Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(match.createdAt)}',
-                  style: const TextStyle(
-                    fontSize: 12,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 10),
-                if (match.group != null) ...[
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Icon(Icons.group),
-                      const SizedBox(width: 8),
-                      Text(
-                        '${match.group!.name}${getExtraPlayerCount(match)}',
-                        style: const TextStyle(fontWeight: FontWeight.bold),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 20),
-                ],
-                InfoTile(
-                  title: loc.players,
-                  icon: Icons.people,
-                  horizontalAlignment: CrossAxisAlignment.start,
-                  content: Wrap(
-                    alignment: WrapAlignment.start,
-                    crossAxisAlignment: WrapCrossAlignment.start,
-                    spacing: 12,
-                    runSpacing: 8,
-                    children: match.players.map((player) {
-                      return TextIconTile(
-                        text: player.name,
-                        iconEnabled: false,
-                      );
-                    }).toList(),
-                  ),
-                ),
-                const SizedBox(height: 15),
-                InfoTile(
-                  title: loc.results,
-                  icon: Icons.emoji_events,
-                  content: Padding(
-                    padding: const EdgeInsets.symmetric(
-                      vertical: 4,
-                      horizontal: 8,
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        /// TODO: Implement different ruleset results display
-                        if (match.winner != null) ...[
-                          Text(
-                            loc.winner,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                          Text(
-                            match.winner!.name,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                              color: CustomTheme.primaryColor,
-                            ),
-                          ),
-                        ] else ...[
-                          Text(
-                            loc.no_results_entered_yet,
-                            style: const TextStyle(
-                              fontSize: 14,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                        ],
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            ),
-            Positioned(
-              bottom: MediaQuery.paddingOf(context).bottom,
-              child: Row(
-                children: [
-                  MainMenuButton(
-                    icon: Icons.edit,
-                    onPressed: () => Navigator.push(
-                      context,
-                      adaptivePageRoute(
-                        fullscreenDialog: true,
-                        builder: (context) => CreateMatchView(
-                          matchToEdit: match,
-                          onMatchUpdated: onMatchUpdated,
-                        ),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(width: 15),
-                  MainMenuButton(
-                    text: loc.enter_results,
-                    icon: Icons.emoji_events,
-                    onPressed: () async {
-                      match.winner = await Navigator.push(
-                        context,
-                        adaptivePageRoute(
-                          fullscreenDialog: true,
-                          builder: (context) => MatchResultView(
-                            match: match,
-                            onWinnerChanged: () {
-                              widget.onMatchUpdate.call();
-                              setState(() {});
-                            },
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// Callback for when the match is updated in the edit view,
-  /// updates the match in this view
-  void onMatchUpdated(Match editedMatch) {
-    setState(() {
-      match = editedMatch;
-    });
-    widget.onMatchUpdate.call();
-  }
-}
--- a/lib/presentation/views/main_menu/match_view/match_result_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_result_view.dart
@@ -35,10 +35,7 @@ class _MatchResultViewState extends State<MatchResultView> {
  @override
  void initState() {
    db = Provider.of<AppDatabase>(context, listen: false);
-
-    allPlayers = widget.match.players;
-    allPlayers.sort((a, b) => a.name.compareTo(b.name));
-
+    allPlayers = getAllPlayers(widget.match);
    if (widget.match.winner != null) {
      _selectedPlayer = allPlayers.firstWhere(
        (p) => p.id == widget.match.winner!.id,
@@ -57,7 +54,7 @@ class _MatchResultViewState extends State<MatchResultView> {
          icon: const Icon(Icons.close),
          onPressed: () {
            widget.onWinnerChanged?.call();
-            Navigator.of(context).pop(_selectedPlayer);
+            Navigator.of(context).pop();
          },
        ),
        title: Text(widget.match.name),
@@ -148,4 +145,21 @@ class _MatchResultViewState extends State<MatchResultView> {
    }
    widget.onWinnerChanged?.call();
  }
+
+  /// Retrieves all players associated with the given [match].
+  /// This includes players directly assigned to the match
+  /// as well as members of the group (if any).
+  /// The returned list is sorted alphabetically by player name.
+  List<Player> getAllPlayers(Match match) {
+    List<Player> players = [];
+
+    if (match.group == null) {
+      players = [...match.players];
+    } else {
+      players = [...match.players, ...match.group!.members];
+    }
+
+    players.sort((a, b) => a.name.compareTo(b.name));
+    return players;
+  }
 }
--- a/lib/presentation/views/main_menu/match_view/match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_view.dart
@@ -1,3 +1,5 @@
+import 'dart:core' hide Match;
+
 import 'package:flutter/material.dart';
 import 'package:fluttericon/rpg_awesome_icons.dart';
 import 'package:provider/provider.dart';
@@ -12,14 +14,14 @@ import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_match_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_detail_view.dart';
+import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:tallee/presentation/widgets/app_skeleton.dart';
 import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:tallee/presentation/widgets/tiles/match_tile.dart';
 import 'package:tallee/presentation/widgets/top_centered_message.dart';

 class MatchView extends StatefulWidget {
-  /// A view that displays a list of matches.
+  /// A view that displays a list of matches
  const MatchView({super.key});

  @override
@@ -27,24 +29,16 @@ class MatchView extends StatefulWidget {
 }

 class _MatchViewState extends State<MatchView> {
-  /// Database instance used to access match data.
  late final AppDatabase db;
-
-  /// Indicates whether matches are currently being loaded.
  bool isLoading = true;

  /// Loaded matches from the database,
-  /// initially filled with skeleton matches.
+  /// initially filled with skeleton matches
  List<Match> matches = List.filled(
    4,
    Match(
      name: 'Skeleton match name',
-      game: Game(
-        name: '',
-        ruleset: Ruleset.singleWinner,
-        description: '',
-        color: GameColor.blue,
-      ),
+      game: Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
      group: Group(
        name: 'Group name',
        description: '',
@@ -60,7 +54,7 @@ class _MatchViewState extends State<MatchView> {
  void initState() {
    super.initState();
    db = Provider.of<AppDatabase>(context, listen: false);
-    loadMatches();
+    loadGames();
  }

  @override
@@ -100,9 +94,10 @@ class _MatchViewState extends State<MatchView> {
                          Navigator.push(
                            context,
                            adaptivePageRoute(
-                              builder: (context) => MatchDetailView(
+                              fullscreenDialog: true,
+                              builder: (context) => MatchResultView(
                                match: matches[index],
-                                onMatchUpdate: loadMatches,
+                                onWinnerChanged: loadGames,
                              ),
                            ),
                          );
@@ -125,7 +120,7 @@ class _MatchViewState extends State<MatchView> {
                  context,
                  adaptivePageRoute(
                    builder: (context) =>
-                        CreateMatchView(onWinnerChanged: loadMatches),
+                        CreateMatchView(onWinnerChanged: loadGames),
                  ),
                );
              },
@@ -136,9 +131,8 @@ class _MatchViewState extends State<MatchView> {
    );
  }

-  /// Loads the matches from the database and sorts them by creation date.
-  void loadMatches() {
-    isLoading = true;
+  /// Loads the games from the database and sorts them by creation date.
+  void loadGames() {
    Future.wait([
      db.matchDao.getAllMatches(),
      Future.delayed(Constants.MINIMUM_SKELETON_DURATION),
@@ -146,7 +140,7 @@ class _MatchViewState extends State<MatchView> {
      if (mounted) {
        setState(() {
          final loadedMatches = results[0] as List<Match>;
-          matches = [...loadedMatches]
+          matches = loadedMatches
            ..sort((a, b) => b.createdAt.compareTo(a.createdAt));
          isLoading = false;
        });
--- a/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
+++ b/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
--- a/lib/presentation/widgets/app_skeleton.dart
+++ b/lib/presentation/widgets/app_skeleton.dart
@@ -47,7 +47,10 @@ class _AppSkeletonState extends State<AppSkeleton> {
            : (Widget? currentChild, List<Widget> previousChildren) {
                return Stack(
                  alignment: Alignment.topCenter,
-                  children: [...previousChildren, ?currentChild],
+                  children: [
+                    ...previousChildren,
+                    if (currentChild != null) currentChild,
+                  ],
                );
              },
      ),
--- a/lib/presentation/widgets/buttons/main_menu_button.dart
+++ b/lib/presentation/widgets/buttons/main_menu_button.dart
@@ -2,25 +2,25 @@ import 'package:flutter/material.dart';

 class MainMenuButton extends StatefulWidget {
  /// A button for the main menu with an optional icon and a press animation.
-  /// - [onPressed]: The callback to be invoked when the button is pressed.
-  /// - [icon]: The icon of the button.
  /// - [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,
-    required this.icon,
-    this.text,
  });

+  /// 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;

-  /// The icon of the button.
-  final IconData icon;
-
-  /// The text of the button.
-  final String? text;
-
  @override
  State<MainMenuButton> createState() => _MainMenuButtonState();
 }
@@ -71,18 +71,18 @@ class _MainMenuButtonState extends State<MainMenuButton>
            mainAxisSize: MainAxisSize.min,
            mainAxisAlignment: MainAxisAlignment.center,
            children: [
-              Icon(widget.icon, size: 26, color: Colors.black),
-              if (widget.text != null) ...[
+              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,
-                  ),
-                ),
              ],
+              Text(
+                widget.text,
+                style: const TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
            ],
          ),
        ),
--- a/lib/presentation/widgets/player_selection.dart
+++ b/lib/presentation/widgets/player_selection.dart
@@ -110,9 +110,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                    final bool nameMatches = player.name.toLowerCase().contains(
                      value.toLowerCase(),
                    );
-                    final bool isNotSelected = !selectedPlayers.any(
-                      (p) => p.id == player.id,
-                    );
+                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
                    return nameMatches && isNotSelected;
                  }).toList();
                }
@@ -226,53 +224,49 @@ class _PlayerSelectionState extends State<PlayerSelection> {
      db.playerDao.getAllPlayers(),
      Future.delayed(Constants.MINIMUM_SKELETON_DURATION),
    ]).then((results) => results[0] as List<Player>);
+    if (mounted) {
+      _allPlayersFuture.then((loadedPlayers) {
+        setState(() {
+          // If a list of available players is provided (even if empty), use that list.
+          if (widget.availablePlayers != null) {
+            widget.availablePlayers!.sort((a, b) => a.name.compareTo(b.name));
+            allPlayers = [...widget.availablePlayers!];
+            suggestedPlayers = [...allPlayers];

-    _allPlayersFuture.then((loadedPlayers) {
-      if (!mounted) return;
-      setState(() {
-        // If a list of available players is provided (even if empty), use that list.
-        if (widget.availablePlayers != null) {
-          widget.availablePlayers!.sort((a, b) => a.name.compareTo(b.name));
-          allPlayers = [...widget.availablePlayers!];
-          suggestedPlayers = [...allPlayers];
-
-          if (widget.initialSelectedPlayers != null) {
-            // Ensures that only players available for selection are pre-selected.
-            selectedPlayers = widget.initialSelectedPlayers!
-                .where(
-                  (p) => widget.availablePlayers!.any(
-                    (available) => available.id == p.id,
-                  ),
-                )
-                .toList();
-          }
-        } else {
-          // Otherwise, use the loaded players from the database.
-          loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
-          allPlayers = [...loadedPlayers];
-          if (widget.initialSelectedPlayers != null) {
-            // Excludes already selected players from the suggested players list.
-            suggestedPlayers = loadedPlayers
-                .where(
-                  (p) => !widget.initialSelectedPlayers!.any(
-                    (ip) => ip.id == p.id,
-                  ),
-                )
-                .toList();
-            // Ensures that only players available for selection are pre-selected.
-            selectedPlayers = widget.initialSelectedPlayers!
-                .where(
-                  (p) => allPlayers.any((available) => available.id == p.id),
-                )
-                .toList();
+            if (widget.initialSelectedPlayers != null) {
+              // Ensures that only players available for selection are pre-selected.
+              selectedPlayers = widget.initialSelectedPlayers!
+                  .where(
+                    (p) => widget.availablePlayers!.any(
+                      (available) => available.id == p.id,
+                    ),
+                  )
+                  .toList();
+            }
          } else {
-            // If no initial selection, all loaded players are suggested.
-            suggestedPlayers = [...loadedPlayers];
+            // Otherwise, use the loaded players from the database.
+            loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
+            allPlayers = [...loadedPlayers];
+            if (widget.initialSelectedPlayers != null) {
+              // Excludes already selected players from the suggested players list.
+              suggestedPlayers = loadedPlayers.where((p) => !widget.initialSelectedPlayers!.any((ip) => ip.id == p.id)).toList();
+              // Ensures that only players available for selection are pre-selected.
+              selectedPlayers = widget.initialSelectedPlayers!
+                  .where(
+                    (p) => allPlayers.any(
+                      (available) => available.id == p.id,
+                ),
+              )
+                  .toList();
+            } else {
+              // If no initial selection, all loaded players are suggested.
+              suggestedPlayers = [...loadedPlayers];
+            }
          }
-        }
-        isLoading = false;
+          isLoading = false;
+        });
      });
-    });
+    }
  }

  /// Adds a new player to the database from the search bar input.
--- a/lib/presentation/widgets/text_input/custom_search_bar.dart
+++ b/lib/presentation/widgets/text_input/custom_search_bar.dart
@@ -69,6 +69,7 @@ class CustomSearchBar extends StatelessWidget {
          constraints ?? const BoxConstraints(maxHeight: 45, minHeight: 45),
      hintText: hintText,
      onChanged: onChanged,
+      hintStyle: WidgetStateProperty.all(const TextStyle(fontSize: 16)),
      leading: const Icon(Icons.search),
      trailing: [
        Visibility(
--- a/lib/presentation/widgets/text_input/text_input_field.dart
+++ b/lib/presentation/widgets/text_input/text_input_field.dart
@@ -8,18 +8,12 @@ class TextInputField extends StatelessWidget {
  /// - [onChanged]: Optional callback invoked when the text in the field changes.
  /// - [hintText]: The hint text displayed in the text input field when it is empty
  /// - [maxLength]: Optional parameter for maximum length of the input text.
-  /// - [maxLines]: The maximum number of lines for the text input field. Defaults to 1.
-  /// - [minLines]: The minimum number of lines for the text input field. Defaults to 1.
-  /// - [showCounterText]: Whether to show the counter text in the text input field. Defaults to false.
  const TextInputField({
    super.key,
    required this.controller,
    required this.hintText,
    this.onChanged,
    this.maxLength,
-    this.maxLines = 1,
-    this.minLines = 1,
-    this.showCounterText = false,
  });

  /// The controller for the text input field.
@@ -34,15 +28,6 @@ class TextInputField extends StatelessWidget {
  /// Optional parameter for maximum length of the input text.
  final int? maxLength;

-  /// The maximum number of lines for the text input field.
-  final int? maxLines;
-
-  /// The minimum number of lines for the text input field.
-  final int? minLines;
-
-  /// Whether to show the counter text in the text input field.
-  final bool showCounterText;
-
  @override
  Widget build(BuildContext context) {
    return TextField(
@@ -50,14 +35,13 @@ class TextInputField extends StatelessWidget {
      onChanged: onChanged,
      maxLength: maxLength,
      maxLengthEnforcement: MaxLengthEnforcement.truncateAfterCompositionEnds,
-      maxLines: maxLines,
-      minLines: minLines,
      decoration: InputDecoration(
        filled: true,
        fillColor: CustomTheme.boxColor,
        hintText: hintText,
        hintStyle: const TextStyle(fontSize: 18),
-        counterText: showCounterText ? null : '',
+        // Hides the character counter
+        counterText: '',
        enabledBorder: const OutlineInputBorder(
          borderRadius: BorderRadius.all(Radius.circular(12)),
          borderSide: BorderSide(color: CustomTheme.boxBorderColor),
--- a/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
+++ b/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
@@ -36,7 +36,11 @@ class CustomRadioListTile<T> extends StatelessWidget {
        ),
        child: Row(
          children: [
-            Radio<T>(value: value, toggleable: true),
+            Radio<T>(
+              value: value,
+              activeColor: CustomTheme.primaryColor,
+              toggleable: true,
+            ),
            Expanded(
              child: Text(
                text,
--- a/lib/presentation/widgets/tiles/match_tile.dart
+++ b/lib/presentation/widgets/tiles/match_tile.dart
@@ -1,10 +1,8 @@
-import 'dart:core' hide Match;
-
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:tallee/core/common.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/data/dto/match.dart';
+import 'package:tallee/data/dto/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
 import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';

@@ -40,13 +38,18 @@ class MatchTile extends StatefulWidget {
 }

 class _MatchTileState extends State<MatchTile> {
+  late final List<Player> _allPlayers;
+
+  @override
+  void initState() {
+    super.initState();
+    _allPlayers = _getCombinedPlayers();
+  }
+
  @override
  Widget build(BuildContext context) {
-    final match = widget.match;
-    final group = match.group;
-    final winner = match.winner;
-    final players = [...match.players]
-      ..sort((a, b) => a.name.compareTo(b.name));
+    final group = widget.match.group;
+    final winner = widget.match.winner;
    final loc = AppLocalizations.of(context);

    return GestureDetector(
@@ -64,7 +67,7 @@ class _MatchTileState extends State<MatchTile> {
              children: [
                Expanded(
                  child: Text(
-                    match.name,
+                    widget.match.name,
                    style: const TextStyle(
                      fontSize: 18,
                      fontWeight: FontWeight.bold,
@@ -73,7 +76,7 @@ class _MatchTileState extends State<MatchTile> {
                  ),
                ),
                Text(
-                  _formatDate(match.createdAt, context),
+                  _formatDate(widget.match.createdAt, context),
                  style: const TextStyle(fontSize: 12, color: Colors.grey),
                ),
              ],
@@ -88,7 +91,7 @@ class _MatchTileState extends State<MatchTile> {
                  const SizedBox(width: 6),
                  Expanded(
                    child: Text(
-                      '${match.group!.name}${getExtraPlayerCount(match)}',
+                      '${group.name} + ${widget.match.players.length}',
                      style: const TextStyle(fontSize: 14, color: Colors.grey),
                      overflow: TextOverflow.ellipsis,
                    ),
@@ -103,7 +106,7 @@ class _MatchTileState extends State<MatchTile> {
                  const SizedBox(width: 6),
                  Expanded(
                    child: Text(
-                      '${match.players.length} ${loc.players}',
+                      '${widget.match.players.length} ${loc.players}',
                      style: const TextStyle(fontSize: 14, color: Colors.grey),
                      overflow: TextOverflow.ellipsis,
                    ),
@@ -189,7 +192,7 @@ class _MatchTileState extends State<MatchTile> {
              const SizedBox(height: 12),
            ],

-            if (players.isNotEmpty && widget.compact == false) ...[
+            if (_allPlayers.isNotEmpty && widget.compact == false) ...[
              Text(
                loc.players,
                style: const TextStyle(
@@ -202,7 +205,7 @@ class _MatchTileState extends State<MatchTile> {
              Wrap(
                spacing: 6,
                runSpacing: 6,
-                children: players.map((player) {
+                children: _allPlayers.map((player) {
                  return TextIconTile(text: player.name, iconEnabled: false);
                }).toList(),
              ),
@@ -230,4 +233,32 @@ class _MatchTileState extends State<MatchTile> {
      return '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(dateTime)}';
    }
  }
+
+  /// Retrieves all unique players associated with the match,
+  /// combining players from both the match and its group.
+  List<Player> _getCombinedPlayers() {
+    final allPlayers = <Player>[];
+    final playerIds = <String>{};
+
+    // Add players from game.players
+    for (var player in widget.match.players) {
+      if (!playerIds.contains(player.id)) {
+        allPlayers.add(player);
+        playerIds.add(player.id);
+      }
+    }
+
+    // Add players from game.group.players
+    if (widget.match.group?.members != null) {
+      for (var player in widget.match.group!.members) {
+        if (!playerIds.contains(player.id)) {
+          allPlayers.add(player);
+          playerIds.add(player.id);
+        }
+      }
+    }
+
+    allPlayers.sort((a, b) => a.name.compareTo(b.name));
+    return allPlayers;
+  }
 }
--- a/lib/presentation/widgets/tiles/title_description_list_tile.dart
+++ b/lib/presentation/widgets/tiles/title_description_list_tile.dart
@@ -6,7 +6,6 @@ class TitleDescriptionListTile extends StatelessWidget {
  /// - [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.
-  /// - [onLongPress]: 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.
@@ -14,8 +13,7 @@ class TitleDescriptionListTile extends StatelessWidget {
    super.key,
    required this.title,
    required this.description,
-    this.onTap,
-    this.onLongPress,
+    this.onPressed,
    this.isHighlighted = false,
    this.badgeText,
    this.badgeColor,
@@ -28,10 +26,7 @@ class TitleDescriptionListTile extends StatelessWidget {
  final String description;

  /// The callback invoked when the tile is tapped.
-  final VoidCallback? onTap;
-
-  /// The callback invoked when the tile is long-pressed.
-  final VoidCallback? onLongPress;
+  final VoidCallback? onPressed;

  /// A boolean to determine if the tile should be highlighted.
  final bool isHighlighted;
@@ -45,8 +40,7 @@ class TitleDescriptionListTile extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return GestureDetector(
-      onTap: onTap,
-      onLongPress: onLongPress,
+      onTap: onPressed,
      child: AnimatedContainer(
        margin: const EdgeInsets.symmetric(vertical: 10, horizontal: 10),
        padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
--- a/lib/services/data_transfer_service.dart
+++ b/lib/services/data_transfer_service.dart
@@ -40,39 +40,33 @@ class DataTransferService {
      'players': players.map((p) => p.toJson()).toList(),
      'games': games.map((g) => g.toJson()).toList(),
      'groups': groups
-          .map(
-            (g) => {
-              'id': g.id,
-              'name': g.name,
-              'description': g.description,
-              'createdAt': g.createdAt.toIso8601String(),
-              'memberIds': (g.members).map((m) => m.id).toList(),
-            },
-          )
+          .map((g) => {
+        'id': g.id,
+        'name': g.name,
+        'description': g.description,
+        'createdAt': g.createdAt.toIso8601String(),
+        'memberIds': (g.members).map((m) => m.id).toList(),
+      })
          .toList(),
      'teams': teams
-          .map(
-            (t) => {
-              'id': t.id,
-              'name': t.name,
-              'createdAt': t.createdAt.toIso8601String(),
-              'memberIds': (t.members).map((m) => m.id).toList(),
-            },
-          )
+          .map((t) => {
+        'id': t.id,
+        'name': t.name,
+        'createdAt': t.createdAt.toIso8601String(),
+        'memberIds': (t.members).map((m) => m.id).toList(),
+      })
          .toList(),
      'matches': matches
-          .map(
-            (m) => {
-              'id': m.id,
-              'name': m.name,
-              'createdAt': m.createdAt.toIso8601String(),
-              'endedAt': m.endedAt?.toIso8601String(),
-              'gameId': m.game.id,
-              'groupId': m.group?.id,
-              'playerIds': m.players.map((p) => p.id).toList(),
-              'notes': m.notes,
-            },
-          )
+          .map((m) => {
+        'id': m.id,
+        'name': m.name,
+        'createdAt': m.createdAt.toIso8601String(),
+        'endedAt': m.endedAt?.toIso8601String(),
+        'gameId': m.game.id,
+        'groupId': m.group?.id,
+        'playerIds': m.players.map((p) => p.id).toList(),
+        'notes': m.notes,
+      })
          .toList(),
    };

@@ -85,9 +79,9 @@ class DataTransferService {
  /// [jsonString] The JSON string to be exported.
  /// [fileName] The desired name for the exported file (without extension).
  static Future<ExportResult> exportData(
-    String jsonString,
-    String fileName,
-  ) async {
+      String jsonString,
+      String fileName
+      ) async {
    try {
      final bytes = Uint8List.fromList(utf8.encode(jsonString));
      final path = await FilePicker.platform.saveFile(
@@ -100,6 +94,7 @@ class DataTransferService {
      } else {
        return ExportResult.success;
      }
+
    } catch (e, stack) {
      print('[exportData] $e');
      print(stack);
@@ -127,19 +122,13 @@ class DataTransferService {
      final isValid = await _validateJsonSchema(jsonString);
      if (!isValid) return ImportResult.invalidSchema;

-      final Map<String, dynamic> decoded =
-          json.decode(jsonString) as Map<String, dynamic>;
+      final Map<String, dynamic> decoded = json.decode(jsonString) as Map<String, dynamic>;

-      final List<dynamic> playersJson =
-          (decoded['players'] as List<dynamic>?) ?? [];
-      final List<dynamic> gamesJson =
-          (decoded['games'] as List<dynamic>?) ?? [];
-      final List<dynamic> groupsJson =
-          (decoded['groups'] as List<dynamic>?) ?? [];
-      final List<dynamic> teamsJson =
-          (decoded['teams'] as List<dynamic>?) ?? [];
-      final List<dynamic> matchesJson =
-          (decoded['matches'] as List<dynamic>?) ?? [];
+      final List<dynamic> playersJson = (decoded['players'] as List<dynamic>?) ?? [];
+      final List<dynamic> gamesJson = (decoded['games'] as List<dynamic>?) ?? [];
+      final List<dynamic> groupsJson = (decoded['groups'] as List<dynamic>?) ?? [];
+      final List<dynamic> teamsJson = (decoded['teams'] as List<dynamic>?) ?? [];
+      final List<dynamic> matchesJson = (decoded['matches'] as List<dynamic>?) ?? [];

      // Import Players
      final List<Player> importedPlayers = playersJson
@@ -162,8 +151,7 @@ class DataTransferService {
      // Import Groups
      final List<Group> importedGroups = groupsJson.map((g) {
        final map = g as Map<String, dynamic>;
-        final memberIds = (map['memberIds'] as List<dynamic>? ?? [])
-            .cast<String>();
+        final memberIds = (map['memberIds'] as List<dynamic>? ?? []).cast<String>();

        final members = memberIds
            .map((id) => playerById[id])
@@ -186,8 +174,7 @@ class DataTransferService {
      // Import Teams
      final List<Team> importedTeams = teamsJson.map((t) {
        final map = t as Map<String, dynamic>;
-        final memberIds = (map['memberIds'] as List<dynamic>? ?? [])
-            .cast<String>();
+        final memberIds = (map['memberIds'] as List<dynamic>? ?? []).cast<String>();

        final members = memberIds
            .map((id) => playerById[id])
@@ -208,11 +195,8 @@ class DataTransferService {

        final String gameId = map['gameId'] as String;
        final String? groupId = map['groupId'] as String?;
-        final List<String> playerIds =
-            (map['playerIds'] as List<dynamic>? ?? []).cast<String>();
-        final DateTime? endedAt = map['endedAt'] != null
-            ? DateTime.parse(map['endedAt'] as String)
-            : null;
+        final List<String> playerIds = (map['playerIds'] as List<dynamic>? ?? []).cast<String>();
+        final DateTime? endedAt = map['endedAt'] != null ? DateTime.parse(map['endedAt'] as String) : null;

        final game = gameById[gameId];
        final group = (groupId == null) ? null : groupById[groupId];
@@ -224,14 +208,7 @@ class DataTransferService {
        return Match(
          id: map['id'] as String,
          name: map['name'] as String,
-          game:
-              game ??
-              Game(
-                name: 'Unknown',
-                ruleset: Ruleset.singleWinner,
-                description: '',
-                color: GameColor.blue,
-              ),
+          game: game ?? Game(name: 'Unknown', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
          group: group,
          players: players,
          createdAt: DateTime.parse(map['createdAt'] as String),
@@ -289,4 +266,4 @@ class DataTransferService {
      return false;
    }
  }
-}
+}
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: tallee
 description: "Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.18+252
+version: 0.0.17+251

 environment:
  sdk: ^3.8.1
--- a/test/db_tests/aggregates/match_test.dart
+++ b/test/db_tests/aggregates/match_test.dart
@@ -1,13 +1,13 @@
 import 'package:clock/clock.dart';
-import 'package:drift/drift.dart' hide isNotNull;
+import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/core/enums.dart';

 void main() {
  late AppDatabase database;
@@ -51,12 +51,7 @@ void main() {
        description: '',
        members: [testPlayer4, testPlayer5],
      );
-      testGame = Game(
-        name: 'Test Game',
-        ruleset: Ruleset.singleWinner,
-        description: 'A test game',
-        color: GameColor.blue,
-      );
+      testGame = Game(name: 'Test Game', ruleset: Ruleset.singleWinner, description: 'A test game', color: GameColor.blue, icon: '');
      testMatch1 = Match(
        name: 'First Test Match',
        game: testGame,
@@ -104,6 +99,7 @@ void main() {
  });

  group('Match Tests', () {
+
    // Verifies that a single match can be added and retrieved with all fields, group, and players intact.
    test('Adding and fetching single match works correctly', () async {
      await database.matchDao.addMatch(match: testMatch1);
@@ -131,7 +127,10 @@ void main() {
      for (int i = 0; i < testMatch1.players.length; i++) {
        expect(result.players[i].id, testMatch1.players[i].id);
        expect(result.players[i].name, testMatch1.players[i].name);
-        expect(result.players[i].createdAt, testMatch1.players[i].createdAt);
+        expect(
+          result.players[i].createdAt,
+          testMatch1.players[i].createdAt,
+        );
      }
    });

@@ -192,7 +191,10 @@ void main() {
        for (int i = 0; i < testMatch.players.length; i++) {
          expect(match.players[i].id, testMatch.players[i].id);
          expect(match.players[i].name, testMatch.players[i].name);
-          expect(match.players[i].createdAt, testMatch.players[i].createdAt);
+          expect(
+            match.players[i].createdAt,
+            testMatch.players[i].createdAt,
+          );
        }
      }
    });
@@ -280,31 +282,5 @@ void main() {
      );
      expect(fetchedMatch.name, newName);
    });
-
-    test('Fetching a winner works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
-
-      var fetchedMatch = await database.matchDao.getMatchById(
-        matchId: testMatch1.id,
-      );
-
-      expect(fetchedMatch.winner, isNotNull);
-      expect(fetchedMatch.winner!.id, testPlayer4.id);
-    });
-
-    test('Setting a winner works correctly', () async {
-      await database.matchDao.addMatch(match: testMatch1);
-
-      await database.matchDao.setWinner(
-        matchId: testMatch1.id,
-        winnerId: testPlayer5.id,
-      );
-
-      final fetchedMatch = await database.matchDao.getMatchById(
-        matchId: testMatch1.id,
-      );
-      expect(fetchedMatch.winner, isNotNull);
-      expect(fetchedMatch.winner!.id, testPlayer5.id);
-    });
  });
 }
--- a/test/db_tests/aggregates/team_test.dart
+++ b/test/db_tests/aggregates/team_test.dart
@@ -2,12 +2,12 @@ import 'package:clock/clock.dart';
 import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
 import 'package:tallee/data/dto/team.dart';
+import 'package:tallee/core/enums.dart';

 void main() {
  late AppDatabase database;
@@ -37,21 +37,20 @@ void main() {
      testPlayer2 = Player(name: 'Bob', description: '');
      testPlayer3 = Player(name: 'Charlie', description: '');
      testPlayer4 = Player(name: 'Diana', description: '');
-      testTeam1 = Team(name: 'Team Alpha', members: [testPlayer1, testPlayer2]);
-      testTeam2 = Team(name: 'Team Beta', members: [testPlayer3, testPlayer4]);
-      testTeam3 = Team(name: 'Team Gamma', members: [testPlayer1, testPlayer3]);
-      testGame1 = Game(
-        name: 'Game 1',
-        ruleset: Ruleset.singleWinner,
-        description: 'Test game 1',
-        color: GameColor.blue,
+      testTeam1 = Team(
+        name: 'Team Alpha',
+        members: [testPlayer1, testPlayer2],
      );
-      testGame2 = Game(
-        name: 'Game 2',
-        ruleset: Ruleset.highestScore,
-        description: 'Test game 2',
-        color: GameColor.red,
+      testTeam2 = Team(
+        name: 'Team Beta',
+        members: [testPlayer3, testPlayer4],
      );
+      testTeam3 = Team(
+        name: 'Team Gamma',
+        members: [testPlayer1, testPlayer3],
+      );
+      testGame1 = Game(name: 'Game 1', ruleset: Ruleset.singleWinner, description: 'Test game 1', color: GameColor.blue, icon: '');
+      testGame2 = Game(name: 'Game 2', ruleset: Ruleset.highestScore, description: 'Test game 2', color: GameColor.red, icon: '');
    });

    await database.playerDao.addPlayersAsList(
@@ -66,6 +65,7 @@ void main() {
  });

  group('Team Tests', () {
+
    // Verifies that a single team can be added and retrieved with all fields intact.
    test('Adding and fetching a single team works correctly', () async {
      final added = await database.teamDao.addTeam(team: testTeam1);
@@ -285,7 +285,10 @@ void main() {
    test('Updating team name to empty string works', () async {
      await database.teamDao.addTeam(team: testTeam1);

-      await database.teamDao.updateTeamName(teamId: testTeam1.id, newName: '');
+      await database.teamDao.updateTeamName(
+        teamId: testTeam1.id,
+        newName: '',
+      );

      final updatedTeam = await database.teamDao.getTeamById(
        teamId: testTeam1.id,
@@ -347,7 +350,9 @@ void main() {
      await database.matchDao.addMatch(match: match2);

      // Add teams to database
-      await database.teamDao.addTeamsAsList(teams: [testTeam1, testTeam3]);
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam3],
+      );

      // Associate players with teams through match1
      // testTeam1: player1, player2
@@ -415,11 +420,10 @@ void main() {
      final allTeams = await database.teamDao.getAllTeams();

      expect(allTeams.length, 3);
-      expect(allTeams.map((t) => t.id).toSet(), {
-        testTeam1.id,
-        testTeam2.id,
-        testTeam3.id,
-      });
+      expect(
+        allTeams.map((t) => t.id).toSet(),
+        {testTeam1.id, testTeam2.id, testTeam3.id},
+      );
    });

    // Verifies that teamExists returns false for deleted teams.
@@ -458,7 +462,9 @@ void main() {

    // Verifies that addTeam after deleteAllTeams works correctly.
    test('Adding team after deleteAllTeams works correctly', () async {
-      await database.teamDao.addTeamsAsList(teams: [testTeam1, testTeam2]);
+      await database.teamDao.addTeamsAsList(
+        teams: [testTeam1, testTeam2],
+      );
      expect(await database.teamDao.getTeamCount(), 2);

      await database.teamDao.deleteAllTeams();
@@ -518,4 +524,4 @@ void main() {
      expect(fetchedTeam.createdAt, testTeam1.createdAt);
    });
  });
-}
+}
--- a/test/db_tests/entities/game_test.dart
+++ b/test/db_tests/entities/game_test.dart
@@ -44,6 +44,7 @@ void main() {
        ruleset: Ruleset.highestScore,
        description: 'A board game about real estate',
        color: GameColor.orange,
+        icon: '',
      );
    });
  });
@@ -53,6 +54,7 @@ void main() {
  });

  group('Game Tests', () {
+
    // Verifies that getAllGames returns an empty list when the database has no games.
    test('getAllGames returns empty list when no games exist', () async {
      final allGames = await database.gameDao.getAllGames();
@@ -104,7 +106,7 @@ void main() {
    // Verifies that getGameById throws a StateError when the game doesn't exist.
    test('getGameById throws exception for non-existent game', () async {
      expect(
-        () => database.gameDao.getGameById(gameId: 'non-existent-id'),
+            () => database.gameDao.getGameById(gameId: 'non-existent-id'),
        throwsA(isA<StateError>()),
      );
    });
@@ -132,12 +134,7 @@ void main() {

    // Verifies that a game with empty optional fields can be added and retrieved.
    test('addGame handles game with null optional fields', () async {
-      final gameWithNulls = Game(
-        name: 'Simple Game',
-        ruleset: Ruleset.lowestScore,
-        description: 'A simple game',
-        color: GameColor.green,
-      );
+      final gameWithNulls = Game(name: 'Simple Game', ruleset: Ruleset.lowestScore, description: 'A simple game', color: GameColor.green, icon: '');
      final result = await database.gameDao.addGame(game: gameWithNulls);
      expect(result, true);

@@ -422,7 +419,9 @@ void main() {

    // Verifies that getGameCount updates correctly after deleting a game.
    test('getGameCount updates correctly after deletion', () async {
-      await database.gameDao.addGamesAsList(games: [testGame1, testGame2]);
+      await database.gameDao.addGamesAsList(
+        games: [testGame1, testGame2],
+      );

      final countBefore = await database.gameDao.getGameCount();
      expect(countBefore, 2);
@@ -462,6 +461,7 @@ void main() {
        ruleset: Ruleset.multipleWinners,
        description: 'Description with émojis 🎮🎲',
        color: GameColor.purple,
+        icon: '',
      );
      await database.gameDao.addGame(game: specialGame);

@@ -478,6 +478,7 @@ void main() {
        name: '',
        ruleset: Ruleset.singleWinner,
        description: '',
+        icon: '',
        color: GameColor.red,
      );
      await database.gameDao.addGame(game: emptyGame);
@@ -499,6 +500,7 @@ void main() {
        description: longString,
        ruleset: Ruleset.multipleWinners,
        color: GameColor.yellow,
+        icon: '',
      );
      await database.gameDao.addGame(game: longGame);

--- a/test/db_tests/relationships/player_match_test.dart
+++ b/test/db_tests/relationships/player_match_test.dart
@@ -48,12 +48,7 @@ void main() {
        description: '',
        members: [testPlayer1, testPlayer2, testPlayer3],
      );
-      testGame = Game(
-        name: 'Test Game',
-        ruleset: Ruleset.singleWinner,
-        description: 'A test game',
-        color: GameColor.blue,
-      );
+      testGame = Game(name: 'Test Game', ruleset: Ruleset.singleWinner, description: 'A test game', color: GameColor.blue, icon: '');
      testMatchOnlyGroup = Match(
        name: 'Test Match with Group',
        game: testGame,
@@ -66,8 +61,14 @@ void main() {
        players: [testPlayer4, testPlayer5, testPlayer6],
        notes: '',
      );
-      testTeam1 = Team(name: 'Team Alpha', members: [testPlayer1, testPlayer2]);
-      testTeam2 = Team(name: 'Team Beta', members: [testPlayer3, testPlayer4]);
+      testTeam1 = Team(
+        name: 'Team Alpha',
+        members: [testPlayer1, testPlayer2],
+      );
+      testTeam2 = Team(
+        name: 'Team Beta',
+        members: [testPlayer3, testPlayer4],
+      );
    });
    await database.playerDao.addPlayersAsList(
      players: [
@@ -87,6 +88,7 @@ void main() {
  });

  group('Player-Match Tests', () {
+
    // Verifies that matchHasPlayers returns false initially and true after adding a player.
    test('Match has player works correctly', () async {
      await database.matchDao.addMatch(match: testMatchOnlyGroup);
@@ -151,23 +153,26 @@ void main() {
      );
      expect(result.players.length, testMatchOnlyPlayers.players.length - 1);

-      final playerExists = result.players.any((p) => p.id == playerToRemove.id);
+      final playerExists = result.players.any(
+            (p) => p.id == playerToRemove.id,
+      );
      expect(playerExists, false);
    });

    // Verifies that getPlayersOfMatch returns all players of a match with correct data.
    test('Retrieving players of a match works correctly', () async {
      await database.matchDao.addMatch(match: testMatchOnlyPlayers);
-      final players =
-          await database.playerMatchDao.getPlayersOfMatch(
-            matchId: testMatchOnlyPlayers.id,
-          ) ??
-          [];
+      final players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: testMatchOnlyPlayers.id,
+      ) ?? [];

      for (int i = 0; i < players.length; i++) {
        expect(players[i].id, testMatchOnlyPlayers.players[i].id);
        expect(players[i].name, testMatchOnlyPlayers.players[i].name);
-        expect(players[i].createdAt, testMatchOnlyPlayers.players[i].createdAt);
+        expect(
+          players[i].createdAt,
+          testMatchOnlyPlayers.players[i].createdAt,
+        );
      }
    });

@@ -218,20 +223,10 @@ void main() {
    // Verifies that the same player can be added to multiple different matches.
    test(
      'Adding the same player to separate matches works correctly',
-      () async {
+          () async {
        final playersList = [testPlayer1, testPlayer2, testPlayer3];
-        final match1 = Match(
-          name: 'Match 1',
-          game: testGame,
-          players: playersList,
-          notes: '',
-        );
-        final match2 = Match(
-          name: 'Match 2',
-          game: testGame,
-          players: playersList,
-          notes: '',
-        );
+        final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
+        final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');

        await Future.wait([
          database.matchDao.addMatch(match: match1),
@@ -304,19 +299,16 @@ void main() {
    });

    // Verifies that getPlayerScore returns null for non-existent player-match combination.
-    test(
-      'getPlayerScore returns null for non-existent player in match',
-      () async {
-        await database.matchDao.addMatch(match: testMatchOnlyGroup);
+    test('getPlayerScore returns null for non-existent player in match', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);

-        final score = await database.playerMatchDao.getPlayerScore(
-          matchId: testMatchOnlyGroup.id,
-          playerId: 'non-existent-player-id',
-        );
+      final score = await database.playerMatchDao.getPlayerScore(
+        matchId: testMatchOnlyGroup.id,
+        playerId: 'non-existent-player-id',
+      );

-        expect(score, isNull);
-      },
-    );
+      expect(score, isNull);
+    });

    // Verifies that updatePlayerScore updates the score correctly.
    test('updatePlayerScore updates score correctly', () async {
@@ -339,20 +331,17 @@ void main() {
    });

    // Verifies that updatePlayerScore returns false for non-existent player-match.
-    test(
-      'updatePlayerScore returns false for non-existent player-match',
-      () async {
-        await database.matchDao.addMatch(match: testMatchOnlyGroup);
+    test('updatePlayerScore returns false for non-existent player-match', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);

-        final updated = await database.playerMatchDao.updatePlayerScore(
-          matchId: testMatchOnlyGroup.id,
-          playerId: 'non-existent-player-id',
-          newScore: 50,
-        );
+      final updated = await database.playerMatchDao.updatePlayerScore(
+        matchId: testMatchOnlyGroup.id,
+        playerId: 'non-existent-player-id',
+        newScore: 50,
+      );

-        expect(updated, false);
-      },
-    );
+      expect(updated, false);
+    });

    // Verifies that adding a player with teamId works correctly.
    test('Adding player with teamId works correctly', () async {
@@ -442,20 +431,17 @@ void main() {
    });

    // Verifies that updatePlayerTeam returns false for non-existent player-match.
-    test(
-      'updatePlayerTeam returns false for non-existent player-match',
-      () async {
-        await database.matchDao.addMatch(match: testMatchOnlyGroup);
+    test('updatePlayerTeam returns false for non-existent player-match', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyGroup);

-        final updated = await database.playerMatchDao.updatePlayerTeam(
-          matchId: testMatchOnlyGroup.id,
-          playerId: 'non-existent-player-id',
-          teamId: testTeam1.id,
-        );
+      final updated = await database.playerMatchDao.updatePlayerTeam(
+        matchId: testMatchOnlyGroup.id,
+        playerId: 'non-existent-player-id',
+        teamId: testTeam1.id,
+      );

-        expect(updated, false);
-      },
-    );
+      expect(updated, false);
+    });

    // Verifies that getPlayersInTeam returns empty list for non-existent team.
    test('getPlayersInTeam returns empty list for non-existent team', () async {
@@ -497,19 +483,16 @@ void main() {
    });

    // Verifies that removePlayerFromMatch returns false for non-existent player.
-    test(
-      'removePlayerFromMatch returns false for non-existent player',
-      () async {
-        await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+    test('removePlayerFromMatch returns false for non-existent player', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);

-        final removed = await database.playerMatchDao.removePlayerFromMatch(
-          playerId: 'non-existent-player-id',
-          matchId: testMatchOnlyPlayers.id,
-        );
+      final removed = await database.playerMatchDao.removePlayerFromMatch(
+        playerId: 'non-existent-player-id',
+        matchId: testMatchOnlyPlayers.id,
+      );

-        expect(removed, false);
-      },
-    );
+      expect(removed, false);
+    });

    // Verifies that adding the same player twice to the same match is ignored.
    test('Adding same player twice to same match is ignored', () async {
@@ -545,30 +528,27 @@ void main() {
    });

    // Verifies that updatePlayersFromMatch with empty list removes all players.
-    test(
-      'updatePlayersFromMatch with empty list removes all players',
-      () async {
-        await database.matchDao.addMatch(match: testMatchOnlyPlayers);
+    test('updatePlayersFromMatch with empty list removes all players', () async {
+      await database.matchDao.addMatch(match: testMatchOnlyPlayers);

-        // Verify players exist initially
-        var players = await database.playerMatchDao.getPlayersOfMatch(
-          matchId: testMatchOnlyPlayers.id,
-        );
-        expect(players?.length, 3);
+      // Verify players exist initially
+      var players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: testMatchOnlyPlayers.id,
+      );
+      expect(players?.length, 3);

-        // Update with empty list
-        await database.playerMatchDao.updatePlayersFromMatch(
-          matchId: testMatchOnlyPlayers.id,
-          newPlayer: [],
-        );
+      // Update with empty list
+      await database.playerMatchDao.updatePlayersFromMatch(
+        matchId: testMatchOnlyPlayers.id,
+        newPlayer: [],
+      );

-        // Verify all players are removed
-        players = await database.playerMatchDao.getPlayersOfMatch(
-          matchId: testMatchOnlyPlayers.id,
-        );
-        expect(players, isNull);
-      },
-    );
+      // Verify all players are removed
+      players = await database.playerMatchDao.getPlayersOfMatch(
+        matchId: testMatchOnlyPlayers.id,
+      );
+      expect(players, isNull);
+    });

    // Verifies that updatePlayersFromMatch with same players makes no changes.
    test('updatePlayersFromMatch with same players makes no changes', () async {
@@ -722,19 +702,16 @@ void main() {
    });

    // Verifies that getPlayersInTeam returns empty list for non-existent match.
-    test(
-      'getPlayersInTeam returns empty list for non-existent match',
-      () async {
-        await database.teamDao.addTeam(team: testTeam1);
+    test('getPlayersInTeam returns empty list for non-existent match', () async {
+      await database.teamDao.addTeam(team: testTeam1);

-        final players = await database.playerMatchDao.getPlayersInTeam(
-          matchId: 'non-existent-match-id',
-          teamId: testTeam1.id,
-        );
+      final players = await database.playerMatchDao.getPlayersInTeam(
+        matchId: 'non-existent-match-id',
+        teamId: testTeam1.id,
+      );

-        expect(players.isEmpty, true);
-      },
-    );
+      expect(players.isEmpty, true);
+    });

    // Verifies that players in different teams within the same match are returned correctly.
    test('Players in different teams within same match are separate', () async {
@@ -782,18 +759,8 @@ void main() {
    // Verifies that removePlayerFromMatch does not affect other matches.
    test('removePlayerFromMatch does not affect other matches', () async {
      final playersList = [testPlayer1, testPlayer2];
-      final match1 = Match(
-        name: 'Match 1',
-        game: testGame,
-        players: playersList,
-        notes: '',
-      );
-      final match2 = Match(
-        name: 'Match 2',
-        game: testGame,
-        players: playersList,
-        notes: '',
-      );
+      final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
+      final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');

      await Future.wait([
        database.matchDao.addMatch(match: match1),
@@ -825,18 +792,8 @@ void main() {
    // Verifies that updating scores for players in different matches are independent.
    test('Player scores are independent across matches', () async {
      final playersList = [testPlayer1];
-      final match1 = Match(
-        name: 'Match 1',
-        game: testGame,
-        players: playersList,
-        notes: '',
-      );
-      final match2 = Match(
-        name: 'Match 2',
-        game: testGame,
-        players: playersList,
-        notes: '',
-      );
+      final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
+      final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');

      await Future.wait([
        database.matchDao.addMatch(match: match1),
@@ -872,19 +829,16 @@ void main() {
    });

    // Verifies that updatePlayersFromMatch on non-existent match fails with constraint error.
-    test(
-      'updatePlayersFromMatch on non-existent match fails with foreign key constraint',
-      () async {
-        // Should throw due to foreign key constraint - match doesn't exist
-        await expectLater(
-          database.playerMatchDao.updatePlayersFromMatch(
-            matchId: 'non-existent-match-id',
-            newPlayer: [testPlayer1, testPlayer2],
-          ),
-          throwsA(anything),
-        );
-      },
-    );
+    test('updatePlayersFromMatch on non-existent match fails with foreign key constraint', () async {
+      // Should throw due to foreign key constraint - match doesn't exist
+      await expectLater(
+        database.playerMatchDao.updatePlayersFromMatch(
+          matchId: 'non-existent-match-id',
+          newPlayer: [testPlayer1, testPlayer2],
+        ),
+        throwsA(anything),
+      );
+    });

    // Verifies that a player can be in a match without being assigned to a team.
    test('Player can exist in match without team assignment', () async {
--- a/test/db_tests/values/score_test.dart
+++ b/test/db_tests/values/score_test.dart
@@ -2,11 +2,11 @@ import 'package:clock/clock.dart';
 import 'package:drift/drift.dart' hide isNull, isNotNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
+import 'package:tallee/core/enums.dart';

 void main() {
  late AppDatabase database;
@@ -32,12 +32,7 @@ void main() {
      testPlayer1 = Player(name: 'Alice', description: '');
      testPlayer2 = Player(name: 'Bob', description: '');
      testPlayer3 = Player(name: 'Charlie', description: '');
-      testGame = Game(
-        name: 'Test Game',
-        ruleset: Ruleset.singleWinner,
-        description: 'A test game',
-        color: GameColor.blue,
-      );
+      testGame = Game(name: 'Test Game', ruleset: Ruleset.singleWinner, description: 'A test game', color: GameColor.blue, icon: '');
      testMatch1 = Match(
        name: 'Test Match 1',
        game: testGame,
@@ -65,6 +60,7 @@ void main() {
  });

  group('Score Tests', () {
+
    // Verifies that a score can be added and retrieved with all fields intact.
    test('Adding and fetching a score works correctly', () async {
      await database.scoreDao.addScore(
@@ -435,16 +431,13 @@ void main() {
    });

    // Verifies that getScoresForMatch returns empty list for match with no scores.
-    test(
-      'Getting scores for match with no scores returns empty list',
-      () async {
-        final scores = await database.scoreDao.getScoresForMatch(
-          matchId: testMatch1.id,
-        );
+    test('Getting scores for match with no scores returns empty list', () async {
+      final scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch1.id,
+      );

-        expect(scores.isEmpty, true);
-      },
-    );
+      expect(scores.isEmpty, true);
+    });

    // Verifies that getPlayerScoresInMatch returns empty list when player has no scores.
    test('Getting player scores with no scores returns empty list', () async {
@@ -673,58 +666,46 @@ void main() {
    });

    // Verifies that updating one player's score doesn't affect another player's score in same round.
-    test(
-      'Updating one player score does not affect other players in same round',
-      () async {
-        await database.scoreDao.addScore(
-          playerId: testPlayer1.id,
-          matchId: testMatch1.id,
-          roundNumber: 1,
-          score: 10,
-          change: 10,
-        );
-        await database.scoreDao.addScore(
-          playerId: testPlayer2.id,
-          matchId: testMatch1.id,
-          roundNumber: 1,
-          score: 20,
-          change: 20,
-        );
-        await database.scoreDao.addScore(
-          playerId: testPlayer3.id,
-          matchId: testMatch1.id,
-          roundNumber: 1,
-          score: 30,
-          change: 30,
-        );
+    test('Updating one player score does not affect other players in same round', () async {
+      await database.scoreDao.addScore(
+        playerId: testPlayer1.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 10,
+        change: 10,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 20,
+        change: 20,
+      );
+      await database.scoreDao.addScore(
+        playerId: testPlayer3.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        score: 30,
+        change: 30,
+      );

-        await database.scoreDao.updateScore(
-          playerId: testPlayer2.id,
-          matchId: testMatch1.id,
-          roundNumber: 1,
-          newScore: 99,
-          newChange: 89,
-        );
+      await database.scoreDao.updateScore(
+        playerId: testPlayer2.id,
+        matchId: testMatch1.id,
+        roundNumber: 1,
+        newScore: 99,
+        newChange: 89,
+      );

-        final scores = await database.scoreDao.getScoresForMatch(
-          matchId: testMatch1.id,
-        );
+      final scores = await database.scoreDao.getScoresForMatch(
+        matchId: testMatch1.id,
+      );

-        expect(scores.length, 3);
-        expect(
-          scores.where((s) => s.playerId == testPlayer1.id).first.score,
-          10,
-        );
-        expect(
-          scores.where((s) => s.playerId == testPlayer2.id).first.score,
-          99,
-        );
-        expect(
-          scores.where((s) => s.playerId == testPlayer3.id).first.score,
-          30,
-        );
-      },
-    );
+      expect(scores.length, 3);
+      expect(scores.where((s) => s.playerId == testPlayer1.id).first.score, 10);
+      expect(scores.where((s) => s.playerId == testPlayer2.id).first.score, 99);
+      expect(scores.where((s) => s.playerId == testPlayer3.id).first.score, 30);
+    });

    // Verifies that deleting a player's scores only affects that specific player.
    test('Deleting player scores only affects target player', () async {
@@ -743,7 +724,9 @@ void main() {
        change: 20,
      );

-      await database.scoreDao.deleteScoresForPlayer(playerId: testPlayer1.id);
+      await database.scoreDao.deleteScoresForPlayer(
+        playerId: testPlayer1.id,
+      );

      final match1Scores = await database.scoreDao.getScoresForMatch(
        matchId: testMatch1.id,