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

@@ -1,367 +1,359 @@
 {
-	"@@locale": "en",
+  "@@locale": "en",
-	"@all_players": {
+  "@all_players": {
-		"description": "Label for all players list"
+    "description": "Label for all players list"
-	},
+  },
-	"@all_players_selected": {
+  "@all_players_selected": {
-		"description": "Message when all players are added to selection"
+    "description": "Message when all players are added to selection"
-	},
+  },
-	"@amount_of_matches": {
+  "@amount_of_matches": {
-		"description": "Label for amount of matches statistic"
+    "description": "Label for amount of matches statistic"
-	},
+  },
-	"@cancel": {
+  "@app_name": {
-		"description": "Cancel button text"
+    "description": "The name of the App"
-	},
+  },
-	"@choose_game": {
+  "@cancel": {
-		"description": "Label for choosing a game"
+    "description": "Cancel button text"
-	},
+  },
-	"@choose_group": {
+  "@choose_game": {
-		"description": "Label for choosing a group"
+    "description": "Label for choosing a game"
-	},
+  },
-	"@choose_ruleset": {
+  "@choose_group": {
-		"description": "Label for choosing a ruleset"
+    "description": "Label for choosing a group"
-	},
+  },
-	"@could_not_add_player": {
+  "@choose_ruleset": {
-		"description": "Error message when adding a player fails",
+    "description": "Label for choosing a ruleset"
-		"placeholders": {
+  },
-			"playerName": {
+  "@could_not_add_player": {
-				"type": "String",
+    "description": "Error message when adding a player fails"
-				"example": "John"
+  },
-			}
+  "@create_group": {
-		}
+    "description": "Button text to create a group"
-	},
+  },
-	"@create_group": {
+  "@create_match": {
-		"description": "Button text to create a group"
+    "description": "Button text to create a match"
-	},
+  },
-	"@create_match": {
+  "@create_new_group": {
-		"description": "Button text to create a match"
+    "description": "Appbar text to create a new group"
-	},
+  },
-	"@create_new_group": {
+  "@create_new_match": {
-		"description": "Button text to create a new group"
+    "description": "Appbar text to create a new match"
-	},
+  },
-	"@create_new_match": {
+  "@data_successfully_deleted": {
-		"description": "Button text to create a new match"
+    "description": "Success message after deleting data"
-	},
+  },
-	"@data_successfully_deleted": {
+  "@data_successfully_exported": {
-		"description": "Success message after deleting data"
+    "description": "Success message after exporting data"
-	},
+  },
-	"@data_successfully_exported": {
+  "@data_successfully_imported": {
-		"description": "Success message after exporting data"
+    "description": "Success message after importing data"
-	},
+  },
-	"@data_successfully_imported": {
+  "@days_ago": {
-		"description": "Success message after importing data"
+    "description": "Date format for days ago",
-	},
+    "placeholders": {
-	"@days_ago": {
+      "count": {
-		"description": "Date format for days ago",
+        "type": "int"
-		"placeholders": {
+      }
-			"count": {
+    }
-				"type": "int"
+  },
-			}
+  "@delete": {
-		}
+    "description": "Delete button text"
-	},
+  },
-	"@delete": {
+  "@delete_all_data": {
-		"description": "Delete button text"
+    "description": "Confirmation dialog for deleting all data"
-	},
+  },
-	"@delete_all_data": {
+  "@delete_group": {
-		"description": "Confirmation dialog for deleting all data"
+    "description": "Confirmation dialog for deleting a group"
-	},
+  },
-	"@error_creating_group": {
+  "@edit_group": {
-		"description": "Error message when group creation fails"
+      "description": "Button & Appbar label for editing a group"
-	},
+  },
-	"@error_reading_file": {
+  "@error_creating_group": {
-		"description": "Error message when file cannot be read"
+    "description": "Error message when group creation fails"
-	},
+  },
-	"@export_canceled": {
+  "@error_deleting_group": {
-		"description": "Message when export is canceled"
+      "description": "Error message when group deletion fails"
-	},
+  },
-	"@export_data": {
+  "@error_editing_group": {
-		"description": "Export data menu item"
+      "description": "Error message when group editing fails"
-	},
+  },
-	"@format_exception": {
+  "@error_reading_file": {
-		"description": "Error message for format exceptions"
+    "description": "Error message when file cannot be read"
-	},
+  },
-	"@game": {
+  "@export_canceled": {
-		"description": "Game label"
+    "description": "Message when export is canceled"
-	},
+  },
-	"@game_name": {
+  "@export_data": {
-		"description": "Placeholder for game name search"
+    "description": "Export data menu item"
-	},
+  },
-	"@game_tracker": {
+  "@format_exception": {
-		"description": "App Name"
+    "description": "Error message for format exceptions"
-	},
+  },
-	"@group": {
+  "@game": {
-		"description": "Group label"
+    "description": "Game label"
-	},
+  },
-	"@group_name": {
+  "@game_name": {
-		"description": "Placeholder for group name input"
+    "description": "Placeholder for game name search"
-	},
+  },
-	"@groups": {
+  "@group": {
-		"description": "Label for groups"
+    "description": "Group label"
-	},
+  },
-	"@home": {
+  "@group_name": {
-		"description": "Home tab label"
+    "description": "Placeholder for group name input"
-	},
+  },
-	"@import_canceled": {
+  "@groups": {
-		"description": "Message when import is canceled"
+    "description": "Label for groups"
-	},
+  },
-	"@import_data": {
+  "@home": {
-		"description": "Import data menu item"
+    "description": "Home tab label"
-	},
+  },
-	"@info": {
+  "@import_canceled": {
-		"description": "Info label"
+    "description": "Message when import is canceled"
-	},
+  },
-	"@invalid_schema": {
+  "@import_data": {
-		"description": "Error message for invalid schema"
+    "description": "Import data menu item"
-	},
+  },
-	"@least_points": {
+  "@info": {
-		"description": "Title for least points ruleset"
+    "description": "Info label"
-	},
+  },
-	"@match_in_progress": {
+  "@invalid_schema": {
-		"description": "Message when match is in progress"
+    "description": "Error message for invalid schema"
-	},
+  },
-	"@match_name": {
+  "@least_points": {
-		"description": "Placeholder for match name input"
+    "description": "Title for least points ruleset"
-	},
+  },
-	"@matches": {
+  "@match_in_progress": {
-		"description": "Label for matches"
+    "description": "Message when match is in progress"
-	},
+  },
-	"@menu": {
+  "@match_name": {
-		"description": "Menu label"
+    "description": "Placeholder for match name input"
-	},
+  },
-	"@most_points": {
+  "@matches": {
-		"description": "Title for most points ruleset"
+    "description": "Label for matches"
-	},
+  },
-	"@no_data_available": {
+  "@menu": {
-		"description": "Message when no data in the statistic tiles is given"
+    "description": "Menu label"
-	},
+  },
-	"@no_groups_created_yet": {
+  "@most_points": {
-		"description": "Message when no groups exist"
+    "description": "Title for most points ruleset"
-	},
+  },
-	"@no_matches_created_yet": {
+  "@no_data_available": {
-		"description": "Message when no matches exist"
+    "description": "Message when no data in the statistic tiles is given"
-	},
+  },
-	"@no_players_created_yet": {
+  "@no_groups_created_yet": {
-		"description": "Message when no players exist"
+    "description": "Message when no groups exist"
-	},
+  },
-	"@no_players_found_with_that_name": {
+  "@no_matches_created_yet": {
-		"description": "Message when search returns no results"
+    "description": "Message when no matches exist"
-	},
+  },
-	"@no_players_selected": {
+  "@no_players_created_yet": {
-		"description": "Message when no players are selected"
+    "description": "Message when no players exist"
-	},
+  },
-	"@no_recent_matches_available": {
+  "@no_players_found_with_that_name": {
-		"description": "Message when no recent matches exist"
+    "description": "Message when search returns no results"
-	},
+  },
-	"@no_second_match_available": {
+  "@no_players_selected": {
-		"description": "Message when no second match exists"
+    "description": "Message when no players are selected"
-	},
+  },
-	"@no_statistics_available": {
+  "@no_recent_matches_available": {
-		"description": "Message when no statistics are available, because no matches were played yet"
+    "description": "Message when no recent matches exist"
-	},
+  },
-	"@none": {
+  "@no_second_match_available": {
-		"description": "None option label"
+    "description": "Message when no second match exists"
-	},
+  },
-	"@none_group": {
+  "@no_statistics_available": {
-		"description": "None group option label"
+    "description": "Message when no statistics are available, because no matches were played yet"
-	},
+  },
-	"@not_available": {
+  "@none": {
-		"description": "Abbreviation for not available"
+    "description": "None option label"
-	},
+  },
-	"@player_name": {
+  "@none_group": {
-		"description": "Placeholder for player name input"
+    "description": "None group option label"
-	},
+  },
-	"@players": {
+  "@not_available": {
-		"description": "Players label"
+    "description": "Abbreviation for not available"
-	},
+  },
-	"@players_count": {
+  "@player_name": {
-		"description": "Shows the number of players",
+    "description": "Placeholder for player name input"
-		"placeholders": {
+  },
-			"count": {
+  "@players": {
-				"type": "int"
+    "description": "Players label"
-			}
+  },
-		}
+  "@players_count": {
-	},
+    "description": "Shows the number of players",
-	"@quick_create": {
+    "placeholders": {
-		"description": "Title for quick create section"
+      "count": {
-	},
+        "type": "int"
-	"@recent_matches": {
+      }
-		"description": "Title for recent matches section"
+    }
-	},
+  },
-	"@ruleset": {
+  "@quick_create": {
-		"description": "Ruleset label"
+    "description": "Title for quick create section"
-	},
+  },
-	"@ruleset_least_points": {
+  "@recent_matches": {
-		"description": "Description for least points ruleset"
+    "description": "Title for recent matches section"
-	},
+  },
-	"@ruleset_most_points": {
+  "@ruleset": {
-		"description": "Description for most points ruleset"
+    "description": "Ruleset label"
-	},
+  },
-	"@ruleset_single_loser": {
+  "@ruleset_least_points": {
-		"description": "Description for single loser ruleset"
+    "description": "Description for least points ruleset"
-	},
+  },
-	"@ruleset_single_winner": {
+  "@ruleset_most_points": {
-		"description": "Description for single winner ruleset"
+    "description": "Description for most points ruleset"
-	},
+  },
-	"@search_for_groups": {
+  "@ruleset_single_loser": {
-		"description": "Hint text for group search input field"
+    "description": "Description for single loser ruleset"
-	},
+  },
-	"@search_for_players": {
+  "@ruleset_single_winner": {
-		"description": "Hint text for player search input field"
+    "description": "Description for single winner ruleset"
-	},
+  },
-	"@select_winner": {
+  "@search_for_groups": {
-		"description": "Label to select the winner"
+    "description": "Hint text for group search input field"
-	},
+  },
-	"@selected_players": {
+  "@search_for_players": {
-		"description": "Shows the number of selected players",
+    "description": "Hint text for player search input field"
-		"placeholders": {
+  },
-			"count": {
+  "@select_winner": {
-				"type": "int",
+    "description": "Label to select the winner"
-				"format": "compact"
+  },
-			}
+  "@selected_players": {
-		}
+    "description": "Shows the number of selected players"
-	},
+  },
-	"@settings": {
+  "@settings": {
-		"description": "Settings label"
+    "description": "Settings label"
-	},
+  },
-	"@single_loser": {
+  "@single_loser": {
-		"description": "Title for single loser ruleset"
+    "description": "Title for single loser ruleset"
-	},
+  },
-	"@single_winner": {
+  "@single_winner": {
-		"description": "Title for single winner ruleset"
+    "description": "Title for single winner ruleset"
-	},
+  },
-	"@statistics": {
+  "@statistics": {
-		"description": "Statistics tab label"
+    "description": "Statistics tab label"
-	},
+  },
-	"@stats": {
+  "@stats": {
-		"description": "Stats tab label (short)"
+    "description": "Stats tab label (short)"
-	},
+  },
-	"@successfully_added_player": {
+  "@successfully_added_player": {
-		"description": "Success message when adding a player",
+    "description": "Success message when adding a player",
-		"placeholders": {
+    "placeholders": {
-			"playerName": {
+      "playerName": {
-				"type": "String",
+        "type": "String",
-				"example": "John"
+        "example": "John"
-			}
+      }
-		}
+    }
-	},
+  },
-	"@there_is_no_group_matching_your_search": {
+  "@there_is_no_group_matching_your_search": {
-		"description": "Message when search returns no groups"
+    "description": "Message when search returns no groups"
-	},
+  },
-	"@this_cannot_be_undone": {
+  "@this_cannot_be_undone": {
-		"description": "Warning message for irreversible actions"
+    "description": "Warning message for irreversible actions"
-	},
+  },
-	"@today_at": {
+  "@today_at": {
-		"description": "Date format for today",
+    "description": "Date format for today"
-		"placeholders": {
+  },
-			"time": {
+  "@undo": {
-				"type": "String",
+    "description": "Undo button text"
-				"example": "14:30"
+  },
-			}
+  "@unknown_exception": {
-		}
+    "description": "Error message for unknown exceptions"
-	},
+  },
-	"@undo": {
+  "@winner": {
-		"description": "Undo button text"
+    "description": "Winner label"
-	},
+  },
-	"@unknown_exception": {
+  "@winrate": {
-		"description": "Error message for unknown exceptions"
+    "description": "Label for winrate statistic"
-	},
+  },
-	"@winner": {
+  "@wins": {
-		"description": "Winner label"
+    "description": "Label for wins statistic"
-	},
+  },
-	"@winrate": {
+  "@yesterday_at": {
-		"description": "Label for winrate statistic"
+    "description": "Date format for yesterday"
-	},
+  },
-	"@wins": {
+  "all_players": "All players",
-		"description": "Label for wins statistic"
+  "all_players_selected": "All players selected",
-	},
+  "amount_of_matches": "Amount of Matches",
-	"@yesterday_at": {
+  "app_name": "Game Tracker",
-		"description": "Date format for yesterday",
+  "cancel": "Cancel",
-		"placeholders": {
+  "choose_game": "Choose Game",
-			"time": {
+  "choose_group": "Choose Group",
-				"type": "String",
+  "choose_ruleset": "Choose Ruleset",
-				"example": "14:30"
+  "could_not_add_player": "Could not add player",
-			}
+  "create_group": "Create Group",
-		}
+  "create_match": "Create match",
-	},
+  "create_new_group": "Create new group",
-	"all_players": "All players:",
+  "create_new_match": "Create new match",
-	"all_players_selected": "All players selected",
+  "data_successfully_deleted": "Data successfully deleted",
-	"amount_of_matches": "Amount of Matches",
+  "data_successfully_exported": "Data successfully exported",
-	"cancel": "Cancel",
+  "data_successfully_imported": "Data successfully imported",
-	"choose_game": "Choose Game",
+  "days_ago": "{count} days ago",
-	"choose_group": "Choose Group",
+  "delete": "Delete",
-	"choose_ruleset": "Choose Ruleset",
+  "delete_all_data": "Delete all data",
-	"could_not_add_player": "Could not add player {playerName}",
+  "delete_group": "Delete this group",
-	"create_group": "Create Group",
+  "edit_group": "Edit Group",
-	"create_match": "Create match",
+  "error_creating_group": "Error while creating group, please try again",
-	"create_new_group": "Create new group",
+  "error_deleting_group": "Error while deleting group, please try again",
-	"create_new_match": "Create new match",
+  "error_editing_group": "Error while editing group, please try again",
-	"data_successfully_deleted": "Data successfully deleted",
+  "error_reading_file": "Error reading file",
-	"data_successfully_exported": "Data successfully exported",
+  "export_canceled": "Export canceled",
-	"data_successfully_imported": "Data successfully imported",
+  "export_data": "Export data",
-	"days_ago": "{count} days ago",
+  "format_exception": "Format Exception (see console)",
-	"delete": "Delete",
+  "game": "Game",
-	"delete_all_data": "Delete all data?",
+  "game_name": "Game Name",
-	"error_creating_group": "Error while creating group, please try again",
+  "group": "Group",
-	"error_reading_file": "Error reading file",
+  "group_name": "Group name",
-	"export_canceled": "Export canceled",
+  "groups": "Groups",
-	"export_data": "Export data",
+  "home": "Home",
-	"format_exception": "Format Exception (see console)",
+  "import_canceled": "Import canceled",
-	"game": "Game",
+  "import_data": "Import data",
-	"game_name": "Game Name",
+  "info": "Info",
-	"game_tracker": "Game Tracker",
+  "invalid_schema": "Invalid Schema",
-	"group": "Group",
+  "least_points": "Least Points",
-	"group_name": "Group name",
+  "match_in_progress": "Match in progress...",
-	"groups": "Groups",
+  "match_name": "Match name",
-	"home": "Home",
+  "matches": "Matches",
-	"import_canceled": "Import canceled",
+  "menu": "Menu",
-	"import_data": "Import data",
+  "most_points": "Most Points",
-	"info": "Info",
+  "no_data_available": "No data available",
-	"invalid_schema": "Invalid Schema",
+  "no_groups_created_yet": "No groups created yet",
-	"least_points": "Least Points",
+  "no_matches_created_yet": "No matches created yet",
-	"match_in_progress": "Match in progress...",
+  "no_players_created_yet": "No players created yet",
-	"match_name": "Match name",
+  "no_players_found_with_that_name": "No players found with that name",
-	"matches": "Matches",
+  "no_players_selected": "No players selected",
-	"menu": "Menu",
+  "no_recent_matches_available": "No recent matches available",
-	"most_points": "Most Points",
+  "no_second_match_available": "No second match available",
-	"no_data_available": "No data available",
+  "no_statistics_available": "No statistics available",
-	"no_groups_created_yet": "No groups created yet",
+  "none": "None",
-	"no_matches_created_yet": "No matches created yet",
+  "none_group": "None",
-	"no_players_created_yet": "No players created yet",
+  "not_available": "Not available",
-	"no_players_found_with_that_name": "No players found with that name",
+  "player_name": "Player name",
-	"no_players_selected": "No players selected",
+  "players": "Players",
-	"no_recent_matches_available": "No recent matches available",
+  "players_count": "{count} Players",
-	"no_second_match_available": "No second match available",
+  "quick_create": "Quick Create",
-	"no_statistics_available": "No statistics available",
+  "recent_matches": "Recent Matches",
-	"none": "None",
+  "ruleset": "Ruleset",
-	"none_group": "None",
+  "ruleset_least_points": "Inverse scoring: the player with the fewest points wins.",
-	"not_available": "Not available",
+  "ruleset_most_points": "Traditional ruleset: the player with the most points wins.",
-	"player_name": "Player name",
+  "ruleset_single_loser": "Exactly one loser is determined; last place receives the penalty or consequence.",
-	"players": "Players",
+  "ruleset_single_winner": "Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.",
-	"players_count": "{count} Players",
+  "search_for_groups": "Search for groups",
-	"quick_create": "Quick Create",
+  "search_for_players": "Search for players",
-	"recent_matches": "Recent Matches",
+  "select_winner": "Select Winner:",
-	"ruleset": "Ruleset",
+  "selected_players": "Selected players",
-	"ruleset_least_points": "Inverse scoring: the player with the fewest points wins.",
+  "settings": "Settings",
-	"ruleset_most_points": "Traditional ruleset: the player with the most points wins.",
+  "single_loser": "Single Loser",
-	"ruleset_single_loser": "Exactly one loser is determined; last place receives the penalty or consequence.",
+  "single_winner": "Single Winner",
-	"ruleset_single_winner": "Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.",
+  "statistics": "Statistics",
-	"search_for_groups": "Search for groups",
+  "stats": "Stats",
-	"search_for_players": "Search for players",
+  "successfully_added_player": "Successfully added player {playerName}",
-	"select_winner": "Select Winner:",
+  "there_is_no_group_matching_your_search": "There is no group matching your search",
-	"selected_players": "Selected players: {count}",
+  "this_cannot_be_undone": "This can't be undone",
-	"settings": "Settings",
+  "today_at": "Today at",
-	"single_loser": "Single Loser",
+  "undo": "Undo",
-	"single_winner": "Single Winner",
+  "unknown_exception": "Unknown Exception (see console)",
-	"statistics": "Statistics",
+  "winner": "Winner",
-	"stats": "Stats",
+  "winrate": "Winrate",
-	"successfully_added_player": "Successfully added player {playerName}",
+  "wins": "Wins",
-	"there_is_no_group_matching_your_search": "There is no group matching your search",
+  "yesterday_at": "Yesterday at"
-	"this_cannot_be_undone": "This can't be undone",
-	"today_at": "Today at {time}",
-	"undo": "Undo",
-	"unknown_exception": "Unknown Exception (see console)",
-	"winner": "Winner",
-	"winrate": "Winrate",
-	"wins": "Wins",
-	"yesterday_at": "Yesterday at {time}"
 }

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}'**
+  /// **'Could not add player'**
-  String could_not_add_player(String playerName);
+  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}'**
+  /// **'Selected players'**
-  String selected_players(int count);
+  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}'**
+  /// **'Today at'**
-  String today_at(String time);
+  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}'**
+  /// **'Yesterday at'**
-  String yesterday_at(String time);
+  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) {
+  String get selected_players => 'Ausgewählte Spieler:innen';
-    final intl.NumberFormat countNumberFormat = intl.NumberFormat.compact(
-      locale: localeName,
-    );
-    final String countString = countNumberFormat.format(count);
-
-    return 'Ausgewählte Spieler:innen: $countString';
-  }
 
   @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) {
+  String get today_at => 'Heute um';
-    return 'Heute um $time';
-  }
 
   @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) {
+  String get yesterday_at => 'Gestern um';
-    return 'Gestern um $time';
-  }
 }

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) {
+  String could_not_add_player(Object playerName) {
-    return 'Could not add player $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) {
+  String get selected_players => 'Selected players';
-    final intl.NumberFormat countNumberFormat = intl.NumberFormat.compact(
-      locale: localeName,
-    );
-    final String countString = countNumberFormat.format(count);
-
-    return 'Selected players: $countString';
-  }
 
   @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) {
+  String get today_at => 'Today at';
-    return 'Today at $time';
-  }
 
   @override
   String get undo => 'Undo';
