remove group_match_dao

lib/data/dao/group_match_dao.dart

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

lib/data/dao/group_match_dao.g.dart

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

lib/data/db/database.dart

@@ -1,12 +1,10 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
 import 'package:game_tracker/data/dao/group_dao.dart';
-import 'package:game_tracker/data/dao/group_match_dao.dart';
 import 'package:game_tracker/data/dao/match_dao.dart';
 import 'package:game_tracker/data/dao/player_dao.dart';
 import 'package:game_tracker/data/dao/player_group_dao.dart';
 import 'package:game_tracker/data/dao/player_match_dao.dart';
-import 'package:game_tracker/data/db/tables/group_match_table.dart';
 import 'package:game_tracker/data/db/tables/group_table.dart';
 import 'package:game_tracker/data/db/tables/match_table.dart';
 import 'package:game_tracker/data/db/tables/player_group_table.dart';
@@ -22,16 +20,14 @@ part 'database.g.dart';
     GroupTable,
     MatchTable,
     PlayerGroupTable,
-    PlayerMatchTable,
+    PlayerMatchTable
-    GroupMatchTable,
   ],
   daos: [
     PlayerDao,
     GroupDao,
     MatchDao,
     PlayerGroupDao,
-    PlayerMatchDao,
+    PlayerMatchDao
-    GroupMatchDao,
   ],
 )
 class AppDatabase extends _$AppDatabase {

lib/data/db/tables/game_table.dart

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

lib/data/db/tables/group_match_table.dart

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

lib/data/db/tables/group_table.dart

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

lib/data/db/tables/match_table.dart

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

lib/data/db/tables/player_match_table.dart

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

lib/data/db/tables/player_table.dart

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

lib/data/db/tables/score_table.dart

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

lib/data/db/tables/team_table.dart

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

lib/l10n/arb/app_de.arb

@@ -18,11 +18,7 @@
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
   "delete_all_data": "Alle Daten löschen",
-  "delete_group": "Diese Gruppe löschen",
-  "edit_group": "Gruppe bearbeiten",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, 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",
   "export_canceled": "Export abgebrochen",
   "export_data": "Daten exportieren",

lib/l10n/arb/app_en.arb

@@ -62,21 +62,9 @@
   "@delete_all_data": {
     "description": "Confirmation dialog for deleting all data"
   },
-  "@delete_group": {
-    "description": "Confirmation dialog for deleting a group"
-  },
-  "@edit_group": {
-      "description": "Button & Appbar label for editing a group"
-  },
   "@error_creating_group": {
     "description": "Error message when group creation fails"
   },
-  "@error_deleting_group": {
-      "description": "Error message when group deletion fails"
-  },
-  "@error_editing_group": {
-      "description": "Error message when group editing fails"
-  },
   "@error_reading_file": {
     "description": "Error message when file cannot be read"
   },
@@ -290,11 +278,7 @@
   "days_ago": "{count} days ago",
   "delete": "Delete",
   "delete_all_data": "Delete all data",
-  "delete_group": "Delete this group",
-  "edit_group": "Edit Group",
   "error_creating_group": "Error while creating group, 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",
   "export_canceled": "Export canceled",
   "export_data": "Export data",

lib/l10n/generated/app_localizations.dart

@@ -212,36 +212,12 @@ abstract class AppLocalizations {
   /// **'Delete all data'**
   String get delete_all_data;
 
-  /// Confirmation dialog for deleting a group
-  ///
-  /// In en, this message translates to:
-  /// **'Delete this group'**
-  String get delete_group;
-
-  /// Button & Appbar label for editing a group
-  ///
-  /// In en, this message translates to:
-  /// **'Edit Group'**
-  String get edit_group;
-
   /// Error message when group creation fails
   ///
   /// In en, this message translates to:
   /// **'Error while creating group, please try again'**
   String get error_creating_group;
 
-  /// Error message when group deletion fails
-  ///
-  /// In en, this message translates to:
-  /// **'Error while deleting group, please try again'**
-  String get error_deleting_group;
-
-  /// Error message when group editing fails
-  ///
-  /// In en, this message translates to:
-  /// **'Error while editing group, please try again'**
-  String get error_editing_group;
-
   /// Error message when file cannot be read
   ///
   /// In en, this message translates to:

lib/l10n/generated/app_localizations_de.dart

@@ -69,24 +69,10 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get delete_all_data => 'Alle Daten löschen';
 
-  @override
-  String get delete_group => 'Diese Gruppe löschen';
-
-  @override
-  String get edit_group => 'Gruppe bearbeiten';
-
   @override
   String get error_creating_group =>
       'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';
 
-  @override
-  String get error_deleting_group =>
-      'Fehler beim Löschen der Gruppe, bitte erneut versuchen';
-
-  @override
-  String get error_editing_group =>
-      'Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen';
-
   @override
   String get error_reading_file => 'Fehler beim Lesen der Datei';
 

lib/l10n/generated/app_localizations_en.dart

@@ -69,24 +69,10 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get delete_all_data => 'Delete all data';
 
-  @override
-  String get delete_group => 'Delete this group';
-
-  @override
-  String get edit_group => 'Edit Group';
-
   @override
   String get error_creating_group =>
       'Error while creating group, please try again';
 
-  @override
-  String get error_deleting_group =>
-      'Error while deleting group, please try again';
-
-  @override
-  String get error_editing_group =>
-      'Error while editing group, please try again';
-
   @override
   String get error_reading_file => 'Error reading file';
 

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

@@ -0,0 +1,113 @@
+import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
+import 'package:game_tracker/presentation/widgets/player_selection.dart';
+import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
+import 'package:provider/provider.dart';
+
+class CreateGroupView extends StatefulWidget {
+  const CreateGroupView({super.key});
+
+  @override
+  State<CreateGroupView> createState() => _CreateGroupViewState();
+}
+
+class _CreateGroupViewState extends State<CreateGroupView> {
+  late final AppDatabase db;
+
+  /// Controller for the group name input field
+  final _groupNameController = TextEditingController();
+
+  /// List of currently selected players
+  List<Player> selectedPlayers = [];
+
+  @override
+  void initState() {
+    super.initState();
+    db = Provider.of<AppDatabase>(context, listen: false);
+    _groupNameController.addListener(() {
+      setState(() {});
+    });
+  }
+
+  @override
+  void dispose() {
+    _groupNameController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+    return ScaffoldMessenger(
+      child: Scaffold(
+        backgroundColor: CustomTheme.backgroundColor,
+        appBar: AppBar(title: Text(loc.create_new_group)),
+        body: SafeArea(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Container(
+                margin: CustomTheme.standardMargin,
+                child: TextInputField(
+                  controller: _groupNameController,
+                  hintText: loc.group_name,
+                ),
+              ),
+              Expanded(
+                child: PlayerSelection(
+                  onChanged: (value) {
+                    setState(() {
+                      selectedPlayers = [...value];
+                    });
+                  },
+                ),
+              ),
+              CustomWidthButton(
+                text: loc.create_group,
+                sizeRelativeToWidth: 0.95,
+                buttonType: ButtonType.primary,
+                onPressed:
+                    (_groupNameController.text.isEmpty ||
+                        (selectedPlayers.length < 2))
+                    ? null
+                    : () async {
+                        bool success = await db.groupDao.addGroup(
+                          group: Group(
+                            name: _groupNameController.text.trim(),
+                            members: selectedPlayers,
+                          ),
+                        );
+                        if (!context.mounted) return;
+                        if (success) {
+                          Navigator.pop(context);
+                        } else {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              backgroundColor: CustomTheme.boxColor,
+                              content: Center(
+                                child: Text(
+                                  AppLocalizations.of(
+                                    context,
+                                  ).error_creating_group,
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                              ),
+                            ),
+                          );
+                        }
+                      },
+              ),
+              const SizedBox(height: 20),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

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

@@ -1,181 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/player.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
-import 'package:game_tracker/presentation/widgets/player_selection.dart';
-import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
-import 'package:provider/provider.dart';
-
-class GroupDetailView extends StatefulWidget {
-  const GroupDetailView({super.key, this.groupToEdit});
-
-  /// The group to edit, if any
-  final Group? groupToEdit;
-
-  @override
-  State<GroupDetailView> createState() => _GroupDetailViewState();
-}
-
-class _GroupDetailViewState extends State<GroupDetailView> {
-  late final AppDatabase db;
-
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
-  /// Controller for the group name input field
-  final _groupNameController = TextEditingController();
-
-  /// List of currently selected players
-  List<Player> selectedPlayers = [];
-
-  /// List of initially selected players (when editing a group)
-  List<Player> initialSelectedPlayers = [];
-
-  @override
-  void initState() {
-    super.initState();
-    db = Provider.of<AppDatabase>(context, listen: false);
-    if(widget.groupToEdit != null) {
-      _groupNameController.text = widget.groupToEdit!.name;
-      setState(() {
-        initialSelectedPlayers = widget.groupToEdit!.members;
-        selectedPlayers = widget.groupToEdit!.members;
-      });
-    }
-    _groupNameController.addListener(() {
-      setState(() {});
-    });
-  }
-
-  @override
-  void dispose() {
-    _groupNameController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
-      key: _scaffoldMessengerKey,
-      child: Scaffold(
-        backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(title: Text(widget.groupToEdit == null ? loc.create_new_group : loc.edit_group), actions: widget.groupToEdit == null ? [] : [IconButton(icon: const Icon(Icons.delete), onPressed: () async {
-          if(widget.groupToEdit != null) {
-            showDialog<bool>(
-              context: context,
-              builder: (context) => AlertDialog(
-                title: Text(loc.delete_group),
-                content: Text(loc.this_cannot_be_undone),
-                actions: [
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(false),
-                    child: Text(loc.cancel),
-                  ),
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(true),
-                    child: Text(loc.delete),
-                  ),
-                ],
-              ),
-            ).then((confirmed) async {
-              if (confirmed == true && context.mounted) {
-                bool success = await db.groupDao.deleteGroup(groupId: widget.groupToEdit!.id);
-                if (!context.mounted) return;
-                if (success) {
-                  Navigator.pop(context);
-                } else {
-                  showSnackbar(message: loc.error_deleting_group);
-                }
-              }
-            });
-          }
-        },)],),
-        body: SafeArea(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              Container(
-                margin: CustomTheme.standardMargin,
-                child: TextInputField(
-                  controller: _groupNameController,
-                  hintText: loc.group_name,
-                ),
-              ),
-              Expanded(
-                child: PlayerSelection(
-                  initialSelectedPlayers: initialSelectedPlayers,
-                  onChanged: (value) {
-                    setState(() {
-                      selectedPlayers = [...value];
-                    });
-                  },
-                ),
-              ),
-              CustomWidthButton(
-                text: widget.groupToEdit == null ? loc.create_group : loc.edit_group,
-                sizeRelativeToWidth: 0.95,
-                buttonType: ButtonType.primary,
-                onPressed:
-                    (_groupNameController.text.isEmpty ||
-                        (selectedPlayers.length < 2))
-                    ? null
-                    : () async {
-                        late bool success;
-                        if (widget.groupToEdit == null) {
-                          success = await db.groupDao.addGroup(
-                            group: Group(
-                              name: _groupNameController.text.trim(),
-                              members: selectedPlayers,
-                            ),
-                          );
-                        } else {
-                          //TODO: Implement group editing in database
-                          /*
-                          success = await db.groupDao.updateGroup(
-                            group: Group(
-                              id: widget.groupToEdit!.id,
-                              name: _groupNameController.text.trim(),
-                              members: selectedPlayers,
-                            ),
-                          );
-                          */
-                          success = false;
-                        }
-                        if (!context.mounted) return;
-                        if (success) {
-                          Navigator.pop(context);
-                        } else {
-                          showSnackbar(message: widget.groupToEdit == null ? loc.error_creating_group : loc.error_editing_group);
-                        }
-                      },
-              ),
-              const SizedBox(height: 20),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-  /// 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,
-        ),
-      );
-    }
-  }
-}

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

@@ -6,7 +6,7 @@ import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/group_view/group_detail_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/create_group_view.dart';
 import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
 import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
@@ -73,19 +73,7 @@ class _GroupsViewState extends State<GroupsView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return GroupTile(group: groups[index], onTap: () async {
+                  return GroupTile(group: groups[index]);
-                    await Navigator.push(
-                      context,
-                      adaptivePageRoute(
-                        builder: (context) {
-                          return GroupDetailView(groupToEdit: groups[index]);
-                        },
-                      ),
-                    );
-                    setState(() {
-                      loadGroups();
-                    });
-                  });
                 },
               ),
             ),
