Merge pull request 'MVP' (#141) from development into main

Reviewed-on: #141
Reviewed-by: gelbeinhalb <spam@yannick-weigert.de>

lib/core/adaptive_page_route.dart

@@ -1,19 +0,0 @@
-import 'dart:io';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-Route<T> adaptivePageRoute<T>({
-  required Widget Function(BuildContext) builder,
-  bool fullscreenDialog = false,
-}) {
-  if (Platform.isIOS) {
-    return CupertinoPageRoute<T>(
-      builder: builder,
-      fullscreenDialog: fullscreenDialog,
-    );
-  }
-  return MaterialPageRoute<T>(
-    builder: builder,
-    fullscreenDialog: fullscreenDialog,
-  );
-}

lib/data/dto/match.dart

@@ -9,7 +9,7 @@ class Match {
   final String name;
   final List<Player>? players;
   final Group? group;
-  Player? winner;
+  final Player? winner;
 
   Match({
     String? id,

lib/l10n/arb/app_de.arb

@@ -18,11 +18,7 @@
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
   "delete_all_data": "Alle Daten löschen?",
-  "delete_all_data": "Diese Gruppe löschen?",
-  "edit_group": "Gruppe bearbeiten",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
-  "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",
-  "error_editing_group": "Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",
   "export_data": "Daten exportieren",

lib/l10n/arb/app_en.arb

@@ -34,10 +34,10 @@
     "description": "Button text to create a match"
   },
   "@create_new_group": {
-    "description": "Appbar text to create a group"
+    "description": "Button text to create a new group"
   },
   "@create_new_match": {
-    "description": "Appbar text to create a match"
+    "description": "Button text to create a new match"
   },
   "@data_successfully_deleted": {
     "description": "Success message after deleting data"
@@ -62,21 +62,9 @@
   "@delete_all_data": {
     "description": "Confirmation dialog for deleting all data"
   },
-  "@delete_group": {
-    "description": "Confirmation dialog for deleting a group"
-  },
-  "@edit_group": {
-      "description": "Button & Appbar label for editing a group"
-  },
   "@error_creating_group": {
     "description": "Error message when group creation fails"
   },
-  "@error_deleting_group": {
-      "description": "Error message when group deletion fails"
-  },
-  "@error_editing_group": {
-      "description": "Error message when group editing fails"
-  },
   "@error_reading_file": {
     "description": "Error message when file cannot be read"
   },
@@ -290,11 +278,7 @@
   "days_ago": "{count} days ago",
   "delete": "Delete",
   "delete_all_data": "Delete all data?",
-  "delete_group": "Delete this group?",
-  "edit_group": "Edit Group",
   "error_creating_group": "Error while creating group, please try again",
-  "error_deleting_group": "Error while deleting group, please try again",
-  "error_editing_group": "Error while editing group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",
   "export_data": "Export data",

lib/l10n/generated/app_localizations.dart

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

lib/l10n/generated/app_localizations_de.dart

@@ -67,26 +67,12 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete => 'Löschen';
 
   @override
-  String get delete_all_data => 'Diese Gruppe löschen?';
+  String get delete_all_data => 'Alle Daten löschen?';
-
-  @override
-  String get delete_group => 'Delete this group?';
-
-  @override
-  String get edit_group => 'Gruppe bearbeiten';
 
   @override
   String get error_creating_group =>
       'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';
 
-  @override
-  String get error_deleting_group =>
-      'Fehler beim Löschen der Gruppe, bitte erneut versuchen';
-
-  @override
-  String get error_editing_group =>
-      'Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen';
-
   @override
   String get error_reading_file => 'Fehler beim Lesen der Datei';
 

lib/l10n/generated/app_localizations_en.dart

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

lib/main.dart

@@ -44,12 +44,6 @@ class GameTracker extends StatelessWidget {
           seedColor: CustomTheme.primaryColor,
           brightness: Brightness.dark,
         ).copyWith(surface: CustomTheme.backgroundColor),
-        pageTransitionsTheme: const PageTransitionsTheme(
-          builders: {
-            TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
-            TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
-          },
-        ),
       ),
       home: const CustomNavigationBar(),
     );

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,5 +1,4 @@
 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';
@@ -57,7 +56,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                adaptivePageRoute(builder: (_) => const SettingsView()),
+                MaterialPageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;

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

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

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

@@ -1,181 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/player.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
-import 'package:game_tracker/presentation/widgets/player_selection.dart';
-import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
-import 'package:provider/provider.dart';
-
-class CreateGroupView extends StatefulWidget {
-  const CreateGroupView({super.key, this.groupToEdit});
-
-  /// The group to edit, if any
-  final Group? groupToEdit;
-
-  @override
-  State<CreateGroupView> createState() => _CreateGroupViewState();
-}
-
-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(() {});
-    });
-  }
-
-  @override
-  void dispose() {
-    _groupNameController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
-      key: _scaffoldMessengerKey,
-      child: Scaffold(
-        backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(title: Text(widget.groupToEdit == null ? loc.create_new_group : loc.edit_group), actions: widget.groupToEdit == null ? [] : [IconButton(icon: const Icon(Icons.delete), onPressed: () async {
-          if(widget.groupToEdit != null) {
-            showDialog<bool>(
-              context: context,
-              builder: (context) => AlertDialog(
-                title: Text(loc.delete_group),
-                content: Text(loc.this_cannot_be_undone),
-                actions: [
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(false),
-                    child: Text(loc.cancel),
-                  ),
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(true),
-                    child: Text(loc.delete),
-                  ),
-                ],
-              ),
-            ).then((confirmed) async {
-              if (confirmed == true && context.mounted) {
-                bool success = await db.groupDao.deleteGroup(groupId: widget.groupToEdit!.id);
-                if (!context.mounted) return;
-                if (success) {
-                  Navigator.pop(context);
-                } else {
-                  showSnackbar(message: loc.error_deleting_group);
-                }
-              }
-            });
-          }
-        },)],),
-        body: SafeArea(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              Container(
-                margin: CustomTheme.standardMargin,
-                child: TextInputField(
-                  controller: _groupNameController,
-                  hintText: loc.group_name,
-                ),
-              ),
-              Expanded(
-                child: PlayerSelection(
-                  initialSelectedPlayers: initialSelectedPlayers,
-                  onChanged: (value) {
-                    setState(() {
-                      selectedPlayers = [...value];
-                    });
-                  },
-                ),
-              ),
-              CustomWidthButton(
-                text: widget.groupToEdit == null ? loc.create_group : loc.edit_group,
-                sizeRelativeToWidth: 0.95,
-                buttonType: ButtonType.primary,
-                onPressed:
-                    (_groupNameController.text.isEmpty ||
-                        (selectedPlayers.length < 2))
-                    ? null
-                    : () async {
-                        late bool success;
-                        if (widget.groupToEdit == null) {
-                          success = await db.groupDao.addGroup(
-                            group: Group(
-                              name: _groupNameController.text.trim(),
-                              members: selectedPlayers,
-                            ),
-                          );
-                        } else {
-                          //TODO: Implement group editing in database
-                          /*
-                          success = await db.groupDao.updateGroup(
-                            group: Group(
-                              id: widget.groupToEdit!.id,
-                              name: _groupNameController.text.trim(),
-                              members: selectedPlayers,
-                            ),
-                          );
-                          */
-                          success = false;
-                        };
-                        if (!context.mounted) return;
-                        if (success) {
-                          Navigator.pop(context);
-                        } else {
-                          showSnackbar(message: widget.groupToEdit == null ? loc.error_creating_group : loc.error_editing_group);
-                        }
-                      },
-              ),
-              const SizedBox(height: 20),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-  /// Displays a snackbar with the given message and optional action.
-  ///
-  /// [message] The message to display in the snackbar.
-  void showSnackbar({
-    required String message,
-  }) {
-    final messenger = _scaffoldMessengerKey.currentState;
-    if (messenger != null) {
-      messenger.hideCurrentSnackBar();
-      messenger.showSnackBar(
-        SnackBar(
-          content: Text(message, style: const TextStyle(color: Colors.white)),
-          backgroundColor: CustomTheme.boxColor,
-        ),
-      );
-    }
-  }
-}

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

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

