Removed counter

Implemented maxLength attribute
2026-01-17 22:41:02 +01:00 · 2026-01-17 22:40:56 +01:00
19 changed files with 261 additions and 247 deletions
--- a/lib/l10n/arb/app_de.arb
+++ b/lib/l10n/arb/app_de.arb
@@ -22,13 +22,9 @@
  "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",
  "delete_group": "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",
--- a/lib/l10n/arb/app_en.arb
+++ b/lib/l10n/arb/app_en.arb
@@ -37,10 +37,10 @@
    "description": "Button text to create a match"
  },
  "@create_new_group": {
-    "description": "Appbar text to create a new group"
+    "description": "Button text to create a new group"
  },
  "@create_new_match": {
-    "description": "Appbar text to create a new match"
+    "description": "Button text to create a new match"
  },
  "@created_on": {
    "description": "Label for creation date"
@@ -72,20 +72,14 @@
    "description": "Confirmation dialog for deleting all data"
  },
  "@delete_group": {
-    "description": "Confirmation dialog for deleting a group"
+    "description": "Button text to delete a group"
  },
  "@edit_group": {
-      "description": "Button & Appbar label for editing a group"
+    "description": "Button text to edit 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"
  },
@@ -329,8 +323,6 @@
  "delete_group": "Delete 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",
--- a/lib/l10n/generated/app_localizations.dart
+++ b/lib/l10n/generated/app_localizations.dart
@@ -170,7 +170,7 @@ abstract class AppLocalizations {
  /// **'Create match'**
  String get create_match;

-  /// Appbar text to create a new group
+  /// Button text to create a new group
  ///
  /// In en, this message translates to:
  /// **'Create new group'**
@@ -182,7 +182,7 @@ abstract class AppLocalizations {
  /// **'Created on'**
  String get created_on;

-  /// Appbar text to create a new match
+  /// Button text to create a new match
  ///
  /// In en, this message translates to:
  /// **'Create new match'**
@@ -230,13 +230,13 @@ abstract class AppLocalizations {
  /// **'Delete all data'**
  String get delete_all_data;

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

-  /// Button & Appbar label for editing a group
+  /// Button text to edit a group
  ///
  /// In en, this message translates to:
  /// **'Edit Group'**
@@ -248,18 +248,6 @@ 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:
--- a/lib/l10n/generated/app_localizations_de.dart
+++ b/lib/l10n/generated/app_localizations_de.dart
@@ -88,14 +88,6 @@ 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';

--- a/lib/l10n/generated/app_localizations_en.dart
+++ b/lib/l10n/generated/app_localizations_en.dart
@@ -88,14 +88,6 @@ 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';

--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/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/group_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/settings_view/settings_view.dart';
--- a/lib/presentation/views/main_menu/group_view/create_group_view.dart
+++ b/lib/presentation/views/main_menu/group_view/create_group_view.dart
@@ -1,4 +1,5 @@
 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';
@@ -11,10 +12,8 @@ import 'package:game_tracker/presentation/widgets/text_input/text_input_field.da
 import 'package:provider/provider.dart';

 class CreateGroupView extends StatefulWidget {
-  const CreateGroupView({super.key, this.groupToEdit});
-
-  /// The group to edit, if any
-  final Group? groupToEdit;
+  /// A view that allows the user to create a new group
+  const CreateGroupView({super.key});

  @override
  State<CreateGroupView> createState() => _CreateGroupViewState();
@@ -23,29 +22,16 @@ 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(() {});
    });
@@ -61,42 +47,9 @@ 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(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);
-                }
-              }
-            });
-          }
-        },)],),
+        appBar: AppBar(title: Text(loc.create_new_group)),
        body: SafeArea(
          child: Column(
            mainAxisAlignment: MainAxisAlignment.start,
@@ -106,11 +59,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];
@@ -119,7 +72,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                ),
              ),
              CustomWidthButton(
-                text: widget.groupToEdit == null ? loc.create_group : loc.edit_group,
+                text: loc.create_group,
                sizeRelativeToWidth: 0.95,
                buttonType: ButtonType.primary,
                onPressed:
@@ -127,34 +80,29 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                        (selectedPlayers.length < 2))
                    ? null
                    : () async {
-                        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,
+                        bool success = await db.groupDao.addGroup(
+                          group: Group(
                            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);
+                          Navigator.pop(context);
                        } else {
-                          showSnackbar(message: widget.groupToEdit == null ? loc.error_creating_group : loc.error_editing_group);
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              backgroundColor: CustomTheme.boxColor,
+                              content: Center(
+                                child: Text(
+                                  AppLocalizations.of(
+                                    context,
+                                  ).error_creating_group,
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                              ),
+                            ),
+                          );
                        }
                      },
              ),