@@ -100,7 +88,7 @@ class _GroupsViewState extends State<GroupsView> {
                   context,
                   adaptivePageRoute(
                     builder: (context) {
-                      return const GroupDetailView();
+                      return const CreateGroupView();
                     },
                   ),
                 );

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

@@ -70,9 +70,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// List of available rulesets with their localized string representations
   late final List<(Ruleset, String)> _rulesets;
 
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
   @override
   void initState() {
     super.initState();
@@ -123,7 +120,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
-      key: _scaffoldMessengerKey,
       child: Scaffold(
         backgroundColor: CustomTheme.backgroundColor,
         appBar: AppBar(title: Text(loc.create_new_match)),

lib/presentation/views/main_menu/settings_view.dart

@@ -14,10 +14,6 @@ class SettingsView extends StatefulWidget {
 }
 
 class _SettingsViewState extends State<SettingsView> {
-
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
   PackageInfo _packageInfo = PackageInfo(
     appName: 'n.A.',
     packageName: 'n.A.',
@@ -34,7 +30,6 @@ class _SettingsViewState extends State<SettingsView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
-      key: _scaffoldMessengerKey,
       child: Scaffold(
         appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
         backgroundColor: CustomTheme.backgroundColor,

lib/presentation/widgets/player_selection.dart

@@ -70,7 +70,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
     suggestedPlayers = skeletonData;
-    selectedPlayers = widget.initialSelectedPlayers ?? [];
     loadPlayerList();
   }
 
@@ -100,7 +99,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                 if (value.isEmpty) {
                   // If the search is empty, it shows all unselected players.
                   suggestedPlayers = allPlayers.where((player) {
-                    return !selectedPlayers.any((p) => p.id == player.id);
+                    return !selectedPlayers.contains(player);
                   }).toList();
                 } else {
                   // If there is input, it filters by name match (case-insensitive) and ensures
@@ -109,7 +108,9 @@ 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.contains(
+                      player,
+                    );
                     return nameMatches && isNotSelected;
                   }).toList();
                 }
@@ -124,49 +125,46 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           const SizedBox(height: 10),
           SizedBox(
             height: 50,
-            child: AppSkeleton(
+            child: selectedPlayers.isEmpty
-              enabled: isLoading,
+                ? Center(child: Text(loc.no_players_selected))
-              child: selectedPlayers.isEmpty
+                : SingleChildScrollView(
-                  ? Center(child: Text(loc.no_players_selected))
+                    scrollDirection: Axis.horizontal,
-                  : SingleChildScrollView(
+                    child: Row(
-                      scrollDirection: Axis.horizontal,
+                      children: [
-                      child: Row(
+                        for (var player in selectedPlayers)
-                        children: [
+                          Padding(
-                          for (var player in selectedPlayers)
+                            padding: const EdgeInsets.only(right: 8.0),
-                            Padding(
+                            child: TextIconTile(
-                              padding: const EdgeInsets.only(right: 8.0),
+                              text: player.name,
-                              child: TextIconTile(
+                              onIconTap: () {
-                                text: player.name,
+                                setState(() {
-                                onIconTap: () {
+                                  // Removes the player from the selection and notifies the parent.
-                                  setState(() {
+                                  selectedPlayers.remove(player);
-                                    // Removes the player from the selection and notifies the parent.
+                                  widget.onChanged([...selectedPlayers]);
-                                    selectedPlayers.remove(player);
-                                    widget.onChanged([...selectedPlayers]);
 
-                                    // Get the current search query
+                                  // Get the current search query
-                                    final currentSearch = _searchBarController
+                                  final currentSearch = _searchBarController
-                                        .text
+                                      .text
-                                        .toLowerCase();
+                                      .toLowerCase();
 
-                                    // If the player matches the current search query (or search is empty),
+                                  // If the player matches the current search query (or search is empty),
-                                    // they are added back to the `suggestedPlayers` and the list is re-sorted.
+                                  // they are added back to the `suggestedPlayers` and the list is re-sorted.
-                                    if (currentSearch.isEmpty ||
+                                  if (currentSearch.isEmpty ||
-                                        player.name.toLowerCase().contains(
+                                      player.name.toLowerCase().contains(
-                                          currentSearch,
+                                        currentSearch,
-                                        )) {
+                                      )) {
-                                      suggestedPlayers.add(player);
+                                    suggestedPlayers.add(player);
-                                      suggestedPlayers.sort(
+                                    suggestedPlayers.sort(
-                                        (a, b) => a.name.compareTo(b.name),
+                                      (a, b) => a.name.compareTo(b.name),
-                                      );
+                                    );
-                                    }
+                                  }
-                                  });
+                                });
-                                },
+                              },
-                              ),
                             ),
-                        ],
+                          ),
-                      ),
+                      ],
                     ),
-            ),
+                  ),
           ),
           const SizedBox(height: 10),
           Text(
@@ -245,21 +243,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
             // Otherwise, use the loaded players from the database.
             loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
             allPlayers = [...loadedPlayers];
-            if (widget.initialSelectedPlayers != null) {
+            suggestedPlayers = [...loadedPlayers];
-              // 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;
         });

lib/presentation/widgets/tiles/group_tile.dart

@@ -6,9 +6,8 @@ import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 /// A tile widget that displays information about a group, including its name and members.
 /// - [group]: The group data to be displayed.
 /// - [isHighlighted]: Whether the tile should be highlighted.
-/// - [onTap]: An optional callback function to handle tap events.
 class GroupTile extends StatelessWidget {
-  const GroupTile({super.key, required this.group, this.isHighlighted = false, this.onTap});
+  const GroupTile({super.key, required this.group, this.isHighlighted = false});
 
   /// The group data to be displayed.
   final Group group;
@@ -16,67 +15,61 @@ class GroupTile extends StatelessWidget {
   /// Whether the tile should be highlighted.
   final bool isHighlighted;
 
-  /// Callback function to handle tap events.
-  final VoidCallback? onTap;
-
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
+    return AnimatedContainer(
-      onTap: onTap,
+      margin: CustomTheme.standardMargin,
-      child: AnimatedContainer(
+      padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
-        margin: CustomTheme.standardMargin,
+      decoration: isHighlighted
-        padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
+          ? CustomTheme.highlightedBoxDecoration
-        decoration: isHighlighted
+          : CustomTheme.standardBoxDecoration,
-            ? CustomTheme.highlightedBoxDecoration
+      duration: const Duration(milliseconds: 150),
-            : CustomTheme.standardBoxDecoration,
+      child: Column(
-        duration: const Duration(milliseconds: 150),
+        crossAxisAlignment: CrossAxisAlignment.start,
-        child: Column(
+        children: [
-          crossAxisAlignment: CrossAxisAlignment.start,
+          Row(
-          children: [
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            Row(
+            children: [
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              Flexible(
-              children: [
+                child: Text(
-                Flexible(
+                  group.name,
-                  child: Text(
+                  overflow: TextOverflow.ellipsis,
-                    group.name,
+                  style: const TextStyle(
-                    overflow: TextOverflow.ellipsis,
+                    fontWeight: FontWeight.bold,
+                    fontSize: 18,
+                  ),
+                ),
+              ),
+              Row(
+                children: [
+                  Text(
+                    '${group.members.length}',
                     style: const TextStyle(
-                      fontWeight: FontWeight.bold,
+                      fontWeight: FontWeight.w900,
                       fontSize: 18,
                     ),
                   ),
-                ),
+                  const SizedBox(width: 3),
-                Row(
+                  const Icon(Icons.group, size: 22),
-                  children: [
+                ],
-                    Text(
+              ),
-                      '${group.members.length}',
+            ],
-                      style: const TextStyle(
+          ),
-                        fontWeight: FontWeight.w900,
+          const SizedBox(height: 5),
-                        fontSize: 18,
+          Wrap(
-                      ),
+            alignment: WrapAlignment.start,
-                    ),
+            crossAxisAlignment: WrapCrossAlignment.start,
-                    const SizedBox(width: 3),
+            spacing: 12.0,
-                    const Icon(Icons.group, size: 22),
+            runSpacing: 8.0,
-                  ],
+            children: <Widget>[
-                ),
+              for (var member in [
-              ],
+                ...group.members,
-            ),
+              ]..sort((a, b) => a.name.compareTo(b.name)))
-            const SizedBox(height: 5),
+                TextIconTile(text: member.name, iconEnabled: false),
-            Wrap(
+            ],
-              alignment: WrapAlignment.start,
+          ),
-              crossAxisAlignment: WrapCrossAlignment.start,
+          const SizedBox(height: 2.5),
-              spacing: 12.0,
+        ],
-              runSpacing: 8.0,
-              children: <Widget>[
-                for (var member in [
-                  ...group.members,
-                ]..sort((a, b) => a.name.compareTo(b.name)))
-                  TextIconTile(text: member.name, iconEnabled: false),
-              ],
-            ),
-            const SizedBox(height: 2.5),
-          ],
-        ),
       ),
     );
   }