lib/presentation/views/main_menu/home_view.dart

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

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

@@ -140,11 +140,7 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
         filteredGroups.clear();
         filteredGroups.addAll(
           widget.groups.where(
-                (group) =>
+            (group) => group.name.toLowerCase().contains(query.toLowerCase()),
-            group.name.toLowerCase().contains(query.toLowerCase()) ||
-                group.members.any(
-                      (player) => player.name.toLowerCase().contains(query.toLowerCase()),
-                ),
           ),
         );
       }

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

@@ -1,5 +1,5 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -70,9 +70,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// List of available rulesets with their localized string representations
   late final List<(Ruleset, String)> _rulesets;
 
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
   @override
   void initState() {
     super.initState();
@@ -122,143 +119,140 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
+    return Scaffold(
-      key: _scaffoldMessengerKey,
+      backgroundColor: CustomTheme.backgroundColor,
-      child: Scaffold(
+      appBar: AppBar(title: Text(loc.create_new_match)),
-        backgroundColor: CustomTheme.backgroundColor,
+      body: SafeArea(
-        appBar: AppBar(title: Text(loc.create_new_match)),
+        child: Column(
-        body: SafeArea(
+          mainAxisAlignment: MainAxisAlignment.start,
-          child: Column(
+          children: [
-            mainAxisAlignment: MainAxisAlignment.start,
+            Container(
-            children: [
+              margin: CustomTheme.tileMargin,
-              Container(
+              child: TextInputField(
-                margin: CustomTheme.tileMargin,
+                controller: _matchNameController,
-                child: TextInputField(
+                hintText: hintText ?? '',
-                  controller: _matchNameController,
-                  hintText: hintText ?? '',
-                ),
               ),
-              ChooseTile(
+            ),
-                title: loc.game,
+            ChooseTile(
-                trailingText: selectedGameIndex == -1
+              title: loc.game,
-                    ? loc.none
+              trailingText: selectedGameIndex == -1
-                    : games[selectedGameIndex].$1,
+                  ? loc.none
-                onPressed: () async {
+                  : games[selectedGameIndex].$1,
-                  selectedGameIndex = await Navigator.of(context).push(
+              onPressed: () async {
-                    adaptivePageRoute(
+                selectedGameIndex = await Navigator.of(context).push(
-                      builder: (context) => ChooseGameView(
+                  MaterialPageRoute(
-                        games: games,
+                    builder: (context) => ChooseGameView(
-                        initialGameIndex: selectedGameIndex,
+                      games: games,
-                      ),
+                      initialGameIndex: selectedGameIndex,
                     ),
-                  );
+                  ),
+                );
+                setState(() {
+                  if (selectedGameIndex != -1) {
+                    hintText = games[selectedGameIndex].$1;
+                    selectedRuleset = games[selectedGameIndex].$3;
+                    selectedRulesetIndex = _rulesets.indexWhere(
+                      (r) => r.$1 == selectedRuleset,
+                    );
+                  } else {
+                    hintText = loc.match_name;
+                    selectedRuleset = null;
+                  }
+                });
+              },
+            ),
+            ChooseTile(
+              title: loc.ruleset,
+              trailingText: selectedRuleset == null
+                  ? loc.none
+                  : translateRulesetToString(selectedRuleset!, context),
+              onPressed: () async {
+                selectedRuleset = await Navigator.of(context).push(
+                  MaterialPageRoute(
+                    builder: (context) => ChooseRulesetView(
+                      rulesets: _rulesets,
+                      initialRulesetIndex: selectedRulesetIndex,
+                    ),
+                  ),
+                );
+                if (!mounted) return;
+                selectedRulesetIndex = _rulesets.indexWhere(
+                  (r) => r.$1 == selectedRuleset,
+                );
+                selectedGameIndex = -1;
+                setState(() {});
+              },
+            ),
+            ChooseTile(
+              title: loc.group,
+              trailingText: selectedGroup == null
+                  ? loc.none_group
+                  : selectedGroup!.name,
+              onPressed: () async {
+                selectedGroup = await Navigator.of(context).push(
+                  MaterialPageRoute(
+                    builder: (context) => ChooseGroupView(
+                      groups: groupsList,
+                      initialGroupId: selectedGroupId,
+                    ),
+                  ),
+                );
+                selectedGroupId = selectedGroup?.id ?? '';
+                if (selectedGroup != null) {
+                  filteredPlayerList = playerList
+                      .where(
+                        (p) => !selectedGroup!.members.any((m) => m.id == p.id),
+                      )
+                      .toList();
+                } else {
+                  filteredPlayerList = List.from(playerList);
+                }
+                setState(() {});
+              },
+            ),
+            Expanded(
+              child: PlayerSelection(
+                key: ValueKey(selectedGroup?.id ?? 'no_group'),
+                initialSelectedPlayers: selectedPlayers ?? [],
+                availablePlayers: filteredPlayerList,
+                onChanged: (value) {
                   setState(() {
-                    if (selectedGameIndex != -1) {
+                    selectedPlayers = value;
-                      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,
+            CustomWidthButton(
-                trailingText: selectedRuleset == null
+              text: loc.create_match,
-                    ? loc.none
+              sizeRelativeToWidth: 0.95,
-                    : translateRulesetToString(selectedRuleset!, context),
+              buttonType: ButtonType.primary,
-                onPressed: () async {
+              onPressed: _enableCreateGameButton()
-                  selectedRuleset = await Navigator.of(context).push(
+                  ? () async {
-                    adaptivePageRoute(
+                      Match match = Match(
-                      builder: (context) => ChooseRulesetView(
+                        name: _matchNameController.text.isEmpty
-                        rulesets: _rulesets,
+                            ? (hintText ?? '')
-                        initialRulesetIndex: selectedRulesetIndex,
+                            : _matchNameController.text.trim(),
-                      ),
+                        createdAt: DateTime.now(),
-                    ),
+                        group: selectedGroup,
-                  );
+                        players: selectedPlayers,
-                  if (!mounted) return;
+                      );
-                  selectedRulesetIndex = _rulesets.indexWhere(
+                      await db.matchDao.addMatch(match: match);
-                    (r) => r.$1 == selectedRuleset,
+                      if (context.mounted) {
-                  );
+                        Navigator.pushReplacement(
-                  selectedGameIndex = -1;
+                          context,
-                  setState(() {});
+                          CupertinoPageRoute(
-                },
+                            fullscreenDialog: true,
-              ),
+                            builder: (context) => MatchResultView(
-              ChooseTile(
+                              match: match,
-                title: loc.group,
+                              onWinnerChanged: widget.onWinnerChanged,
-                trailingText: selectedGroup == null
-                    ? loc.none_group
-                    : selectedGroup!.name,
-                onPressed: () async {
-                  selectedGroup = await Navigator.of(context).push(
-                    adaptivePageRoute(
-                      builder: (context) => ChooseGroupView(
-                        groups: groupsList,
-                        initialGroupId: selectedGroupId,
-                      ),
-                    ),
-                  );
-                  selectedGroupId = selectedGroup?.id ?? '';
-                  if (selectedGroup != null) {
-                    filteredPlayerList = playerList
-                        .where(
-                          (p) => !selectedGroup!.members.any((m) => m.id == p.id),
-                        )
-                        .toList();
-                  } else {
-                    filteredPlayerList = List.from(playerList);
-                  }
-                  setState(() {});
-                },
-              ),
-              Expanded(
-                child: PlayerSelection(
-                  key: ValueKey(selectedGroup?.id ?? 'no_group'),
-                  initialSelectedPlayers: selectedPlayers ?? [],
-                  availablePlayers: filteredPlayerList,
-                  onChanged: (value) {
-                    setState(() {
-                      selectedPlayers = value;
-                    });
-                  },
-                ),
-              ),
-              CustomWidthButton(
-                text: loc.create_match,
-                sizeRelativeToWidth: 0.95,
-                buttonType: ButtonType.primary,
-                onPressed: _enableCreateGameButton()
-                    ? () async {
-                        Match match = Match(
-                          name: _matchNameController.text.isEmpty
-                              ? (hintText ?? '')
-                              : _matchNameController.text.trim(),
-                          createdAt: DateTime.now(),
-                          group: selectedGroup,
-                          players: selectedPlayers,
-                        );
-                        await db.matchDao.addMatch(match: match);
-                        if (context.mounted) {
-                          Navigator.pushReplacement(
-                            context,
-                            adaptivePageRoute(
-                              fullscreenDialog: true,
-                              builder: (context) => MatchResultView(
-                                match: match,
-                                onWinnerChanged: widget.onWinnerChanged,
-                              ),
                             ),
-                          );
+                          ),
-                        }
+                        );
                       }
-                    : null,
+                    }
-              ),
+                  : null,
-            ],
+            ),
-          ),
+          ],
         ),
       ),
     );

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

@@ -1,7 +1,7 @@
 import 'dart:core' hide Match;
 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -78,26 +78,20 @@ class _MatchViewState extends State<MatchView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return Center(
+                  return MatchTile(
-                    child: Padding(
+                    onTap: () async {
-                      padding: const EdgeInsets.only(bottom: 12.0),
+                      Navigator.push(
-                      child: MatchTile(
+                        context,
-                        width: MediaQuery.sizeOf(context).width * 0.95,
+                        CupertinoPageRoute(
-                        onTap: () async {
+                          fullscreenDialog: true,
-                          Navigator.push(
+                          builder: (context) => MatchResultView(
-                            context,
+                            match: matches[index],
-                            adaptivePageRoute(
+                            onWinnerChanged: loadGames,
-                              fullscreenDialog: true,
+                          ),
-                              builder: (context) => MatchResultView(
+                        ),
-                                match: matches[index],
+                      );
-                                onWinnerChanged: loadGames,
+                    },
-                              ),
+                    match: matches[index],
-                            ),
-                          );
-                        },
-                        match: matches[index],
-                      ),
-                    ),
                   );
                 },
               ),
@@ -111,7 +105,7 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),

lib/presentation/views/main_menu/settings_view.dart

@@ -13,10 +13,6 @@ class SettingsView extends StatefulWidget {
 }
 
 class _SettingsViewState extends State<SettingsView> {
-
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
   @override
   void initState() {
     super.initState();
@@ -25,108 +21,105 @@ class _SettingsViewState extends State<SettingsView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
+    return Scaffold(
-      key: _scaffoldMessengerKey,
+      appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
-      child: Scaffold(
+      backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
+      body: LayoutBuilder(
-        backgroundColor: CustomTheme.backgroundColor,
+        builder: (BuildContext context, BoxConstraints constraints) =>
-        body: LayoutBuilder(
+            SingleChildScrollView(
-          builder: (BuildContext context, BoxConstraints constraints) =>
+              child: Column(
-              SingleChildScrollView(
+                mainAxisAlignment: MainAxisAlignment.start,
-                child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.start,
+                children: [
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  Padding(
-                  children: [
+                    padding: const EdgeInsets.fromLTRB(24, 0, 24, 10),
-                    Padding(
+                    child: Text(
-                      padding: const EdgeInsets.fromLTRB(24, 0, 24, 10),
+                      textAlign: TextAlign.start,
-                      child: Text(
+                      loc.menu,
-                        textAlign: TextAlign.start,
+                      style: const TextStyle(
-                        loc.menu,
+                        fontSize: 28,
-                        style: const TextStyle(
+                        fontWeight: FontWeight.bold,
-                          fontSize: 28,
+                      ),
-                          fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 24,
+                      vertical: 10,
+                    ),
+                    child: Text(
+                      textAlign: TextAlign.start,
+                      loc.settings,
+                      style: const TextStyle(
+                        fontSize: 22,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                  SettingsListTile(
+                    title: loc.export_data,
+                    icon: Icons.upload_rounded,
+                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+                    onPressed: () async {
+                      final String json =
+                          await DataTransferService.getAppDataAsJson(context);
+                      final result = await DataTransferService.exportData(
+                        json,
+                        'game_tracker-data',
+                      );
+                      if (!context.mounted) return;
+                      showExportSnackBar(context: context, result: result);
+                    },
+                  ),
+                  SettingsListTile(
+                    title: loc.import_data,
+                    icon: Icons.download_rounded,
+                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+                    onPressed: () async {
+                      final result = await DataTransferService.importData(
+                        context,
+                      );
+                      if (!context.mounted) return;
+                      showImportSnackBar(context: context, result: result);
+                    },
+                  ),
+                  SettingsListTile(
+                    title: loc.delete_all_data,
+                    icon: Icons.delete_rounded,
+                    suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+                    onPressed: () {
+                      showDialog<bool>(
+                        context: context,
+                        builder: (context) => AlertDialog(
+                          title: Text(loc.delete_all_data),
+                          content: Text(loc.this_cannot_be_undone),
+                          actions: [
+                            TextButton(
+                              onPressed: () => Navigator.of(context).pop(false),
+                              child: Text(loc.cancel),
+                            ),
+                            TextButton(
+                              onPressed: () => Navigator.of(context).pop(true),
+                              child: Text(loc.delete),
+                            ),
+                          ],
                         ),
-                      ),
+                      ).then((confirmed) {
-                    ),
+                        if (confirmed == true && context.mounted) {
-                    Padding(
+                          DataTransferService.deleteAllData(context);
-                      padding: const EdgeInsets.symmetric(
+                          showSnackbar(
-                        horizontal: 24,
+                            context: context,
-                        vertical: 10,
+                            message: AppLocalizations.of(
-                      ),
+                              context,
-                      child: Text(
+                            ).data_successfully_deleted,
-                        textAlign: TextAlign.start,
+                          );
-                        loc.settings,
+                        }
-                        style: const TextStyle(
+                      });
-                          fontSize: 22,
+                    },
-                          fontWeight: FontWeight.bold,
+                  ),
-                        ),
+                ],
-                      ),
-                    ),
-                    SettingsListTile(
-                      title: loc.export_data,
-                      icon: Icons.upload_rounded,
-                      suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                      onPressed: () async {
-                        final String json =
-                            await DataTransferService.getAppDataAsJson(context);
-                        final result = await DataTransferService.exportData(
-                          json,
-                          'game_tracker-data',
-                        );
-                        if (!context.mounted) return;
-                        showExportSnackBar(context: context, result: result);
-                      },
-                    ),
-                    SettingsListTile(
-                      title: loc.import_data,
-                      icon: Icons.download_rounded,
-                      suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                      onPressed: () async {
-                        final result = await DataTransferService.importData(
-                          context,
-                        );
-                        if (!context.mounted) return;
-                        showImportSnackBar(context: context, result: result);
-                      },
-                    ),
-                    SettingsListTile(
-                      title: loc.delete_all_data,
-                      icon: Icons.delete_rounded,
-                      suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                      onPressed: () {
-                        showDialog<bool>(
-                          context: context,
-                          builder: (context) => AlertDialog(
-                            title: Text(loc.delete_all_data),
-                            content: Text(loc.this_cannot_be_undone),
-                            actions: [
-                              TextButton(
-                                onPressed: () => Navigator.of(context).pop(false),
-                                child: Text(loc.cancel),
-                              ),
-                              TextButton(
-                                onPressed: () => Navigator.of(context).pop(true),
-                                child: Text(loc.delete),
-                              ),
-                            ],
-                          ),
-                        ).then((confirmed) {
-                          if (confirmed == true && context.mounted) {
-                            DataTransferService.deleteAllData(context);
-                            showSnackbar(
-                              context: context,
-                              message: AppLocalizations.of(
-                                context,
-                              ).data_successfully_deleted,
-                            );
-                          }
-                        });
-                      },
-                    ),
-                  ],
-                ),
               ),
-        ),
+            ),
       ),
     );
   }

lib/presentation/widgets/player_selection.dart

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

lib/presentation/widgets/tiles/group_tile.dart

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

lib/presentation/widgets/tiles/match_tile.dart

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

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.3+93
+version: 0.0.1+21
 
 environment:
   sdk: ^3.8.1
@@ -9,6 +9,11 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  material_symbols_icons: ^4.2815.1
+
+  # The following adds the Cupertino Icons font to your application.
+  # Use with the CupertinoIcons class for iOS style icons.
+  cupertino_icons: ^1.0.8
   drift: ^2.27.0
   drift_flutter: ^0.2.4
   path_provider: ^2.1.5