@@ -273,7 +278,5 @@ class AppLocalizationsEn extends AppLocalizations {
   String get wins => 'Wins';
 
   @override
-  String yesterday_at(String time) {
+  String get yesterday_at => 'Yesterday at';
-    return 'Yesterday at $time';
-  }
 }

lib/main.dart

@@ -34,21 +34,23 @@ class GameTracker extends StatelessWidget {
         );
       },
       debugShowCheckedModeBanner: false,
-      onGenerateTitle: (context) => AppLocalizations.of(context).game_tracker,
+      onGenerateTitle: (context) => AppLocalizations.of(context).app_name,
-      darkTheme: ThemeData.dark(),
-
       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,121 +91,92 @@ class _HomeViewState extends State<HomeView> {
                   child: InfoTile(
                     width: constraints.maxWidth * 0.95,
                     title: loc.recent_matches,
-                    icon: Icons.timer,
+                    icon: Icons.history_rounded,
-                    content: Padding(
+                    content: Column(
-                      padding: const EdgeInsets.symmetric(horizontal: 40.0),
+                      children: [
-                      child: Visibility(
+                        if (recentMatches.isNotEmpty)
-                        visible: !isLoading && loadedRecentMatches.isNotEmpty,
+                          for (Match match in recentMatches)
-                        replacement: Center(
+                            Padding(
-                          heightFactor: 12,
+                              padding: const EdgeInsets.symmetric(
-                          child: Text(
+                                vertical: 6.0,
-                            AppLocalizations.of(
+                              ),
-                              context,
+                              child: MatchTile(
-                            ).no_recent_matches_available,
+                                compact: true,
+                                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,
-                                ),
-                              ),
-                            ],
-                          ],
-                        ),
-                      ),
                     ),
                   ),
                 ),
-                InfoTile(
+                Padding(
-                  width: constraints.maxWidth * 0.95,
+                  padding: EdgeInsets.zero,
-                  title: loc.quick_create,
+                  child: InfoTile(
-                  icon: Icons.add_box_rounded,
+                    width: constraints.maxWidth * 0.95,
-                  content: Column(
+                    title: loc.quick_create,
-                    children: [
+                    icon: Icons.add_box_rounded,
-                      Row(
+                    content: Column(
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                      children: [
-                        children: [
+                        Row(
-                          QuickCreateButton(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            text: 'Category 1',
+                          children: [
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 1',
-                          QuickCreateButton(
+                              onPressed: () {},
-                            text: 'Category 2',
+                            ),
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 2',
-                        ],
+                              onPressed: () {},
-                      ),
+                            ),
-                      Row(
+                          ],
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        ),
-                        children: [
+                        Row(
-                          QuickCreateButton(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            text: 'Category 3',
+                          children: [
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 3',
-                          QuickCreateButton(
+                              onPressed: () {},
-                            text: 'Category 4',
+                            ),
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 4',
-                        ],
+                              onPressed: () {},
-                      ),
+                            ),
-                      Row(
+                          ],
-                        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                        ),
-                        children: [
+                        Row(
-                          QuickCreateButton(
+                          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            text: 'Category 5',
+                          children: [
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 5',
-                          QuickCreateButton(
+                              onPressed: () {},
-                            text: 'Category 6',
+                            ),
-                            onPressed: () {},
+                            QuickCreateButton(
-                          ),
+                              text: 'Category 6',
-                        ],
+                              onPressed: () {},
-                      ),
+                            ),
-                    ],
+                          ],
+                        ),
+                      ],
+                    ),
                   ),
                 ),
+                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.
+  /// Updates the winner information for a specific match in the recent matches list.
-  /// If the match has a group, it returns the group name and the number of additional players.
+  Future<void> updatedWinnerinRecentMatches(String matchId) async {
-  /// If there is no group, it returns the count of players.
+    final db = Provider.of<AppDatabase>(context, listen: false);
-  String _getPlayerText(Match game, context) {
+    final winner = await db.matchDao.getWinner(matchId: matchId);
-    final loc = AppLocalizations.of(context);
+    final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
-    if (game.group == null) {
+    if (matchIndex != -1) {
-      final playerCount = game.players?.length ?? 0;
+      setState(() {
-      return loc.players_count(playerCount);
+        recentMatches[matchIndex].winner = winner;
+      });
     }
-    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,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,140 +122,143 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
-      backgroundColor: CustomTheme.backgroundColor,
+      key: _scaffoldMessengerKey,
-      appBar: AppBar(title: Text(loc.create_new_match)),
+      child: Scaffold(
-      body: SafeArea(
+        backgroundColor: CustomTheme.backgroundColor,
-        child: Column(
+        appBar: AppBar(title: Text(loc.create_new_match)),
-          mainAxisAlignment: MainAxisAlignment.start,
+        body: SafeArea(
-          children: [
+          child: Column(
-            Container(
+            mainAxisAlignment: MainAxisAlignment.start,
-              margin: CustomTheme.tileMargin,
+            children: [
-              child: TextInputField(
+              Container(
-                controller: _matchNameController,
+                margin: CustomTheme.tileMargin,
-                hintText: hintText ?? '',
+                child: TextInputField(
+                  controller: _matchNameController,
+                  hintText: hintText ?? '',
+                ),
               ),
-            ),
+              ChooseTile(
-            ChooseTile(
+                title: loc.game,
-              title: loc.game,
+                trailingText: selectedGameIndex == -1
-              trailingText: selectedGameIndex == -1
+                    ? loc.none
-                  ? loc.none
+                    : games[selectedGameIndex].$1,
-                  : games[selectedGameIndex].$1,
+                onPressed: () async {
-              onPressed: () async {
+                  selectedGameIndex = await Navigator.of(context).push(
-                selectedGameIndex = await Navigator.of(context).push(
+                    adaptivePageRoute(
-                  MaterialPageRoute(
+                      builder: (context) => ChooseGameView(
-                    builder: (context) => ChooseGameView(
+                        games: games,
-                      games: games,
+                        initialGameIndex: selectedGameIndex,
-                      initialGameIndex: selectedGameIndex,
+                      ),
                     ),
-                  ),
+                  );
-                );
-                setState(() {
-                  if (selectedGameIndex != -1) {
-                    hintText = games[selectedGameIndex].$1;
-                    selectedRuleset = games[selectedGameIndex].$3;
-                    selectedRulesetIndex = _rulesets.indexWhere(
-                      (r) => r.$1 == selectedRuleset,
-                    );
-                  } else {
-                    hintText = AppLocalizations.of(context).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(() {
-                    selectedPlayers = value;
+                    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(
-            CustomWidthButton(
+                title: loc.ruleset,
-              text: loc.create_match,
+                trailingText: selectedRuleset == null
-              sizeRelativeToWidth: 0.95,
+                    ? loc.none
-              buttonType: ButtonType.primary,
+                    : translateRulesetToString(selectedRuleset!, context),
-              onPressed: _enableCreateGameButton()
+                onPressed: () async {
-                  ? () async {
+                  selectedRuleset = await Navigator.of(context).push(
-                      Match match = Match(
+                    adaptivePageRoute(
-                        name: _matchNameController.text.isEmpty
+                      builder: (context) => ChooseRulesetView(
-                            ? (hintText ?? '')
+                        rulesets: _rulesets,
-                            : _matchNameController.text.trim(),
+                        initialRulesetIndex: selectedRulesetIndex,
-                        createdAt: DateTime.now(),
+                      ),
-                        group: selectedGroup,
+                    ),
-                        players: selectedPlayers,
+                  );
-                      );
+                  if (!mounted) return;
-                      await db.matchDao.addMatch(match: match);
+                  selectedRulesetIndex = _rulesets.indexWhere(
-                      if (context.mounted) {
+                    (r) => r.$1 == selectedRuleset,
-                        Navigator.pushReplacement(
+                  );
-                          context,
+                  selectedGameIndex = -1;
-                          CupertinoPageRoute(
+                  setState(() {});
-                            fullscreenDialog: true,
+                },
-                            builder: (context) => MatchResultView(
+              ),
-                              match: match,
+              ChooseTile(
-                              onWinnerChanged: widget.onWinnerChanged,
+                title: loc.group,
-                            ),
+                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,20 +78,26 @@ class _MatchViewState extends State<MatchView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return MatchTile(
+                  return Center(
-                    onTap: () async {
+                    child: Padding(
-                      Navigator.push(
+                      padding: const EdgeInsets.only(bottom: 12.0),
-                        context,
+                      child: MatchTile(
-                        CupertinoPageRoute(
+                        width: MediaQuery.sizeOf(context).width * 0.95,
-                          fullscreenDialog: true,
+                        onTap: () async {
-                          builder: (context) => MatchResultView(
+                          Navigator.push(
-                            match: matches[index],
+                            context,
-                            onWinnerChanged: loadGames,
+                            adaptivePageRoute(
-                          ),
+                              fullscreenDialog: true,
-                        ),
+                              builder: (context) => MatchResultView(
-                      );
+                                match: matches[index],
-                    },
+                                onWinnerChanged: loadGames,
-                    match: matches[index],
+                              ),
+                            ),
+                          );
+                        },
+                        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,113 +14,132 @@ 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(
-      appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
+      key: _scaffoldMessengerKey,
-      backgroundColor: CustomTheme.backgroundColor,
+      child: Scaffold(
-      body: LayoutBuilder(
+        appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
-        builder: (BuildContext context, BoxConstraints constraints) =>
+        backgroundColor: CustomTheme.backgroundColor,
-            SingleChildScrollView(
+        body: Column(
-              child: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
-                children: [
+            Padding(
-                  Padding(
+              padding: const EdgeInsets.fromLTRB(24, 0, 24, 10),
-                    padding: const EdgeInsets.fromLTRB(24, 0, 24, 10),
+              child: Text(
-                    child: Text(
+                textAlign: TextAlign.start,
-                      textAlign: TextAlign.start,
+                loc.menu,
-                      loc.menu,
+                style: const TextStyle(
-                      style: const TextStyle(
+                  fontSize: 28,
-                        fontSize: 28,
+                  fontWeight: FontWeight.bold,
-                        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) {
-                          DataTransferService.deleteAllData(context);
-                          showSnackbar(
-                            context: context,
-                            message: AppLocalizations.of(
-                              context,
-                            ).data_successfully_deleted,
-                          );
-                        }
-                      });
-                    },
-                  ),
-                ],
               ),
             ),
+            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) {
+                    DataTransferService.deleteAllData(context);
+                    showSnackbar(
+                      context: context,
+                      message: AppLocalizations.of(
+                        context,
+                      ).data_successfully_deleted,
+                    );
+                  }
+                });
+              },
+            ),
+            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(
+                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
-                      player,
-                    );
                     return nameMatches && isNotSelected;
                   }).toList();
                 }
@@ -119,54 +118,55 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           ),
           const SizedBox(height: 10),
           Text(
-            AppLocalizations.of(
+            loc.selected_players,
-              context,
-            ).selected_players(selectedPlayers.length),
             style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
           ),
           const SizedBox(height: 10),
           SizedBox(
             height: 50,
-            child: selectedPlayers.isEmpty
+            child: AppSkeleton(
-                ? Center(child: Text(loc.no_players_selected))
+              enabled: isLoading,
-                : SingleChildScrollView(
+              child: selectedPlayers.isEmpty
-                    scrollDirection: Axis.horizontal,
+                  ? Center(child: Text(loc.no_players_selected))
-                    child: Row(
+                  : SingleChildScrollView(
-                      children: [
+                      scrollDirection: Axis.horizontal,
-                        for (var player in selectedPlayers)
+                      child: Row(
-                          Padding(
+                        children: [
-                            padding: const EdgeInsets.only(right: 8.0),
+                          for (var player in selectedPlayers)
-                            child: TextIconTile(
+                            Padding(
-                              text: player.name,
+                              padding: const EdgeInsets.only(right: 8.0),
-                              onIconTap: () {
+                              child: TextIconTile(
-                                setState(() {
+                                text: player.name,
-                                  // Removes the player from the selection and notifies the parent.
+                                onIconTap: () {
-                                  selectedPlayers.remove(player);
+                                  setState(() {
-                                  widget.onChanged([...selectedPlayers]);
+                                    // Removes the player from the selection and notifies the parent.
+                                    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,7 +245,21 @@ class _PlayerSelectionState extends State<PlayerSelection> {
             // Otherwise, use the loaded players from the database.
             loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
             allPlayers = [...loadedPlayers];
-            suggestedPlayers = [...loadedPlayers];
+            if (widget.initialSelectedPlayers != null) {
+              // Excludes already selected players from the suggested players list.
+              suggestedPlayers = loadedPlayers.where((p) => !widget.initialSelectedPlayers!.any((ip) => ip.id == p.id)).toList();
+              // Ensures that only players available for selection are pre-selected.
+              selectedPlayers = widget.initialSelectedPlayers!
+                  .where(
+                    (p) => allPlayers.any(
+                      (available) => available.id == p.id,
+                ),
+              )
+                  .toList();
+            } else {
+              // If no initial selection, all loaded players are suggested.
+              suggestedPlayers = [...loadedPlayers];
+            }
           }
           isLoading = false;
         });

lib/presentation/widgets/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,61 +16,67 @@ 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(
-      margin: CustomTheme.standardMargin,
+      onTap: onTap,
-      padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
+      child: AnimatedContainer(
-      decoration: isHighlighted
+        margin: CustomTheme.standardMargin,
-          ? CustomTheme.highlightedBoxDecoration
+        padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
-          : CustomTheme.standardBoxDecoration,
+        decoration: isHighlighted
-      duration: const Duration(milliseconds: 150),
+            ? CustomTheme.highlightedBoxDecoration
-      child: Column(
+            : CustomTheme.standardBoxDecoration,
-        crossAxisAlignment: CrossAxisAlignment.start,
+        duration: const Duration(milliseconds: 150),
-        children: [
+        child: Column(
-          Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
-            children: [
+            Row(
-              Flexible(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                child: Text(
+              children: [
-                  group.name,
+                Flexible(
-                  overflow: TextOverflow.ellipsis,
+                  child: Text(
-                  style: const TextStyle(
+                    group.name,
-                    fontWeight: FontWeight.bold,
+                    overflow: TextOverflow.ellipsis,
-                    fontSize: 18,
-                  ),
-                ),
-              ),
-              Row(
-                children: [
-                  Text(
-                    '${group.members.length}',
                     style: const TextStyle(
-                      fontWeight: FontWeight.w900,
+                      fontWeight: FontWeight.bold,
                       fontSize: 18,
                     ),
                   ),
-                  const SizedBox(width: 3),
+                ),
-                  const Icon(Icons.group, size: 22),
+                Row(
-                ],
+                  children: [
-              ),
+                    Text(
-            ],
+                      '${group.members.length}',
-          ),
+                      style: const TextStyle(
-          const SizedBox(height: 5),
+                        fontWeight: FontWeight.w900,
-          Wrap(
+                        fontSize: 18,
-            alignment: WrapAlignment.start,
+                      ),
-            crossAxisAlignment: WrapCrossAlignment.start,
+                    ),
-            spacing: 12.0,
+                    const SizedBox(width: 3),
-            runSpacing: 8.0,
+                    const Icon(Icons.group, size: 22),
-            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: 5),
-            ],
+            Wrap(
-          ),
+              alignment: WrapAlignment.start,
-          const SizedBox(height: 2.5),
+              crossAxisAlignment: WrapCrossAlignment.start,
-        ],
+              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,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(
+        decoration: CustomTheme.standardBoxDecoration,
-          color: CustomTheme.boxColor,
-          border: Border.all(color: CustomTheme.boxBorder),
-          borderRadius: BorderRadius.circular(12),
-        ),
         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(
+      return "${loc.today_at} ${DateFormat('HH:mm').format(dateTime)}";
-        context,
-      ).today_at(DateFormat('HH:mm').format(dateTime));
     } else if (difference.inDays == 1) {
-      return AppLocalizations.of(
+      return "${loc.yesterday_at} ${DateFormat('HH:mm').format(dateTime)}";
-        context,
-      ).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: