fix merge mistake

# Conflicts:
#	lib/l10n/arb/app_de.arb
#	lib/l10n/arb/app_en.arb
#	lib/l10n/generated/app_localizations_de.dart
#	lib/presentation/views/main_menu/settings_view.dart

lib/core/adaptive_page_route.dart

@@ -0,0 +1,19 @@
+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;
-  final Player? winner;
+  Player? winner;
 
   Match({
     String? id,

lib/l10n/arb/app_de.arb

@@ -1,6 +1,6 @@
 {
   "@@locale": "de",
-  "all_players": "Alle Spieler:innen:",
+  "all_players": "Alle Spieler:innen",
   "all_players_selected": "Alle Spieler:innen ausgewählt",
   "amount_of_matches": "Anzahl der Spiele",
   "cancel": "Abbrechen",
@@ -17,8 +17,12 @@
   "data_successfully_imported": "Daten erfolgreich importiert",
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
-  "delete_all_data": "Alle Daten löschen?",
+  "delete_all_data": "Alle Daten löschen",
+  "delete_group": "Diese Gruppe löschen",
+  "edit_group": "Gruppe bearbeiten",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
+  "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",
+  "error_editing_group": "Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",
   "export_data": "Daten exportieren",
@@ -44,7 +48,7 @@
   "no_matches_created_yet": "Noch keine Spiele erstellt",
   "no_players_created_yet": "Noch keine Spieler:in erstellt",
   "no_players_found_with_that_name": "Keine Spieler:in mit diesem Namen gefunden",
-  "no_players_selected": "Keine Spieler:in ausgewählt",
+  "no_players_selected": "Keine Spieler:innen ausgewählt",
   "no_recent_matches_available": "Keine letzten Spiele verfügbar",
   "no_second_match_available": "Kein zweites Spiel verfügbar",
   "no_statistics_available": "Keine Statistiken verfügbar",
@@ -64,7 +68,7 @@
   "search_for_groups": "Nach Gruppen suchen",
   "search_for_players": "Nach Spieler:innen suchen",
   "select_winner": "Gewinner:in wählen:",
-  "selected_players": "Ausgewählte Spieler:innen: {count}",
+  "selected_players": "Ausgewählte Spieler:innen",
   "settings": "Einstellungen",
   "single_loser": "Ein:e Verlierer:in",
   "single_winner": "Ein:e Gewinner:in",
@@ -73,11 +77,11 @@
   "successfully_added_player": "Spieler:in {playerName} erfolgreich hinzugefügt",
   "there_is_no_group_matching_your_search": "Es gibt keine Gruppe, die deiner Suche entspricht",
   "this_cannot_be_undone": "Dies kann nicht rückgängig gemacht werden",
-  "today_at": "Heute um {time}",
+  "today_at": "Heute um",
   "undo": "Rückgängig",
   "unknown_exception": "Unbekannter Fehler (siehe Konsole)",
-  "winner": "Gewinner*in",
+  "winner": "Gewinner:in",
   "winrate": "Siegquote",
   "wins": "Siege",
-  "yesterday_at": "Gestern um {time}"
+  "yesterday_at": "Gestern um"
 }

lib/l10n/arb/app_en.arb

@@ -9,6 +9,9 @@
   "@amount_of_matches": {
     "description": "Label for amount of matches statistic"
   },
+  "@app_name": {
+    "description": "The name of the App"
+  },
   "@cancel": {
     "description": "Cancel button text"
   },
@@ -22,13 +25,7 @@
     "description": "Label for choosing a ruleset"
   },
   "@could_not_add_player": {
-		"description": "Error message when adding a player fails",
-		"placeholders": {
-			"playerName": {
-				"type": "String",
-				"example": "John"
-			}
-		}
+    "description": "Error message when adding a player fails"
   },
   "@create_group": {
     "description": "Button text to create a group"
@@ -37,10 +34,10 @@
     "description": "Button text to create a match"
   },
   "@create_new_group": {
-		"description": "Button text to create a new group"
+    "description": "Appbar text to create a new group"
   },
   "@create_new_match": {
-		"description": "Button text to create a new match"
+    "description": "Appbar text to create a new match"
   },
   "@data_successfully_deleted": {
     "description": "Success message after deleting data"
@@ -65,9 +62,21 @@
   "@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"
   },
@@ -86,9 +95,6 @@
   "@game_name": {
     "description": "Placeholder for game name search"
   },
-	"@game_tracker": {
-		"description": "App Name"
-	},
   "@group": {
     "description": "Group label"
   },
@@ -212,13 +218,7 @@
     "description": "Label to select the winner"
   },
   "@selected_players": {
-		"description": "Shows the number of selected players",
-		"placeholders": {
-			"count": {
-				"type": "int",
-				"format": "compact"
-			}
-		}
+    "description": "Shows the number of selected players"
   },
   "@settings": {
     "description": "Settings label"
@@ -251,13 +251,7 @@
     "description": "Warning message for irreversible actions"
   },
   "@today_at": {
-		"description": "Date format for today",
-		"placeholders": {
-			"time": {
-				"type": "String",
-				"example": "14:30"
-			}
-		}
+    "description": "Date format for today"
   },
   "@undo": {
     "description": "Undo button text"
@@ -275,22 +269,17 @@
     "description": "Label for wins statistic"
   },
   "@yesterday_at": {
-		"description": "Date format for yesterday",
-		"placeholders": {
-			"time": {
-				"type": "String",
-				"example": "14:30"
-			}
-		}
+    "description": "Date format for yesterday"
   },
-	"all_players": "All players:",
+  "all_players": "All players",
   "all_players_selected": "All players selected",
   "amount_of_matches": "Amount of Matches",
+  "app_name": "Game Tracker",
   "cancel": "Cancel",
   "choose_game": "Choose Game",
   "choose_group": "Choose Group",
   "choose_ruleset": "Choose Ruleset",
-	"could_not_add_player": "Could not add player {playerName}",
+  "could_not_add_player": "Could not add player",
   "create_group": "Create Group",
   "create_match": "Create match",
   "create_new_group": "Create new group",
@@ -300,15 +289,18 @@
   "data_successfully_imported": "Data successfully imported",
   "days_ago": "{count} days ago",
   "delete": "Delete",
-	"delete_all_data": "Delete all data?",
+  "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",
   "format_exception": "Format Exception (see console)",
   "game": "Game",
   "game_name": "Game Name",
-	"game_tracker": "Game Tracker",
   "group": "Group",
   "group_name": "Group name",
   "groups": "Groups",
@@ -348,7 +340,7 @@
   "search_for_groups": "Search for groups",
   "search_for_players": "Search for players",
   "select_winner": "Select Winner:",
-	"selected_players": "Selected players: {count}",
+  "selected_players": "Selected players",
   "settings": "Settings",
   "single_loser": "Single Loser",
   "single_winner": "Single Winner",
@@ -357,11 +349,11 @@
   "successfully_added_player": "Successfully added player {playerName}",
   "there_is_no_group_matching_your_search": "There is no group matching your search",
   "this_cannot_be_undone": "This can't be undone",
-	"today_at": "Today at {time}",
+  "today_at": "Today at",
   "undo": "Undo",
   "unknown_exception": "Unknown Exception (see console)",
   "winner": "Winner",
   "winrate": "Winrate",
   "wins": "Wins",
-	"yesterday_at": "Yesterday at {time}"
+  "yesterday_at": "Yesterday at"
 }

lib/l10n/generated/app_localizations.dart

