merge fix

# Conflicts:
#	lib/presentation/views/main_menu/group_view/create_group_view.dart
#	pubspec.yaml

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;
 }

lib/data/dto/game.dart

@@ -1,23 +0,0 @@
-import 'package:clock/clock.dart';
-import 'package:uuid/uuid.dart';
-
-class Game {
-  final String id;
-  final DateTime createdAt;
-  final String name;
-  final String? ruleset;
-  final String? description;
-  final int? color;
-  final String? icon;
-
-  Game({
-    String? id,
-    DateTime? createdAt,
-    required this.name,
-    this.ruleset,
-    this.description,
-    this.color,
-    this.icon,
-  })  : id = id ?? const Uuid().v4(),
-        createdAt = createdAt ?? clock.now();
-}

lib/l10n/arb/app_de.arb

@@ -10,7 +10,6 @@
   "choose_group": "Gruppe wählen",
   "choose_ruleset": "Regelwerk 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",
@@ -23,12 +22,13 @@
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
   "delete_all_data": "Alle Daten löschen",
-  "delete_game": "Spielvorlage löschen",
+  "delete_group": "Diese Gruppe löschen",
+  "edit_group": "Gruppe bearbeiten",
   "delete_group": "Gruppe löschen",
-  "description": "Beschreibung",
-  "edit_game": "Spielvorlage bearbeiten",
   "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

@@ -30,9 +30,6 @@
   "@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"
   },
@@ -40,10 +37,10 @@
     "description": "Button text to create a match"
   },
   "@create_new_group": {
-    "description": "Button text to create a new group"
+    "description": "Appbar text to create a new group"
   },
   "@create_new_match": {
-    "description": "Button text to create a new match"
+    "description": "Appbar text to create a new match"
   },
   "@created_on": {
     "description": "Label for creation date"
@@ -74,24 +71,21 @@
   "@delete_all_data": {
     "description": "Confirmation dialog for deleting all data"
   },
-  "@delete_game": {
-    "description": "Button text to delete a game"
-  },
   "@delete_group": {
-    "description": "Button text to delete a group"
+    "description": "Confirmation dialog for deleting a group"
   },
-  "description": {
-    "description": "Description label"
-  },
-  "edit_game": {
-    "description": "Button text to edit a game"
-   },
   "@edit_group": {
-    "description": "Button text to edit a 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"
   },
@@ -320,7 +314,6 @@
   "choose_group": "Choose Group",
   "choose_ruleset": "Choose Ruleset",
   "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",
@@ -333,12 +326,11 @@
   "days_ago": "{count} days ago",
   "delete": "Delete",
   "delete_all_data": "Delete all data",
-  "delete_game": "Delete Game",
   "delete_group": "Delete Group",
-  "description": "Description",
-  "edit_game": "Edit Game",
   "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

@@ -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:
@@ -170,12 +158,6 @@ abstract class AppLocalizations {
   /// **'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:
@@ -188,7 +170,7 @@ abstract class AppLocalizations {
   /// **'Create match'**
   String get create_match;
 
-  /// Button text to create a new group
+  /// Appbar text to create a new group
   ///
   /// In en, this message translates to:
   /// **'Create new group'**
@@ -200,7 +182,7 @@ abstract class AppLocalizations {
   /// **'Created on'**
   String get created_on;
 
-  /// Button text to create a new match
+  /// Appbar text to create a new match
   ///
   /// In en, this message translates to:
   /// **'Create new match'**
@@ -248,19 +230,13 @@ 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;
-
-  /// Button text to delete a group
+  /// Confirmation dialog for deleting a group
   ///
   /// In en, this message translates to:
   /// **'Delete Group'**
   String get delete_group;
 
-  /// Button text to edit a group
+  /// Button & Appbar label for editing a group
   ///
   /// In en, this message translates to:
   /// **'Edit Group'**
@@ -272,6 +248,18 @@ abstract class AppLocalizations {
   /// **'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

@@ -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';
 
@@ -46,9 +40,6 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Spieler:in $playerName konnte nicht hinzugefügt werden';
   }
 
-  @override
-  String get create_game => 'Spielvorlage erstellen';
-
   @override
   String get create_group => 'Gruppe erstellen';
 
@@ -87,9 +78,6 @@ 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';
 
@@ -100,6 +88,14 @@ class AppLocalizationsDe extends AppLocalizations {
   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

@@ -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';
 
@@ -46,9 +40,6 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Could not add player';
   }
 
-  @override
-  String get create_game => 'Create Game';
-
   @override
   String get create_group => 'Create Group';
 
@@ -87,9 +78,6 @@ 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';
 
@@ -100,6 +88,14 @@ class AppLocalizationsEn extends AppLocalizations {
   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/custom_navigation_bar.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/group_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/settings_view/settings_view.dart';

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

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -12,8 +11,10 @@ import 'package:game_tracker/presentation/widgets/text_input/text_input_field.da
 import 'package:provider/provider.dart';
 
 class CreateGroupView extends StatefulWidget {
-  /// A view that allows the user to create a new group
-  const CreateGroupView({super.key});
+  const CreateGroupView({super.key, this.groupToEdit});
+
+  /// The group to edit, if any
+  final Group? groupToEdit;
 
   @override
   State<CreateGroupView> createState() => _CreateGroupViewState();
@@ -22,16 +23,29 @@ class CreateGroupView extends StatefulWidget {
 class _CreateGroupViewState extends State<CreateGroupView> {
   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(() {});
     });
@@ -47,10 +61,42 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(title: Text(loc.create_new_group)),
+        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 {
+                  if (!mounted) return;
+                  showSnackbar(message: loc.error_deleting_group);
+                }
+              }
+            });
+          }
+        },)],),
         body: SafeArea(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -60,11 +106,11 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                 child: TextInputField(
                   controller: _groupNameController,
                   hintText: loc.group_name,
-                  maxLength: Constants.MAX_GROUP_NAME_LENGTH,
                 ),
               ),
               Expanded(
                 child: PlayerSelection(
+                  initialSelectedPlayers: initialSelectedPlayers,
                   onChanged: (value) {
                     setState(() {
                       selectedPlayers = [...value];
@@ -73,7 +119,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                 ),
               ),
               CustomWidthButton(
-                text: loc.create_group,
+                text: widget.groupToEdit == null ? loc.create_group : loc.edit_group,
                 sizeRelativeToWidth: 0.95,
                 buttonType: ButtonType.primary,
                 onPressed:
@@ -81,29 +127,34 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                         (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),
-                                ),
-                              ),
+                        late Group? updatedGroup;
+                        late bool success;
+                        if (widget.groupToEdit == null) {
+                          success = await db.groupDao.addGroup(
+                            group: Group(
+                              name: _groupNameController.text.trim(),
+                              members: selectedPlayers,
                             ),
                           );
+                        } else {
+                          updatedGroup = Group(
+                            id: widget.groupToEdit!.id,
+                            name: _groupNameController.text.trim(),
+                            members: selectedPlayers,
+                          );
+                          //TODO: Implement group editing in database
+                          /*
+                          success = await db.groupDao.updateGroup(
+                            group: updatedGroup,
+                          );
+                          */
+                          success = true;
+                        }
+                        if (!context.mounted) return;
+                        if (success) {
+                          Navigator.pop(context, updatedGroup);
+                        } else {
+                          showSnackbar(message: widget.groupToEdit == null ? loc.error_creating_group : loc.error_editing_group);
                         }
                       },
               ),