@@ -165,21 +113,4 @@ 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,
-        ),
-      );
-    }
-  }
 }
--- a/lib/presentation/views/main_menu/group_view/group_profile_view.dart
+++ b/lib/presentation/views/main_menu/group_view/group_profile_view.dart
@@ -1,12 +1,10 @@
 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';
@@ -17,10 +15,10 @@ import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';

-class GroupDetailView extends StatefulWidget {
+class GroupProfileView extends StatefulWidget {
  /// A view that displays the profile of a group
  /// - [group]: The group to display
-  const GroupDetailView({
+  const GroupProfileView({
    super.key,
    required this.group,
    required this.callback,
@@ -32,13 +30,12 @@ class GroupDetailView extends StatefulWidget {
  final VoidCallback callback;

  @override
-  State<GroupDetailView> createState() => _GroupDetailViewState();
+  State<GroupProfileView> createState() => _GroupProfileViewState();
 }

-class _GroupDetailViewState extends State<GroupDetailView> {
+class _GroupProfileViewState extends State<GroupProfileView> {
  late final AppDatabase db;
  bool isLoading = true;
-  late Group _group;

  /// Total matches played in this group
  int totalMatches = 0;
@@ -48,7 +45,6 @@ class _GroupDetailViewState extends State<GroupDetailView> {
  @override
  void initState() {
    super.initState();
-    _group = widget.group;
    db = Provider.of<AppDatabase>(context, listen: false);
    _loadStatistics();
  }
@@ -89,7 +85,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                ),
              ).then((confirmed) async {
                if (confirmed! && context.mounted) {
-                  await db.groupDao.deleteGroup(groupId: _group.id);
+                  await db.groupDao.deleteGroup(groupId: widget.group.id);
                  if (!context.mounted) return;
                  Navigator.pop(context);
                  widget.callback.call();
@@ -120,7 +116,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                ),
                const SizedBox(height: 10),
                Text(
-                  _group.name,
+                  widget.group.name,
                  style: const TextStyle(
                    fontSize: 28,
                    fontWeight: FontWeight.bold,
@@ -130,7 +126,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                ),
                const SizedBox(height: 5),
                Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(_group.createdAt)}',
+                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.group.createdAt)}',
                  style: const TextStyle(
                    fontSize: 12,
                    color: CustomTheme.textColor,
@@ -147,7 +143,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                    crossAxisAlignment: WrapCrossAlignment.start,
                    spacing: 12,
                    runSpacing: 8,
-                    children: _group.members.map((member) {
+                    children: widget.group.members.map((member) {
                      return TextIconTile(
                        text: member.name,
                        iconEnabled: false,
@@ -165,7 +161,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                      children: [
                        _buildStatRow(
                          loc.members,
-                          _group.members.length.toString(),
+                          widget.group.members.length.toString(),
                        ),
                        _buildStatRow(
                          loc.played_matches,
@@ -183,24 +179,19 @@ class _GroupDetailViewState extends State<GroupDetailView> {
              child: MainMenuButton(
                text: loc.edit_group,
                icon: Icons.edit,
-                onPressed: () async {
-                  final updatedGroup = await Navigator.push<Group?>(
+                onPressed: () {
+                  // TODO: Uncomment when GroupDetailView is implemented
+                  /*
+                  await Navigator.push(
                    context,
                    adaptivePageRoute(
                      builder: (context) {
-                        return CreateGroupView(
-                          groupToEdit: _group,
-                        );
+
+                        return const GroupDetailView();
                      },
                    ),
-                  );
-                  if (updatedGroup != null && mounted) {
-                    setState(() {
-                      _group = updatedGroup;
-                    });
-                    _loadStatistics();
-                    widget.callback();
-                  }
+                  );*/
+                  print('Edit Group pressed');
                },
              ),
            ),
@@ -242,8 +233,9 @@ class _GroupDetailViewState extends State<GroupDetailView> {
  /// Loads statistics for this group
  Future<void> _loadStatistics() async {
    final matches = await db.matchDao.getAllMatches();
-    final groupMatches =
-    matches.where((match) => match.group?.id == _group.id).toList();
+    final groupMatches = matches
+        .where((match) => match.group?.id == widget.group.id)
+        .toList();

    setState(() {
      totalMatches = groupMatches.length;
@@ -261,7 +253,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
      if (match.winner != null) {
        bestPlayerCounts.update(
          match.winner!,
-              (value) => value + 1,
+          (value) => value + 1,
          ifAbsent: () => 1,
        );
      }
@@ -276,4 +268,4 @@ class _GroupDetailViewState extends State<GroupDetailView> {

    return bestPlayer;
  }
-}
+}
--- a/lib/presentation/views/main_menu/group_view/groups_view.dart
+++ b/lib/presentation/views/main_menu/group_view/groups_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 GroupDetailView(
+                            return GroupProfileView(
                              group: groups[index],
                              callback: loadGroups,
                            );
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart
@@ -43,7 +43,6 @@ class _ChooseGameViewState extends State<ChooseGameView> {
    final loc = AppLocalizations.of(context);
    return Scaffold(
      backgroundColor: CustomTheme.backgroundColor,
-      resizeToAvoidBottomInset: false,
      appBar: AppBar(
        leading: IconButton(
          icon: const Icon(Icons.arrow_back_ios),
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
@@ -43,7 +43,6 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
    final loc = AppLocalizations.of(context);
    return Scaffold(
      backgroundColor: CustomTheme.backgroundColor,
-      resizeToAvoidBottomInset: false,
      appBar: AppBar(
        leading: IconButton(
          icon: const Icon(Icons.arrow_back_ios),
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_ruleset_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_ruleset_view.dart
@@ -0,0 +1,99 @@
+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(
+                onPressed: () async {
+                  setState(() {
+                    if (selectedRulesetIndex == index) {
+                      selectedRulesetIndex = -1;
+                    } else {
+                      selectedRulesetIndex = index;
+                    }
+                  });
+                },
+                title: translateRulesetToString(
+                  widget.rulesets[index].$1,
+                  context,
+                ),
+                description: widget.rulesets[index].$2,
+                isHighlighted: selectedRulesetIndex == index,
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
@@ -10,6 +10,7 @@ import 'package:game_tracker/data/dto/player.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_game_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_group_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_ruleset_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart';
 import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:game_tracker/presentation/widgets/player_selection.dart';
@@ -57,6 +58,13 @@ class _CreateMatchViewState extends State<CreateMatchView> {
  /// the [ChooseGroupView]
  String selectedGroupId = '';

+  /// The currently selected ruleset
+  Ruleset? selectedRuleset;
+
+  /// The index of the currently selected ruleset in [rulesets] to mark it in
+  /// the [ChooseRulesetView]
+  int selectedRulesetIndex = -1;
+
  /// The index of the currently selected game in [games] to mark it in
  /// the [ChooseGameView]
  int selectedGameIndex = -1;
@@ -64,8 +72,8 @@ class _CreateMatchViewState extends State<CreateMatchView> {
  /// The currently selected players
  List<Player>? selectedPlayers;

-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+  /// List of available rulesets with their localized string representations
+  late final List<(Ruleset, String)> _rulesets;

  @override
  void initState() {
@@ -99,8 +107,15 @@ class _CreateMatchViewState extends State<CreateMatchView> {
    super.didChangeDependencies();
    final loc = AppLocalizations.of(context);
    hintText ??= loc.match_name;
+    _rulesets = [
+      (Ruleset.singleWinner, loc.ruleset_single_winner),
+      (Ruleset.singleLoser, loc.ruleset_single_loser),
+      (Ruleset.mostPoints, loc.ruleset_most_points),
+      (Ruleset.leastPoints, loc.ruleset_least_points),
+    ];
  }

+  // TODO: Replace when games are implemented
  List<(String, String, Ruleset)> games = [
    ('Example Game 1', 'This is a description', Ruleset.leastPoints),
    ('Example Game 2', '', Ruleset.singleWinner),
@@ -110,9 +125,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,
        appBar: AppBar(title: Text(loc.create_new_match)),
        body: SafeArea(
@@ -144,12 +157,39 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                  setState(() {
                    if (selectedGameIndex != -1) {
                      hintText = games[selectedGameIndex].$1;
+                      selectedRuleset = games[selectedGameIndex].$3;
+                      selectedRulesetIndex = _rulesets.indexWhere(
+                        (r) => r.$1 == selectedRuleset,
+                      );
                    } else {
                      hintText = loc.match_name;
+                      selectedRuleset = null;
                    }
                  });
                },
              ),
+              ChooseTile(
+                title: loc.ruleset,
+                trailingText: selectedRuleset == null
+                    ? loc.none
+                    : translateRulesetToString(selectedRuleset!, context),
+                onPressed: () async {
+                  selectedRuleset = await Navigator.of(context).push(
+                    adaptivePageRoute(
+                      builder: (context) => ChooseRulesetView(
+                        rulesets: _rulesets,
+                        initialRulesetIndex: selectedRulesetIndex,
+                      ),
+                    ),
+                  );
+                  if (!mounted) return;
+                  selectedRulesetIndex = _rulesets.indexWhere(
+                    (r) => r.$1 == selectedRuleset,
+                  );
+                  selectedGameIndex = -1;
+                  setState(() {});
+                },
+              ),
              ChooseTile(
                title: loc.group,
                trailingText: selectedGroup == null
@@ -234,6 +274,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
  /// - Either a group is selected OR at least 2 players are selected
  bool _enableCreateGameButton() {
    return (selectedGroup != null ||
-            (selectedPlayers != null && selectedPlayers!.length > 1));
+            (selectedPlayers != null && selectedPlayers!.length > 1)) &&
+        selectedRuleset != null;
  }
 }
--- a/lib/presentation/views/main_menu/settings_view/settings_view.dart
+++ b/lib/presentation/views/main_menu/settings_view/settings_view.dart
@@ -31,7 +31,6 @@ class _SettingsViewState extends State<SettingsView> {
    version: 'n.A.',
    buildNumber: 'n.A.',
  );
-
  @override
  void initState() {
    super.initState();
--- a/lib/presentation/widgets/player_selection.dart
+++ b/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();
  }

@@ -85,6 +84,7 @@ 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.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 +109,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 +126,46 @@ class _PlayerSelectionState extends State<PlayerSelection> {
          const SizedBox(height: 10),
          SizedBox(
            height: 50,
-            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]);
+            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(
@@ -246,21 +245,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) {
-              // 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];
-            }
+            suggestedPlayers = [...loadedPlayers];
          }
          isLoading = false;
        });
--- a/lib/presentation/widgets/text_input/custom_search_bar.dart
+++ b/lib/presentation/widgets/text_input/custom_search_bar.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';

 class CustomSearchBar extends StatelessWidget {
@@ -22,6 +21,7 @@ class CustomSearchBar extends StatelessWidget {
    this.onTrailingButtonPressed,
    this.onChanged,
    this.constraints,
+    this.maxLength,
  });

  /// The controller for the search bar's text input.
@@ -48,15 +48,19 @@ 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
-    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),
-      );
+    if (maxLength != null) {
+      if (controller.text.length > maxLength!) {
+        controller.text = controller.text.substring(0, maxLength);
+        controller.selection = TextSelection.fromPosition(
+          TextPosition(offset: controller.text.length),
+        );
+      }
    }

    return SearchBar(
--- a/lib/presentation/widgets/text_input/text_input_field.dart
+++ b/lib/presentation/widgets/text_input/text_input_field.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:game_tracker/core/custom_theme.dart';

 class TextInputField extends StatelessWidget {
@@ -33,11 +34,14 @@ class TextInputField extends StatelessWidget {
      controller: controller,
      onChanged: onChanged,
      maxLength: maxLength,
+      maxLengthEnforcement: MaxLengthEnforcement.truncateAfterCompositionEnds,
      decoration: InputDecoration(
        filled: true,
        fillColor: CustomTheme.boxColor,
        hintText: hintText,
        hintStyle: const TextStyle(fontSize: 18),
+        // Hides the character counter
+        counterText: '',
        enabledBorder: OutlineInputBorder(
          borderRadius: const BorderRadius.all(Radius.circular(12)),
          borderSide: BorderSide(color: CustomTheme.boxBorder),
--- a/lib/presentation/widgets/tiles/title_description_list_tile.dart
+++ b/lib/presentation/widgets/tiles/title_description_list_tile.dart
@@ -73,6 +73,7 @@ class TitleDescriptionListTile extends StatelessWidget {
                  const Spacer(),
                  Container(
                    constraints: const BoxConstraints(maxWidth: 115),
+                    margin: const EdgeInsets.only(top: 4),
                    padding: const EdgeInsets.symmetric(
                      vertical: 2,
                      horizontal: 6,
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.9+242
+version: 0.0.8+234

 environment:
  sdk: ^3.8.1
Author	SHA1	Message	Date
Felix Kirchner	94c3bad02b	Removed counter All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m6s Details Pull Request Pipeline / lint (pull_request) Successful in 2m11s Details	2026-01-17 22:41:02 +01:00
Felix Kirchner	ed2d672dee	Implemented maxLength attribute	2026-01-17 22:40:56 +01:00