@@ -101,7 +101,7 @@ abstract class AppLocalizations {
   /// Label for all players list
   ///
   /// In en, this message translates to:
-  /// **'All players:'**
+  /// **'All players'**
   String get all_players;
 
   /// Message when all players are added to selection
@@ -116,6 +116,12 @@ abstract class AppLocalizations {
   /// **'Amount of Matches'**
   String get amount_of_matches;
 
+  /// The name of the App
+  ///
+  /// In en, this message translates to:
+  /// **'Game Tracker'**
+  String get app_name;
+
   /// Cancel button text
   ///
   /// In en, this message translates to:
@@ -143,8 +149,8 @@ abstract class AppLocalizations {
   /// Error message when adding a player fails
   ///
   /// In en, this message translates to:
-  /// **'Could not add player {playerName}'**
-  String could_not_add_player(String playerName);
+  /// **'Could not add player'**
+  String could_not_add_player(Object playerName);
 
   /// Button text to create a group
   ///
@@ -203,15 +209,39 @@ abstract class AppLocalizations {
   /// Confirmation dialog for deleting all data
   ///
   /// In en, this message translates to:
-  /// **'Delete all data?'**
+  /// **'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:
@@ -248,12 +278,6 @@ abstract class AppLocalizations {
   /// **'Game Name'**
   String get game_name;
 
-  /// App Name
-  ///
-  /// In en, this message translates to:
-  /// **'Game Tracker'**
-  String get game_tracker;
-
   /// Group label
   ///
   /// In en, this message translates to:
@@ -491,8 +515,8 @@ abstract class AppLocalizations {
   /// Shows the number of selected players
   ///
   /// In en, this message translates to:
-  /// **'Selected players: {count}'**
-  String selected_players(int count);
+  /// **'Selected players'**
+  String get selected_players;
 
   /// Settings label
   ///
@@ -545,8 +569,8 @@ abstract class AppLocalizations {
   /// Date format for today
   ///
   /// In en, this message translates to:
-  /// **'Today at {time}'**
-  String today_at(String time);
+  /// **'Today at'**
+  String get today_at;
 
   /// Undo button text
   ///
@@ -581,8 +605,8 @@ abstract class AppLocalizations {
   /// Date format for yesterday
   ///
   /// In en, this message translates to:
-  /// **'Yesterday at {time}'**
-  String yesterday_at(String time);
+  /// **'Yesterday at'**
+  String get yesterday_at;
 }
 
 class _AppLocalizationsDelegate

lib/l10n/generated/app_localizations_de.dart

@@ -9,7 +9,7 @@ class AppLocalizationsDe extends AppLocalizations {
   AppLocalizationsDe([String locale = 'de']) : super(locale);
 
   @override
-  String get all_players => 'Alle Spieler:innen:';
+  String get all_players => 'Alle Spieler:innen';
 
   @override
   String get all_players_selected => 'Alle Spieler:innen ausgewählt';
@@ -17,6 +17,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get amount_of_matches => 'Anzahl der Spiele';
 
+  @override
+  String get app_name => 'Game Tracker';
+
   @override
   String get cancel => 'Abbrechen';
 
@@ -30,7 +33,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get choose_ruleset => 'Regelwerk wählen';
 
   @override
-  String could_not_add_player(String playerName) {
+  String could_not_add_player(Object playerName) {
     return 'Spieler:in $playerName konnte nicht hinzugefügt werden';
   }
 
@@ -64,12 +67,26 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete => 'Löschen';
 
   @override
-  String get delete_all_data => 'Alle Daten löschen?';
+  String get delete_all_data => 'Alle Daten löschen';
+
+  @override
+  String get delete_group => 'Diese Gruppe löschen';
+
+  @override
+  String get edit_group => 'Gruppe bearbeiten';
 
   @override
   String get error_creating_group =>
       'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';
 
+  @override
+  String get error_deleting_group =>
+      'Fehler beim Löschen der Gruppe, bitte erneut versuchen';
+
+  @override
+  String get error_editing_group =>
+      'Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen';
+
   @override
   String get error_reading_file => 'Fehler beim Lesen der Datei';
 
@@ -88,9 +105,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get game_name => 'Spielvorlagenname';
 
-  @override
-  String get game_tracker => 'Game Tracker';
-
   @override
   String get group => 'Gruppe';
 
@@ -150,7 +164,7 @@ class AppLocalizationsDe extends AppLocalizations {
       'Keine Spieler:in mit diesem Namen gefunden';
 
   @override
-  String get no_players_selected => 'Keine Spieler:in ausgewählt';
+  String get no_players_selected => 'Keine Spieler:innen ausgewählt';
 
   @override
   String get no_recent_matches_available => 'Keine letzten Spiele verfügbar';
@@ -216,14 +230,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get select_winner => 'Gewinner:in wählen:';
 
   @override
-  String selected_players(int count) {
-    final intl.NumberFormat countNumberFormat = intl.NumberFormat.compact(
-      locale: localeName,
-    );
-    final String countString = countNumberFormat.format(count);
-
-    return 'Ausgewählte Spieler:innen: $countString';
-  }
+  String get selected_players => 'Ausgewählte Spieler:innen';
 
   @override
   String get settings => 'Einstellungen';
@@ -254,9 +261,7 @@ class AppLocalizationsDe extends AppLocalizations {
       'Dies kann nicht rückgängig gemacht werden';
 
   @override
-  String today_at(String time) {
-    return 'Heute um $time';
-  }
+  String get today_at => 'Heute um';
 
   @override
   String get undo => 'Rückgängig';
@@ -265,7 +270,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get unknown_exception => 'Unbekannter Fehler (siehe Konsole)';
 
   @override
-  String get winner => 'Gewinner*in';
+  String get winner => 'Gewinner:in';
 
   @override
   String get winrate => 'Siegquote';
@@ -274,7 +279,5 @@ class AppLocalizationsDe extends AppLocalizations {
   String get wins => 'Siege';
 
   @override
-  String yesterday_at(String time) {
-    return 'Gestern um $time';
-  }
+  String get yesterday_at => 'Gestern um';
 }

lib/l10n/generated/app_localizations_en.dart

@@ -9,7 +9,7 @@ class AppLocalizationsEn extends AppLocalizations {
   AppLocalizationsEn([String locale = 'en']) : super(locale);
 
   @override
-  String get all_players => 'All players:';
+  String get all_players => 'All players';
 
   @override
   String get all_players_selected => 'All players selected';
@@ -17,6 +17,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get amount_of_matches => 'Amount of Matches';
 
+  @override
+  String get app_name => 'Game Tracker';
+
   @override
   String get cancel => 'Cancel';
 
@@ -30,8 +33,8 @@ class AppLocalizationsEn extends AppLocalizations {
   String get choose_ruleset => 'Choose Ruleset';
 
   @override
-  String could_not_add_player(String playerName) {
-    return 'Could not add player $playerName';
+  String could_not_add_player(Object playerName) {
+    return 'Could not add player';
   }
 
   @override
@@ -64,12 +67,26 @@ class AppLocalizationsEn extends AppLocalizations {
   String get delete => 'Delete';
 
   @override
-  String get delete_all_data => 'Delete all data?';
+  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';
 
@@ -88,9 +105,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get game_name => 'Game Name';
 
-  @override
-  String get game_tracker => 'Game Tracker';
-
   @override
   String get group => 'Group';
 
@@ -216,14 +230,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get select_winner => 'Select Winner:';
 
   @override
-  String selected_players(int count) {
-    final intl.NumberFormat countNumberFormat = intl.NumberFormat.compact(
-      locale: localeName,
-    );
-    final String countString = countNumberFormat.format(count);
-
-    return 'Selected players: $countString';
-  }
+  String get selected_players => 'Selected players';
 
   @override
   String get settings => 'Settings';
@@ -253,9 +260,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get this_cannot_be_undone => 'This can\'t be undone';
 
   @override
-  String today_at(String time) {
-    return 'Today at $time';
-  }
+  String get today_at => 'Today at';
 
   @override
   String get undo => 'Undo';
@@ -273,7 +278,5 @@ class AppLocalizationsEn extends AppLocalizations {
   String get wins => 'Wins';
 
   @override
-  String yesterday_at(String time) {
-    return 'Yesterday at $time';
-  }
+  String get yesterday_at => 'Yesterday at';
 }

lib/main.dart

@@ -34,21 +34,23 @@ class GameTracker extends StatelessWidget {
         );
       },
       debugShowCheckedModeBanner: false,
-      onGenerateTitle: (context) => AppLocalizations.of(context).game_tracker,
-      darkTheme: ThemeData.dark(),
-
+      onGenerateTitle: (context) => AppLocalizations.of(context).app_name,
       themeMode: ThemeMode.dark, // forces dark mode
       theme: ThemeData(
         primaryColor: CustomTheme.primaryColor,
         scaffoldBackgroundColor: CustomTheme.backgroundColor,
         appBarTheme: CustomTheme.appBarTheme,
-
         colorScheme: ColorScheme.fromSeed(
           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,4 +1,5 @@
 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';
@@ -56,7 +57,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                MaterialPageRoute(builder: (_) => const SettingsView()),
+                adaptivePageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;

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

@@ -1,111 +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});
-
-  @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

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

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

@@ -1,11 +1,12 @@
 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/create_group_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/group_detail_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';
@@ -72,7 +73,19 @@ class _GroupsViewState extends State<GroupsView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return GroupTile(group: groups[index]);
+                  return GroupTile(group: groups[index], onTap: () async {
+                    await Navigator.push(
+                      context,
+                      adaptivePageRoute(
+                        builder: (context) {
+                          return GroupDetailView(groupToEdit: groups[index]);
+                        },
+                      ),
+                    );
+                    setState(() {
+                      loadGroups();
+                    });
+                  });
                 },
               ),
             ),
@@ -85,9 +98,9 @@ class _GroupsViewState extends State<GroupsView> {
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) {
-                      return const CreateGroupView();
+                      return const GroupDetailView();
                     },
                   ),
                 );

lib/presentation/views/main_menu/home_view.dart

@@ -1,14 +1,16 @@
 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_summary_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart';
 import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart';
 import 'package:provider/provider.dart';
 
@@ -43,7 +45,6 @@ class _HomeViewState extends State<HomeView> {
           Player(name: 'Skeleton Player 2'),
         ],
       ),
-      winner: Player(name: 'Skeleton Player 1'),
     ),
   );
 
@@ -90,74 +91,43 @@ class _HomeViewState extends State<HomeView> {
                   child: InfoTile(
                     width: constraints.maxWidth * 0.95,
                     title: loc.recent_matches,
-                    icon: Icons.timer,
-                    content: Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 40.0),
-                      child: Visibility(
-                        visible: !isLoading && loadedRecentMatches.isNotEmpty,
-                        replacement: Center(
-                          heightFactor: 12,
-                          child: Text(
-                            AppLocalizations.of(
-                              context,
-                            ).no_recent_matches_available,
-                          ),
-                        ),
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.start,
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                    icon: Icons.history_rounded,
+                    content: Column(
                       children: [
-                            MatchSummaryTile(
-                              matchTitle: recentMatches[0].name,
-                              game: 'Winner',
-                              ruleset: 'Ruleset',
-                              players: _getPlayerText(
-                                recentMatches[0],
-                                context,
+                        if (recentMatches.isNotEmpty)
+                          for (Match match in recentMatches)
+                            Padding(
+                              padding: const EdgeInsets.symmetric(
+                                vertical: 6.0,
                               ),
-                              winner: recentMatches[0].winner == null
-                                  ? AppLocalizations.of(
-                                      context,
-                                    ).match_in_progress
-                                  : recentMatches[0].winner!.name,
+                              child: MatchTile(
+                                compact: true,
+                                width: constraints.maxWidth * 0.9,
+                                match: match,
+                                onTap: () async {
+                                  await Navigator.of(context).push(
+                                    adaptivePageRoute(
+                                      fullscreenDialog: true,
+                                      builder: (context) =>
+                                          MatchResultView(match: match),
                                     ),
-                            const Padding(
-                              padding: EdgeInsets.symmetric(vertical: 8.0),
-                              child: Divider(),
+                                  );
+                                  await updatedWinnerinRecentMatches(match.id);
+                                },
                               ),
-                            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 ...[
+                            )
+                        else
                           Center(
-                                heightFactor: 5.35,
-                                child: Text(
-                                  AppLocalizations.of(
-                                    context,
-                                  ).no_second_match_available,
-                                ),
+                            heightFactor: 5,
+                            child: Text(loc.no_recent_matches_available),
                           ),
                       ],
-                          ],
                     ),
                   ),
                 ),
-                  ),
-                ),
-                InfoTile(
+                Padding(
+                  padding: EdgeInsets.zero,
+                  child: InfoTile(
                     width: constraints.maxWidth * 0.95,
                     title: loc.quick_create,
                     icon: Icons.add_box_rounded,
@@ -205,6 +175,8 @@ class _HomeViewState extends State<HomeView> {
                       ],
                     ),
                   ),
+                ),
+                SizedBox(height: MediaQuery.paddingOf(context).bottom),
               ],
             ),
           ),
@@ -215,7 +187,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.
-  void loadHomeViewData() {
+  Future<void> loadHomeViewData() async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     Future.wait([
       db.matchDao.getMatchCount(),
@@ -231,11 +203,6 @@ 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;
@@ -244,18 +211,15 @@ class _HomeViewState extends State<HomeView> {
     });
   }
 
-  /// Generates a text representation of the players in the match.
-  /// If the match has a group, it returns the group name and the number of additional players.
-  /// If there is no group, it returns the count of players.
-  String _getPlayerText(Match game, context) {
-    final loc = AppLocalizations.of(context);
-    if (game.group == null) {
-      final playerCount = game.players?.length ?? 0;
-      return loc.players_count(playerCount);
-    }
-    if (game.players == null || game.players!.isEmpty) {
-      return game.group!.name;
-    }
-    return '${game.group!.name} + ${game.players!.length}';
+  /// Updates the winner information for a specific match in the recent matches list.
+  Future<void> updatedWinnerinRecentMatches(String matchId) async {
+    final db = Provider.of<AppDatabase>(context, listen: false);
+    final winner = await db.matchDao.getWinner(matchId: matchId);
+    final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
+    if (matchIndex != -1) {
+      setState(() {
+        recentMatches[matchIndex].winner = winner;
+      });
+    }
   }
 }

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

@@ -140,7 +140,11 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
         filteredGroups.clear();
         filteredGroups.addAll(
           widget.groups.where(
-            (group) => group.name.toLowerCase().contains(query.toLowerCase()),
+                (group) =>
+            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,6 +70,9 @@ 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();
@@ -119,7 +122,9 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
+      child: Scaffold(
         backgroundColor: CustomTheme.backgroundColor,
         appBar: AppBar(title: Text(loc.create_new_match)),
         body: SafeArea(
@@ -140,7 +145,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                     : games[selectedGameIndex].$1,
                 onPressed: () async {
                   selectedGameIndex = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                       builder: (context) => ChooseGameView(
                         games: games,
                         initialGameIndex: selectedGameIndex,
@@ -155,7 +160,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                         (r) => r.$1 == selectedRuleset,
                       );
                     } else {
-                    hintText = AppLocalizations.of(context).match_name;
+                      hintText = loc.match_name;
                       selectedRuleset = null;
                     }
                   });
@@ -168,7 +173,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                     : translateRulesetToString(selectedRuleset!, context),
                 onPressed: () async {
                   selectedRuleset = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                       builder: (context) => ChooseRulesetView(
                         rulesets: _rulesets,
                         initialRulesetIndex: selectedRulesetIndex,
@@ -190,7 +195,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                     : selectedGroup!.name,
                 onPressed: () async {
                   selectedGroup = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                       builder: (context) => ChooseGroupView(
                         groups: groupsList,
                         initialGroupId: selectedGroupId,
@@ -240,7 +245,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                         if (context.mounted) {
                           Navigator.pushReplacement(
                             context,
-                          CupertinoPageRoute(
+                            adaptivePageRoute(
                               fullscreenDialog: true,
                               builder: (context) => MatchResultView(
                                 match: match,
@@ -255,6 +260,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
             ],
           ),
         ),
+      ),
     );
   }
 

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,11 +78,15 @@ class _MatchViewState extends State<MatchView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return MatchTile(
+                  return Center(
+                    child: Padding(
+                      padding: const EdgeInsets.only(bottom: 12.0),
+                      child: MatchTile(
+                        width: MediaQuery.sizeOf(context).width * 0.95,
                         onTap: () async {
                           Navigator.push(
                             context,
-                        CupertinoPageRoute(
+                            adaptivePageRoute(
                               fullscreenDialog: true,
                               builder: (context) => MatchResultView(
                                 match: matches[index],
@@ -92,6 +96,8 @@ class _MatchViewState extends State<MatchView> {
                           );
                         },
                         match: matches[index],
+                      ),
+                    ),
                   );
                 },
               ),
@@ -105,7 +111,7 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),

lib/presentation/views/main_menu/settings_view.dart

@@ -4,6 +4,7 @@ import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/widgets/tiles/settings_list_tile.dart';
 import 'package:game_tracker/services/data_transfer_service.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class SettingsView extends StatefulWidget {
   const SettingsView({super.key});
@@ -13,21 +14,31 @@ class SettingsView extends StatefulWidget {
 }
 
 class _SettingsViewState extends State<SettingsView> {
+
+  /// GlobalKey for ScaffoldMessenger to show snackbars
+  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
+  PackageInfo _packageInfo = PackageInfo(
+    appName: 'n.A.',
+    packageName: 'n.A.',
+    version: 'n.A.',
+    buildNumber: 'n.A.',
+  );
   @override
   void initState() {
     super.initState();
+    _initPackageInfo();
   }
 
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
+      child: Scaffold(
         appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
         backgroundColor: CustomTheme.backgroundColor,
-      body: LayoutBuilder(
-        builder: (BuildContext context, BoxConstraints constraints) =>
-            SingleChildScrollView(
-              child: Column(
+        body: Column(
           mainAxisAlignment: MainAxisAlignment.start,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -43,10 +54,7 @@ class _SettingsViewState extends State<SettingsView> {
               ),
             ),
             Padding(
-                    padding: const EdgeInsets.symmetric(
-                      horizontal: 24,
-                      vertical: 10,
-                    ),
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
               child: Text(
                 textAlign: TextAlign.start,
                 loc.settings,
@@ -58,11 +66,12 @@ class _SettingsViewState extends State<SettingsView> {
             ),
             SettingsListTile(
               title: loc.export_data,
-                    icon: Icons.upload_outlined,
+              icon: Icons.upload_rounded,
               suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
               onPressed: () async {
-                      final String json =
-                          await DataTransferService.getAppDataAsJson(context);
+                final String json = await DataTransferService.getAppDataAsJson(
+                  context,
+                );
                 final result = await DataTransferService.exportData(
                   json,
                   'game_tracker-data',
@@ -73,25 +82,23 @@ class _SettingsViewState extends State<SettingsView> {
             ),
             SettingsListTile(
               title: loc.import_data,
-                    icon: Icons.download_outlined,
+              icon: Icons.download_rounded,
               suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
               onPressed: () async {
-                      final result = await DataTransferService.importData(
-                        context,
-                      );
+                final result = await DataTransferService.importData(context);
                 if (!context.mounted) return;
                 showImportSnackBar(context: context, result: result);
               },
             ),
             SettingsListTile(
               title: loc.delete_all_data,
-                    icon: Icons.download_outlined,
+              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),
+                    title: Text('${loc.delete_all_data}?'),
                     content: Text(loc.this_cannot_be_undone),
                     actions: [
                       TextButton(
@@ -117,10 +124,23 @@ class _SettingsViewState extends State<SettingsView> {
                 });
               },
             ),
-                ],
+            const Spacer(),
+            Padding(
+              padding: const EdgeInsets.all(20),
+              child: Center(
+                child: Text(
+                  'Version ${_packageInfo.version} (${_packageInfo.buildNumber})',
+                  style: TextStyle(
+                    color: Colors.grey.shade600,
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
                   ),
                 ),
               ),
+            ),
+          ],
+        ),
+      ),
     );
   }
 
@@ -194,4 +214,11 @@ class _SettingsViewState extends State<SettingsView> {
       ),
     );
   }
+
+  Future<void> _initPackageInfo() async {
+    final info = await PackageInfo.fromPlatform();
+    setState(() {
+      _packageInfo = info;
+    });
+  }
 }

lib/presentation/widgets/player_selection.dart

@@ -70,6 +70,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
     suggestedPlayers = skeletonData;
+    selectedPlayers = widget.initialSelectedPlayers ?? [];
     loadPlayerList();
   }
 
@@ -99,7 +100,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                 if (value.isEmpty) {
                   // If the search is empty, it shows all unselected players.
                   suggestedPlayers = allPlayers.where((player) {
-                    return !selectedPlayers.contains(player);
+                    return !selectedPlayers.any((p) => p.id == player.id);
                   }).toList();
                 } else {
                   // If there is input, it filters by name match (case-insensitive) and ensures
@@ -108,9 +109,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                     final bool nameMatches = player.name.toLowerCase().contains(
                       value.toLowerCase(),
                     );
-                    final bool isNotSelected = !selectedPlayers.contains(
-                      player,
-                    );
+                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
                     return nameMatches && isNotSelected;
                   }).toList();
                 }
@@ -119,14 +118,14 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           ),
           const SizedBox(height: 10),
           Text(
-            AppLocalizations.of(
-              context,
-            ).selected_players(selectedPlayers.length),
+            loc.selected_players,
             style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
           ),
           const SizedBox(height: 10),
           SizedBox(
             height: 50,
+            child: AppSkeleton(
+              enabled: isLoading,
               child: selectedPlayers.isEmpty
                   ? Center(child: Text(loc.no_players_selected))
                   : SingleChildScrollView(
@@ -168,6 +167,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                       ),
                     ),
             ),
+          ),
           const SizedBox(height: 10),
           Text(
             loc.all_players,
@@ -245,8 +245,22 @@ 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];
             }
+          }
           isLoading = false;
         });
       });

lib/presentation/widgets/tiles/group_tile.dart

@@ -6,8 +6,9 @@ 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});
+  const GroupTile({super.key, required this.group, this.isHighlighted = false, this.onTap});
 
   /// The group data to be displayed.
   final Group group;