@@ -114,4 +165,21 @@ class _CreateGroupViewState extends State<CreateGroupView> {
       ),
     );
   }
+  /// 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/group_detail_view.dart

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/match.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/create_group_view.dart';
 import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
 import 'package:game_tracker/presentation/widgets/buttons/animated_dialog_button.dart';
 import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
@@ -15,10 +17,10 @@ import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
-class GroupProfileView extends StatefulWidget {
+class GroupDetailView extends StatefulWidget {
   /// A view that displays the profile of a group
   /// - [group]: The group to display
-  const GroupProfileView({
+  const GroupDetailView({
     super.key,
     required this.group,
     required this.callback,
@@ -30,12 +32,13 @@ class GroupProfileView extends StatefulWidget {
   final VoidCallback callback;
 
   @override
-  State<GroupProfileView> createState() => _GroupProfileViewState();
+  State<GroupDetailView> createState() => _GroupDetailViewState();
 }
 
-class _GroupProfileViewState extends State<GroupProfileView> {
+class _GroupDetailViewState extends State<GroupDetailView> {
   late final AppDatabase db;
   bool isLoading = true;
+  late Group _group;
 
   /// Total matches played in this group
   int totalMatches = 0;
@@ -45,6 +48,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
   @override
   void initState() {
     super.initState();
+    _group = widget.group;
     db = Provider.of<AppDatabase>(context, listen: false);
     _loadStatistics();
   }
@@ -85,7 +89,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                 ),
               ).then((confirmed) async {
                 if (confirmed! && context.mounted) {
-                  await db.groupDao.deleteGroup(groupId: widget.group.id);
+                  await db.groupDao.deleteGroup(groupId: _group.id);
                   if (!context.mounted) return;
                   Navigator.pop(context);
                   widget.callback.call();
@@ -116,7 +120,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                 ),
                 const SizedBox(height: 10),
                 Text(
-                  widget.group.name,
+                  _group.name,
                   style: const TextStyle(
                     fontSize: 28,
                     fontWeight: FontWeight.bold,
@@ -126,7 +130,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                 ),
                 const SizedBox(height: 5),
                 Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.group.createdAt)}',
+                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(_group.createdAt)}',
                   style: const TextStyle(
                     fontSize: 12,
                     color: CustomTheme.textColor,
@@ -143,7 +147,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                     crossAxisAlignment: WrapCrossAlignment.start,
                     spacing: 12,
                     runSpacing: 8,
-                    children: widget.group.members.map((member) {
+                    children: _group.members.map((member) {
                       return TextIconTile(
                         text: member.name,
                         iconEnabled: false,
@@ -161,7 +165,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
                       children: [
                         _buildStatRow(
                           loc.members,
-                          widget.group.members.length.toString(),
+                          _group.members.length.toString(),
                         ),
                         _buildStatRow(
                           loc.played_matches,
@@ -179,19 +183,24 @@ class _GroupProfileViewState extends State<GroupProfileView> {
               child: MainMenuButton(
                 text: loc.edit_group,
                 icon: Icons.edit,
-                onPressed: () {
-                  // TODO: Uncomment when GroupDetailView is implemented
-                  /*
-                  await Navigator.push(
+                onPressed: () async {
+                  final updatedGroup = await Navigator.push<Group?>(
                     context,
                     adaptivePageRoute(
                       builder: (context) {
-
-                        return const GroupDetailView();
+                        return CreateGroupView(
+                          groupToEdit: _group,
+                        );
                       },
                     ),
-                  );*/
-                  print('Edit Group pressed');
+                  );
+                  if (updatedGroup != null && mounted) {
+                    setState(() {
+                      _group = updatedGroup;
+                    });
+                    _loadStatistics();
+                    widget.callback();
+                  }
                 },
               ),
             ),
@@ -233,9 +242,8 @@ class _GroupProfileViewState extends State<GroupProfileView> {
   /// Loads statistics for this group
   Future<void> _loadStatistics() async {
     final matches = await db.matchDao.getAllMatches();
-    final groupMatches = matches
-        .where((match) => match.group?.id == widget.group.id)
-        .toList();
+    final groupMatches =
+    matches.where((match) => match.group?.id == _group.id).toList();
 
     setState(() {
       totalMatches = groupMatches.length;
@@ -253,7 +261,7 @@ class _GroupProfileViewState extends State<GroupProfileView> {
       if (match.winner != null) {
         bestPlayerCounts.update(
           match.winner!,
-          (value) => value + 1,
+              (value) => value + 1,
           ifAbsent: () => 1,
         );
       }

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

@@ -6,8 +6,8 @@ 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/views/main_menu/group_view/group_profile_view.dart';
 import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
 import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
@@ -82,7 +82,7 @@ class _GroupsViewState extends State<GroupsView> {
                         context,
                         adaptivePageRoute(
                           builder: (context) {
-                            return GroupProfileView(
+                            return GroupDetailView(
                               group: groups[index],
                               callback: loadGroups,
                             );

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

@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/data/dto/game.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/game_view/create_game_view.dart';
 import 'package:game_tracker/presentation/widgets/text_input/custom_search_bar.dart';
 import 'package:game_tracker/presentation/widgets/tiles/title_description_list_tile.dart';
 
@@ -54,17 +51,6 @@ class _ChooseGameViewState extends State<ChooseGameView> {
             Navigator.of(context).pop(selectedGameIndex);
           },
         ),
-        actions: [IconButton(
-          icon: const Icon(Icons.add),
-          onPressed: () async {
-            await Navigator.push(context, adaptivePageRoute(
-              builder: (context) => CreateGameView(
-                callback: () {}, //TODO: implement callback
-              ),
-            )
-            );
-          },
-        )],
         title: Text(loc.choose_game),
       ),
       body: PopScope(
@@ -99,7 +85,7 @@ class _ChooseGameViewState extends State<ChooseGameView> {
                       context,
                     ),
                     isHighlighted: selectedGameIndex == index,
-                    onTap: () async {
+                    onPressed: () async {
                       setState(() {
                         if (selectedGameIndex == index) {
                           selectedGameIndex = -1;
@@ -108,16 +94,6 @@ class _ChooseGameViewState extends State<ChooseGameView> {
                         }
                       });
                     },
-                    onLongPress: () async {
-                      await Navigator.push(context, adaptivePageRoute(
-                        builder: (context) => CreateGameView(
-                          //TODO: implement callback & giving real game to create game view
-                          gameToEdit: Game(name: 'Cabo', description: '', ruleset: 'Highest Points'),
-                          callback: () {},
-                        ),
-                      )
-                      );
-                    },
                   );
                 },
               ),

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

@@ -64,6 +64,9 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// The currently selected players
   List<Player>? selectedPlayers;
 
+  /// GlobalKey for ScaffoldMessenger to show snackbars
+  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
   @override
   void initState() {
     super.initState();
@@ -107,6 +110,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,

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

@@ -1,93 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/widgets/tiles/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,
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/presentation/views/main_menu/match_view/create_match/game_view/create_game_view.dart

@@ -1,140 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/adaptive_page_route.dart';
-import 'package:game_tracker/core/constants.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/data/dto/game.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/game_view/choose_ruleset_view.dart';
-import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
-import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
-import 'package:game_tracker/presentation/widgets/tiles/choose_tile.dart';
-
-class CreateGameView extends StatefulWidget {
-  const CreateGameView({super.key, this.gameToEdit, required this.callback});
-
-  final Game? gameToEdit;
-
-  final VoidCallback callback;
-
-  @override
-  State<CreateGameView> createState() => _CreateGameViewState();
-}
-
-class _CreateGameViewState extends State<CreateGameView> {
-  Ruleset? selectedRuleset;
-  int selectedRulesetIndex = -1;
-  late List<(Ruleset, String)> _rulesets;
-
-  final _gameNameController = TextEditingController();
-  final _descriptionController = TextEditingController();
-
-  @override
-  void initState() {
-    super.initState();
-    _gameNameController.addListener(() => setState(() {}));
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    final loc = AppLocalizations.of(context);
-    _rulesets = [
-      (Ruleset.singleWinner, loc.ruleset_single_winner),
-      (Ruleset.singleLoser, loc.ruleset_single_loser),
-      (Ruleset.mostPoints, loc.ruleset_most_points),
-      (Ruleset.leastPoints, loc.ruleset_least_points),
-    ];
-
-    if (widget.gameToEdit != null) {
-      _gameNameController.text = widget.gameToEdit!.name;
-      _descriptionController.text = widget.gameToEdit!.description ?? '';
-      // TODO: Handle ruleset initialization from gameToEdit
-    }
-  }
-
-  @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),
-        ),
-        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);
-                    });
-                  }
-                },
-              ),
-              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_group : loc.create_game,
-                  sizeRelativeToWidth: 1,
-                  buttonType: ButtonType.primary,
-                  onPressed: _gameNameController.text.trim().isNotEmpty && selectedRulesetIndex != -1
-                      ? () {
-                          //TODO: Handle saving to db & updating game selection view
-                          Navigator.of(context).pop();
-                        }
-                      : null,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

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

@@ -31,6 +31,7 @@ class _SettingsViewState extends State<SettingsView> {
     version: 'n.A.',
     buildNumber: 'n.A.',
   );
+
   @override
   void initState() {
     super.initState();

lib/presentation/widgets/player_selection.dart

@@ -70,6 +70,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
     suggestedPlayers = skeletonData;
+    selectedPlayers = widget.initialSelectedPlayers ?? [];
     loadPlayerList();
   }
 
@@ -84,7 +85,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           CustomSearchBar(
-            maxLength: Constants.MAX_PLAYER_NAME_LENGTH,
             controller: _searchBarController,
             constraints: const BoxConstraints(maxHeight: 45, minHeight: 45),
             hintText: loc.search_for_players,
@@ -100,7 +100,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.contains(player);
+                    return !selectedPlayers.any((p) => p.id == player.id);
                   }).toList();
                 } else {
                   // If there is input, it filters by name match (case-insensitive) and ensures
@@ -109,9 +109,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                     final bool nameMatches = player.name.toLowerCase().contains(
                       value.toLowerCase(),
                     );
-                    final bool isNotSelected = !selectedPlayers.contains(
-                      player,
-                    );
+                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
                     return nameMatches && isNotSelected;
                   }).toList();
                 }
@@ -126,46 +124,49 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           const SizedBox(height: 10),
           SizedBox(
             height: 50,
-            child: selectedPlayers.isEmpty
-                ? Center(child: Text(loc.no_players_selected))
-                : SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    child: Row(
-                      children: [
-                        for (var player in selectedPlayers)
-                          Padding(
-                            padding: const EdgeInsets.only(right: 8.0),
-                            child: TextIconTile(
-                              text: player.name,
-                              onIconTap: () {
-                                setState(() {
-                                  // Removes the player from the selection and notifies the parent.
-                                  selectedPlayers.remove(player);
-                                  widget.onChanged([...selectedPlayers]);
+            child: AppSkeleton(
+              enabled: isLoading,
+              child: selectedPlayers.isEmpty
+                  ? Center(child: Text(loc.no_players_selected))
+                  : SingleChildScrollView(
+                      scrollDirection: Axis.horizontal,
+                      child: Row(
+                        children: [
+                          for (var player in selectedPlayers)
+                            Padding(
+                              padding: const EdgeInsets.only(right: 8.0),
+                              child: TextIconTile(
+                                text: player.name,
+                                onIconTap: () {
+                                  setState(() {
+                                    // Removes the player from the selection and notifies the parent.
+                                    selectedPlayers.remove(player);
+                                    widget.onChanged([...selectedPlayers]);
 
-                                  // Get the current search query
-                                  final currentSearch = _searchBarController
-                                      .text
-                                      .toLowerCase();
+                                    // Get the current search query
+                                    final currentSearch = _searchBarController
+                                        .text
+                                        .toLowerCase();
 
-                                  // 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.
-                                  if (currentSearch.isEmpty ||
-                                      player.name.toLowerCase().contains(
-                                        currentSearch,
-                                      )) {
-                                    suggestedPlayers.add(player);
-                                    suggestedPlayers.sort(
-                                      (a, b) => a.name.compareTo(b.name),
-                                    );
-                                  }
-                                });
-                              },
+                                    // 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.
+                                    if (currentSearch.isEmpty ||
+                                        player.name.toLowerCase().contains(
+                                          currentSearch,
+                                        )) {
+                                      suggestedPlayers.add(player);
+                                      suggestedPlayers.sort(
+                                        (a, b) => a.name.compareTo(b.name),
+                                      );
+                                    }
+                                  });
+                                },
+                              ),
                             ),
-                          ),
-                      ],
+                        ],
+                      ),
                     ),
-                  ),
+            ),
           ),
           const SizedBox(height: 10),
           Text(
@@ -245,7 +246,21 @@ class _PlayerSelectionState extends State<PlayerSelection> {
             // Otherwise, use the loaded players from the database.
             loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
             allPlayers = [...loadedPlayers];
-            suggestedPlayers = [...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;
         });

lib/presentation/widgets/text_input/custom_search_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
 class CustomSearchBar extends StatelessWidget {
@@ -21,7 +22,6 @@ class CustomSearchBar extends StatelessWidget {
     this.onTrailingButtonPressed,
     this.onChanged,
     this.constraints,
-    this.maxLength,
   });
 
   /// The controller for the search bar's text input.
@@ -48,19 +48,15 @@ class CustomSearchBar extends StatelessWidget {
   /// The constraints for the search bar.
   final BoxConstraints? constraints;
 
-  /// Optional parameter for maximum length of the input text.
-  final int? maxLength;
-
   @override
   Widget build(BuildContext context) {
     /// Enforce maximum length on the input text
-    if (maxLength != null) {
-      if (controller.text.length > maxLength!) {
-        controller.text = controller.text.substring(0, maxLength);
-        controller.selection = TextSelection.fromPosition(
-          TextPosition(offset: controller.text.length),
-        );
-      }
+    const maxLength = Constants.MAX_PLAYER_NAME_LENGTH;
+    if (controller.text.length > maxLength) {
+      controller.text = controller.text.substring(0, maxLength);
+      controller.selection = TextSelection.fromPosition(
+        TextPosition(offset: controller.text.length),
+      );
     }
 
     return SearchBar(

lib/presentation/widgets/text_input/text_input_field.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
 class TextInputField extends StatelessWidget {
@@ -8,18 +7,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,30 +27,17 @@ 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(
       controller: controller,
       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 : '',
         enabledBorder: OutlineInputBorder(
           borderRadius: const BorderRadius.all(Radius.circular(12)),
           borderSide: BorderSide(color: CustomTheme.boxBorder),

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),

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.10+248
+version: 0.0.9+242
 
 environment:
   sdk: ^3.8.1