@@ -15,9 +16,14 @@ 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 AnimatedContainer(
+    return GestureDetector(
+      onTap: onTap,
+      child: AnimatedContainer(
         margin: CustomTheme.standardMargin,
         padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
         decoration: isHighlighted
@@ -71,6 +77,7 @@ class GroupTile extends StatelessWidget {
             const SizedBox(height: 2.5),
           ],
         ),
+      ),
     );
   }
 }

lib/presentation/widgets/tiles/match_tile.dart

@@ -10,8 +10,16 @@ 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({super.key, required this.match, required this.onTap});
+  const MatchTile({
+    super.key,
+    required this.match,
+    required this.onTap,
+    this.width,
+    this.compact = false,
+  });
 
   /// The match data to be displayed.
   final Match match;
@@ -19,6 +27,12 @@ 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();
 }
@@ -41,13 +55,10 @@ class _MatchTileState extends State<MatchTile> {
     return GestureDetector(
       onTap: widget.onTap,
       child: Container(
-        margin: CustomTheme.tileMargin,
+        margin: EdgeInsets.zero,
+        width: widget.width,
         padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
-          color: CustomTheme.boxColor,
-          border: Border.all(color: CustomTheme.boxBorder),
-          borderRadius: BorderRadius.circular(12),
-        ),
+        decoration: CustomTheme.standardBoxDecoration,
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -80,7 +91,22 @@ class _MatchTileState extends State<MatchTile> {
                   const SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      group.name,
+                      '${group.name}${widget.match.players != null ? ' + ${widget.match.players?.length}' : ''}',
+                      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,
                     ),
@@ -127,9 +153,46 @@ 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) ...[
+            if (_allPlayers.isNotEmpty && widget.compact == false) ...[
               Text(
                 loc.players,
                 style: const TextStyle(
@@ -161,13 +224,9 @@ class _MatchTileState extends State<MatchTile> {
     final loc = AppLocalizations.of(context);
 
     if (difference.inDays == 0) {
-      return AppLocalizations.of(
-        context,
-      ).today_at(DateFormat('HH:mm').format(dateTime));
+      return "${loc.today_at} ${DateFormat('HH:mm').format(dateTime)}";
     } else if (difference.inDays == 1) {
-      return AppLocalizations.of(
-        context,
-      ).yesterday_at(DateFormat('HH:mm').format(dateTime));
+      return "${loc.yesterday_at} ${DateFormat('HH:mm').format(dateTime)}";
     } else if (difference.inDays < 7) {
       return loc.days_ago(difference.inDays);
     } else {

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.1+21
+version: 0.0.4+101
 
 environment:
   sdk: ^3.8.1
@@ -9,11 +9,6 @@ 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
@@ -27,6 +22,7 @@ dependencies:
   intl: any
   flutter_localizations:
     sdk: flutter
+  package_info_plus: ^9.0.0
 
 dev_dependencies:
   flutter_test: