fix merge mistake

Merge remote-tracking branch 'origin/development' into feature/118-bearbeiten-und-löschen-von-gruppen
# 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
2026-01-10 22:20:14 +01:00 · 2026-01-10 22:19:19 +01:00 · 2026-01-10 22:13:26 +01:00 · 2026-01-10 22:11:28 +01:00 · 2026-01-10 20:48:25 +00:00 · 2026-01-10 20:14:37 +01:00
24 changed files with 670 additions and 8253 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -150,9 +150,25 @@ app.*.symbols
 .gclient_previous_custom_vars
 .gclient_previous_sync_commits

+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
 .swiftpm/
 migrate_working_dir/

+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/

 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
@@ -160,8 +176,17 @@ migrate_working_dir/
 #.vscode/

 # Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
 /build/

+# Symbolication related
+app.*.symbols

 # Obfuscation related
 app.*.map.json
@@ -171,5 +196,3 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 /devtools_options.yaml
-
-untranslated_messages.json
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -18,7 +18,7 @@ pluginManagement {

 plugins {
    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.9.1" apply false
+    id("com.android.application") version "8.7.3" apply false
    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }

--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -24,11 +24,6 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>LSApplicationQueriesSchemes</key>
-    <array>
-        <string>https</string>
-        <string>http</string>
-    </array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -49,4 +44,4 @@
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 </dict>
-</plist>
+</plist>
--- a/l10n.yaml
+++ b/l10n.yaml
@@ -2,5 +2,4 @@ arb-dir: lib/l10n/arb
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 output-dir: lib/l10n/generated
-nullable-getter: false
-untranslated-messages-file: lib/l10n/untranslated_messages.json
+nullable-getter: false
--- a/lib/l10n/arb/app_de.arb
+++ b/lib/l10n/arb/app_de.arb
@@ -3,7 +3,6 @@
  "all_players": "Alle Spieler:innen",
  "all_players_selected": "Alle Spieler:innen ausgewählt",
  "amount_of_matches": "Anzahl der Spiele",
-  "app_name": "Game Tracker",
  "cancel": "Abbrechen",
  "choose_game": "Spielvorlage wählen",
  "choose_group": "Gruppe wählen",
@@ -13,14 +12,17 @@
  "create_match": "Spiel erstellen",
  "create_new_group": "Neue Gruppe erstellen",
  "create_new_match": "Neues Spiel erstellen",
-  "data": "Daten",
  "data_successfully_deleted": "Daten erfolgreich gelöscht",
  "data_successfully_exported": "Daten erfolgreich exportiert",
  "data_successfully_imported": "Daten erfolgreich importiert",
  "days_ago": "vor {count} Tagen",
  "delete": "Löschen",
  "delete_all_data": "Alle Daten löschen",
+  "delete_group": "Diese Gruppe löschen",
+  "edit_group": "Gruppe bearbeiten",
  "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",
@@ -36,9 +38,6 @@
  "info": "Info",
  "invalid_schema": "Ungültiges Schema",
  "least_points": "Niedrigste Punkte",
-  "legal": "Rechtliches",
-  "legal_notice": "Impressum",
-  "licenses": "Lizenzen",
  "match_in_progress": "Spiel läuft...",
  "match_name": "Spieltitel",
  "matches": "Spiele",
@@ -46,8 +45,6 @@
  "most_points": "Höchste Punkte",
  "no_data_available": "Keine Daten verfügbar",
  "no_groups_created_yet": "Noch keine Gruppen erstellt",
-  "no_licenses_found": "Keine Lizenzen gefunden",
-  "no_license_text_available": "Kein Lizenztext verfügbar",
  "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",
@@ -61,7 +58,6 @@
  "player_name": "Spieler:innenname",
  "players": "Spieler:innen",
  "players_count": "{count} Spieler",
-  "privacy_policy": "Datenschutzerklärung",
  "quick_create": "Schnellzugriff",
  "recent_matches": "Letzte Spiele",
  "ruleset": "Regelwerk",
@@ -73,6 +69,7 @@
  "search_for_players": "Nach Spieler:innen suchen",
  "select_winner": "Gewinner:in wählen:",
  "selected_players": "Ausgewählte Spieler:innen",
+  "settings": "Einstellungen",
  "single_loser": "Ein:e Verlierer:in",
  "single_winner": "Ein:e Gewinner:in",
  "statistics": "Statistiken",
--- a/lib/l10n/arb/app_en.arb
+++ b/lib/l10n/arb/app_en.arb
@@ -34,13 +34,10 @@
    "description": "Button text to create a match"
  },
  "@create_new_group": {
-    "description": "Button text to create a new group"
+    "description": "Appbar text to create a new group"
  },
  "@create_new_match": {
-    "description": "Button text to create a new match"
-  },
-  "@data": {
-    "description": "Data label"
+    "description": "Appbar text to create a new match"
  },
  "@data_successfully_deleted": {
    "description": "Success message after deleting data"
@@ -65,9 +62,21 @@
  "@delete_all_data": {
    "description": "Confirmation dialog for deleting all data"
  },
+  "@delete_group": {
+    "description": "Confirmation dialog for deleting a group"
+  },
+  "@edit_group": {
+      "description": "Button & Appbar label for editing a group"
+  },
  "@error_creating_group": {
    "description": "Error message when group creation fails"
  },
+  "@error_deleting_group": {
+      "description": "Error message when group deletion fails"
+  },
+  "@error_editing_group": {
+      "description": "Error message when group editing fails"
+  },
  "@error_reading_file": {
    "description": "Error message when file cannot be read"
  },
@@ -113,15 +122,6 @@
  "@least_points": {
    "description": "Title for least points ruleset"
  },
-  "@legal": {
-    "description": "Legal section header"
-  },
-  "@legal_notice": {
-    "description": "Legal notice menu item"
-  },
-  "@licenses": {
-    "description": "Licenses menu item"
-  },
  "@match_in_progress": {
    "description": "Message when match is in progress"
  },
@@ -143,12 +143,6 @@
  "@no_groups_created_yet": {
    "description": "Message when no groups exist"
  },
-  "@no_licenses_found": {
-    "description": "Message when no licenses are found"
-  },
-  "@no_license_text_available": {
-    "description": "Message when no license text is available"
-  },
  "@no_matches_created_yet": {
    "description": "Message when no matches exist"
  },
@@ -193,9 +187,6 @@
      }
    }
  },
-  "@privacy_policy": {
-    "description": "Privacy policy menu item"
-  },
  "@quick_create": {
    "description": "Title for quick create section"
  },
@@ -229,6 +220,9 @@
  "@selected_players": {
    "description": "Shows the number of selected players"
  },
+  "@settings": {
+    "description": "Settings label"
+  },
  "@single_loser": {
    "description": "Title for single loser ruleset"
  },
@@ -290,14 +284,17 @@
  "create_match": "Create match",
  "create_new_group": "Create new group",
  "create_new_match": "Create new match",
-  "data": "Data",
  "data_successfully_deleted": "Data successfully deleted",
  "data_successfully_exported": "Data successfully exported",
  "data_successfully_imported": "Data successfully imported",
  "days_ago": "{count} days ago",
  "delete": "Delete",
  "delete_all_data": "Delete all data",
+  "delete_group": "Delete this group",
+  "edit_group": "Edit Group",
  "error_creating_group": "Error while creating group, please try again",
+  "error_deleting_group": "Error while deleting group, please try again",
+  "error_editing_group": "Error while editing group, please try again",
  "error_reading_file": "Error reading file",
  "export_canceled": "Export canceled",
  "export_data": "Export data",
@@ -313,9 +310,6 @@
  "info": "Info",
  "invalid_schema": "Invalid Schema",
  "least_points": "Least Points",
-  "legal": "Legal",
-  "legal_notice": "Legal Notice",
-  "licenses": "Licenses",
  "match_in_progress": "Match in progress...",
  "match_name": "Match name",
  "matches": "Matches",
@@ -323,8 +317,6 @@
  "most_points": "Most Points",
  "no_data_available": "No data available",
  "no_groups_created_yet": "No groups created yet",
-  "no_licenses_found": "No licenses found",
-  "no_license_text_available": "No license text available",
  "no_matches_created_yet": "No matches created yet",
  "no_players_created_yet": "No players created yet",
  "no_players_found_with_that_name": "No players found with that name",
@@ -338,7 +330,6 @@
  "player_name": "Player name",
  "players": "Players",
  "players_count": "{count} Players",
-  "privacy_policy": "Privacy Policy",
  "quick_create": "Quick Create",
  "recent_matches": "Recent Matches",
  "ruleset": "Ruleset",
@@ -350,6 +341,7 @@
  "search_for_players": "Search for players",
  "select_winner": "Select Winner:",
  "selected_players": "Selected players",
+  "settings": "Settings",
  "single_loser": "Single Loser",
  "single_winner": "Single Winner",
  "statistics": "Statistics",
--- a/lib/l10n/generated/app_localizations.dart
+++ b/lib/l10n/generated/app_localizations.dart
@@ -176,12 +176,6 @@ abstract class AppLocalizations {
  /// **'Create new match'**
  String get create_new_match;

-  /// Data label
-  ///
-  /// In en, this message translates to:
-  /// **'Data'**
-  String get data;
-
  /// Success message after deleting data
  ///
  /// In en, this message translates to:
@@ -218,12 +212,36 @@ abstract class AppLocalizations {
  /// **'Delete all data'**
  String get delete_all_data;

+  /// Confirmation dialog for deleting a group
+  ///
+  /// In en, this message translates to:
+  /// **'Delete this group'**
+  String get delete_group;
+
+  /// Button & Appbar label for editing a group
+  ///
+  /// In en, this message translates to:
+  /// **'Edit Group'**
+  String get edit_group;
+
  /// Error message when group creation fails
  ///
  /// In en, this message translates to:
  /// **'Error while creating group, please try again'**
  String get error_creating_group;

+  /// Error message when group deletion fails
+  ///
+  /// In en, this message translates to:
+  /// **'Error while deleting group, please try again'**
+  String get error_deleting_group;
+
+  /// Error message when group editing fails
+  ///
+  /// In en, this message translates to:
+  /// **'Error while editing group, please try again'**
+  String get error_editing_group;
+
  /// Error message when file cannot be read
  ///
  /// In en, this message translates to:
@@ -314,24 +332,6 @@ abstract class AppLocalizations {
  /// **'Least Points'**
  String get least_points;

-  /// Legal section header
-  ///
-  /// In en, this message translates to:
-  /// **'Legal'**
-  String get legal;
-
-  /// Legal notice menu item
-  ///
-  /// In en, this message translates to:
-  /// **'Legal Notice'**
-  String get legal_notice;
-
-  /// Licenses menu item
-  ///
-  /// In en, this message translates to:
-  /// **'Licenses'**
-  String get licenses;
-
  /// Message when match is in progress
  ///
  /// In en, this message translates to:
@@ -374,18 +374,6 @@ abstract class AppLocalizations {
  /// **'No groups created yet'**
  String get no_groups_created_yet;

-  /// Message when no licenses are found
-  ///
-  /// In en, this message translates to:
-  /// **'No licenses found'**
-  String get no_licenses_found;
-
-  /// Message when no license text is available
-  ///
-  /// In en, this message translates to:
-  /// **'No license text available'**
-  String get no_license_text_available;
-
  /// Message when no matches exist
  ///
  /// In en, this message translates to:
@@ -464,12 +452,6 @@ abstract class AppLocalizations {
  /// **'{count} Players'**
  String players_count(int count);

-  /// Privacy policy menu item
-  ///
-  /// In en, this message translates to:
-  /// **'Privacy Policy'**
-  String get privacy_policy;
-
  /// Title for quick create section
  ///
  /// In en, this message translates to:
@@ -536,6 +518,12 @@ abstract class AppLocalizations {
  /// **'Selected players'**
  String get selected_players;

+  /// Settings label
+  ///
+  /// In en, this message translates to:
+  /// **'Settings'**
+  String get settings;
+
  /// Title for single loser ruleset
  ///
  /// In en, this message translates to:
--- a/lib/l10n/generated/app_localizations_de.dart
+++ b/lib/l10n/generated/app_localizations_de.dart
@@ -49,9 +49,6 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get create_new_match => 'Neues Spiel erstellen';

-  @override
-  String get data => 'Daten';
-
  @override
  String get data_successfully_deleted => 'Daten erfolgreich gelöscht';

@@ -72,10 +69,24 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  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';

@@ -121,15 +132,6 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get least_points => 'Niedrigste Punkte';

-  @override
-  String get legal => 'Rechtliches';
-
-  @override
-  String get legal_notice => 'Impressum';
-
-  @override
-  String get licenses => 'Lizenzen';
-
  @override
  String get match_in_progress => 'Spiel läuft...';

@@ -151,12 +153,6 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get no_groups_created_yet => 'Noch keine Gruppen erstellt';

-  @override
-  String get no_licenses_found => 'Keine Lizenzen gefunden';
-
-  @override
-  String get no_license_text_available => 'Kein Lizenztext verfügbar';
-
  @override
  String get no_matches_created_yet => 'Noch keine Spiele erstellt';

@@ -199,9 +195,6 @@ class AppLocalizationsDe extends AppLocalizations {
    return '$count Spieler';
  }

-  @override
-  String get privacy_policy => 'Datenschutzerklärung';
-
  @override
  String get quick_create => 'Schnellzugriff';

@@ -239,6 +232,9 @@ class AppLocalizationsDe extends AppLocalizations {
  @override
  String get selected_players => 'Ausgewählte Spieler:innen';

+  @override
+  String get settings => 'Einstellungen';
+
  @override
  String get single_loser => 'Ein:e Verlierer:in';

--- a/lib/l10n/generated/app_localizations_en.dart
+++ b/lib/l10n/generated/app_localizations_en.dart
@@ -49,9 +49,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get create_new_match => 'Create new match';

-  @override
-  String get data => 'Data';
-
  @override
  String get data_successfully_deleted => 'Data successfully deleted';

@@ -72,10 +69,24 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get delete_all_data => 'Delete all data';

+  @override
+  String get delete_group => 'Delete this group';
+
+  @override
+  String get edit_group => 'Edit Group';
+
  @override
  String get error_creating_group =>
      'Error while creating group, please try again';

+  @override
+  String get error_deleting_group =>
+      'Error while deleting group, please try again';
+
+  @override
+  String get error_editing_group =>
+      'Error while editing group, please try again';
+
  @override
  String get error_reading_file => 'Error reading file';

@@ -121,15 +132,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get least_points => 'Least Points';

-  @override
-  String get legal => 'Legal';
-
-  @override
-  String get legal_notice => 'Legal Notice';
-
-  @override
-  String get licenses => 'Licenses';
-
  @override
  String get match_in_progress => 'Match in progress...';

@@ -151,12 +153,6 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get no_groups_created_yet => 'No groups created yet';

-  @override
-  String get no_licenses_found => 'No licenses found';
-
-  @override
-  String get no_license_text_available => 'No license text available';
-
  @override
  String get no_matches_created_yet => 'No matches created yet';

@@ -199,9 +195,6 @@ class AppLocalizationsEn extends AppLocalizations {
    return '$count Players';
  }

-  @override
-  String get privacy_policy => 'Privacy Policy';
-
  @override
  String get quick_create => 'Quick Create';

@@ -239,6 +232,9 @@ class AppLocalizationsEn extends AppLocalizations {
  @override
  String get selected_players => 'Selected players';

+  @override
+  String get settings => 'Settings';
+
  @override
  String get single_loser => 'Single Loser';

--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart
@@ -5,7 +5,7 @@ import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/settings_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/settings_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart';
 import 'package:game_tracker/presentation/widgets/navbar_item.dart';

--- a/lib/presentation/views/main_menu/group_view/create_group_view.dart
+++ b/lib/presentation/views/main_menu/group_view/create_group_view.dart
@@ -1,113 +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 ScaffoldMessenger(
-      child: 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),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
--- a/lib/presentation/views/main_menu/group_view/group_detail_view.dart
+++ b/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,
+        ),
+      );
+    }
+  }
+}
--- a/lib/presentation/views/main_menu/group_view/groups_view.dart
+++ b/lib/presentation/views/main_menu/group_view/groups_view.dart
@@ -6,7 +6,7 @@ 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';
@@ -73,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();
+                    });
+                  });
                },
              ),
            ),
@@ -88,7 +100,7 @@ class _GroupsViewState extends State<GroupsView> {
                  context,
                  adaptivePageRoute(
                    builder: (context) {
-                      return const CreateGroupView();
+                      return const GroupDetailView();
                    },
                  ),
                );
--- a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
@@ -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();
@@ -120,6 +123,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context);
    return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
      child: Scaffold(
        backgroundColor: CustomTheme.backgroundColor,
        appBar: AppBar(title: Text(loc.create_new_match)),
--- a/lib/presentation/views/main_menu/settings_view.dart
+++ b/lib/presentation/views/main_menu/settings_view.dart
@@ -0,0 +1,224 @@
+import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/tiles/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});
+
+  @override
+  State<SettingsView> createState() => _SettingsViewState();
+}
+
+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 ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
+      child: Scaffold(
+        appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
+        backgroundColor: CustomTheme.backgroundColor,
+        body: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: const EdgeInsets.fromLTRB(24, 0, 24, 10),
+              child: Text(
+                textAlign: TextAlign.start,
+                loc.menu,
+                style: const TextStyle(
+                  fontSize: 28,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
+              child: Text(
+                textAlign: TextAlign.start,
+                loc.settings,
+                style: const TextStyle(
+                  fontSize: 22,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+            SettingsListTile(
+              title: loc.export_data,
+              icon: Icons.upload_rounded,
+              suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+              onPressed: () async {
+                final String json = await DataTransferService.getAppDataAsJson(
+                  context,
+                );
+                final result = await DataTransferService.exportData(
+                  json,
+                  'game_tracker-data',
+                );
+                if (!context.mounted) return;
+                showExportSnackBar(context: context, result: result);
+              },
+            ),
+            SettingsListTile(
+              title: loc.import_data,
+              icon: Icons.download_rounded,
+              suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+              onPressed: () async {
+                final result = await DataTransferService.importData(context);
+                if (!context.mounted) return;
+                showImportSnackBar(context: context, result: result);
+              },
+            ),
+            SettingsListTile(
+              title: loc.delete_all_data,
+              icon: Icons.delete_rounded,
+              suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
+              onPressed: () {
+                showDialog<bool>(
+                  context: context,
+                  builder: (context) => AlertDialog(
+                    title: Text('${loc.delete_all_data}?'),
+                    content: Text(loc.this_cannot_be_undone),
+                    actions: [
+                      TextButton(
+                        onPressed: () => Navigator.of(context).pop(false),
+                        child: Text(loc.cancel),
+                      ),
+                      TextButton(
+                        onPressed: () => Navigator.of(context).pop(true),
+                        child: Text(loc.delete),
+                      ),
+                    ],
+                  ),
+                ).then((confirmed) {
+                  if (confirmed == true && context.mounted) {
+                    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,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// Displays a snackbar based on the import result.
+  ///
+  /// [context] The BuildContext to show the snackbar in.
+  /// [result] The result of the import operation.
+  void showImportSnackBar({
+    required BuildContext context,
+    required ImportResult result,
+  }) {
+    final loc = AppLocalizations.of(context);
+    switch (result) {
+      case ImportResult.success:
+        showSnackbar(context: context, message: loc.data_successfully_imported);
+      case ImportResult.invalidSchema:
+        showSnackbar(context: context, message: loc.invalid_schema);
+      case ImportResult.fileReadError:
+        showSnackbar(context: context, message: loc.error_reading_file);
+      case ImportResult.canceled:
+        showSnackbar(context: context, message: loc.import_canceled);
+      case ImportResult.formatException:
+        showSnackbar(context: context, message: loc.format_exception);
+      case ImportResult.unknownException:
+        showSnackbar(context: context, message: loc.unknown_exception);
+    }
+  }
+
+  /// Displays a snackbar based on the export result.
+  ///
+  /// [context] The BuildContext to show the snackbar in.
+  /// [result] The result of the export operation.
+  void showExportSnackBar({
+    required BuildContext context,
+    required ExportResult result,
+  }) {
+    final loc = AppLocalizations.of(context);
+    switch (result) {
+      case ExportResult.success:
+        showSnackbar(context: context, message: loc.data_successfully_exported);
+      case ExportResult.canceled:
+        showSnackbar(context: context, message: loc.export_canceled);
+      case ExportResult.unknownException:
+        showSnackbar(context: context, message: loc.unknown_exception);
+    }
+  }
+
+  /// Displays a snackbar with the given message and optional action.
+  ///
+  /// [context] The BuildContext to show the snackbar in.
+  /// [message] The message to display in the snackbar.
+  /// [duration] The duration for which the snackbar is displayed.
+  /// [action] An optional callback function to execute when the action button is pressed.
+  void showSnackbar({
+    required BuildContext context,
+    required String message,
+    Duration duration = const Duration(seconds: 3),
+    VoidCallback? action,
+  }) {
+    final loc = AppLocalizations.of(context);
+    final messenger = ScaffoldMessenger.of(context);
+    messenger.hideCurrentSnackBar();
+    messenger.showSnackBar(
+      SnackBar(
+        content: Text(message, style: const TextStyle(color: Colors.white)),
+        backgroundColor: CustomTheme.onBoxColor,
+        duration: duration,
+        action: action != null
+            ? SnackBarAction(label: loc.undo, onPressed: action)
+            : null,
+      ),
+    );
+  }
+
+  Future<void> _initPackageInfo() async {
+    final info = await PackageInfo.fromPlatform();
+    setState(() {
+      _packageInfo = info;
+    });
+  }
+}
--- a/lib/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart
+++ b/lib/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart
@@ -1,124 +0,0 @@
-import 'package:flutter/material.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/settings_view/licenses/oss_licenses.dart';
-
-class LicenseDetailView extends StatelessWidget {
-  final Package package;
-
-  const LicenseDetailView({super.key, required this.package});
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      appBar: AppBar(title: const Text('Lizenzdetails')),
-      body: SingleChildScrollView(
-        padding: const EdgeInsets.symmetric(horizontal: 8),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Center(
-              child: Column(
-                children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-
-                    children: [
-                      Container(
-                        margin: const EdgeInsetsGeometry.only(right: 15),
-                        width: 60,
-                        height: 60,
-                        decoration: BoxDecoration(
-                          color: CustomTheme.primaryColor.withAlpha(40),
-                          borderRadius: BorderRadius.circular(10),
-                        ),
-                        child: Icon(
-                          Icons.description,
-                          color: CustomTheme.primaryColor,
-                          size: 30,
-                        ),
-                      ),
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            package.name,
-                            textAlign: TextAlign.left,
-                            style: const TextStyle(
-                              height: 0,
-                              fontSize: 24,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                          if (package.version != null) ...[
-                            Text(
-                              'Version ${package.version}',
-                              textAlign: TextAlign.left,
-                              style: TextStyle(
-                                fontSize: 14,
-                                color: Colors.grey.shade300,
-                              ),
-                            ),
-                          ],
-                        ],
-                      ),
-                    ],
-                  ),
-
-                  if (package.authors.isNotEmpty) ...[
-                    const SizedBox(height: 8),
-                    SelectableText(
-                      package.authors.join(', '),
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: Colors.grey.shade500,
-                      ),
-                    ),
-                  ],
-                  if (package.homepage != null &&
-                      package.homepage!.isNotEmpty) ...[
-                    const SizedBox(height: 8),
-                    SelectableText(
-                      package.homepage!,
-                      textAlign: TextAlign.center,
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: Colors.grey.shade500,
-                      ),
-                    ),
-                  ],
-                ],
-              ),
-            ),
-            const SizedBox(height: 20),
-            Container(
-              width: double.infinity,
-              padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 16),
-              decoration: CustomTheme.standardBoxDecoration,
-              child: (package.license != null && package.license!.isNotEmpty)
-                  ? SelectableText(
-                      package.license!,
-                      style: TextStyle(
-                        fontSize: 12,
-                        color: Colors.grey.shade300,
-                        height: 1.5,
-                        fontFamily: 'monospace',
-                      ),
-                    )
-                  : Center(
-                      heightFactor: 25,
-                      child: Text(
-                        loc.no_license_text_available,
-                        style: TextStyle(color: Colors.grey.shade500),
-                      ),
-                    ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
--- a/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
+++ b/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
--- a/lib/presentation/views/main_menu/settings_view/licenses_view.dart
+++ b/lib/presentation/views/main_menu/settings_view/licenses_view.dart
@@ -1,32 +0,0 @@
-import 'package:flutter/material.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/settings_view/licenses/oss_licenses.dart';
-import 'package:game_tracker/presentation/widgets/tiles/license_tile.dart';
-
-class LicensesView extends StatelessWidget {
-  const LicensesView({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(loc.licenses),
-        backgroundColor: CustomTheme.backgroundColor,
-      ),
-      backgroundColor: CustomTheme.backgroundColor,
-      body: ListView.builder(
-        itemCount: allDependencies.length,
-        itemBuilder: (context, index) {
-          final package = allDependencies[index];
-          return Padding(
-            padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
-            child: LicenseTile(package: package),
-          );
-        },
-      ),
-    );
-  }
-}
--- a/lib/presentation/views/main_menu/settings_view/settings_view.dart
+++ b/lib/presentation/views/main_menu/settings_view/settings_view.dart
@@ -1,314 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses_view.dart';
-import 'package:game_tracker/presentation/widgets/tiles/settings_list_tile.dart';
-import 'package:game_tracker/services/data_transfer_service.dart';
-import 'package:intl/intl.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class SettingsView extends StatefulWidget {
-  const SettingsView({super.key});
-
-  @override
-  State<SettingsView> createState() => _SettingsViewState();
-}
-
-class _SettingsViewState extends State<SettingsView> {
-  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 ScaffoldMessenger(
-      child: Scaffold(
-        appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
-        backgroundColor: CustomTheme.backgroundColor,
-        body: SingleChildScrollView(
-          child: Expanded(
-            child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.only(left: 16, bottom: 10),
-                  child: Text(
-                    textAlign: TextAlign.start,
-                    loc.menu,
-                    style: const TextStyle(
-                      fontSize: 28,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10),
-                  child: Text(
-                    textAlign: TextAlign.start,
-                    loc.data,
-                    style: const TextStyle(
-                      fontSize: 22,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-                SettingsListTile(
-                  title: loc.export_data,
-                  icon: Icons.upload,
-                  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,
-                  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,
-                  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.only(left: 16, top: 10, bottom: 10),
-                  child: Text(
-                    textAlign: TextAlign.start,
-                    loc.legal,
-                    style: const TextStyle(
-                      fontSize: 22,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ),
-                SettingsListTile(
-                  title: loc.licenses,
-                  icon: Icons.insert_drive_file,
-                  suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                  onPressed: () {
-                    Navigator.of(context).push(
-                      MaterialPageRoute(
-                        builder: (context) => const LicensesView(),
-                      ),
-                    );
-                  },
-                ),
-                SettingsListTile(
-                  title: loc.legal_notice,
-                  icon: Icons.account_balance_sharp,
-                  suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                  onPressed: null,
-                ),
-                SettingsListTile(
-                  title: loc.privacy_policy,
-                  icon: Icons.gpp_good_rounded,
-                  suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
-                  onPressed: null,
-                ),
-                Padding(
-                  padding: const EdgeInsets.only(top: 30, bottom: 20),
-                  child: Center(
-                    child: Column(
-                      spacing: 4,
-                      children: [
-                        Padding(
-                          padding: const EdgeInsets.only(bottom: 12),
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            spacing: 40,
-                            children: [
-                              GestureDetector(
-                                child: const Icon(Icons.language),
-                                onTap: () => {
-                                  launchUrl(Uri.parse('https://liquid-dev.de')),
-                                },
-                              ),
-                              GestureDetector(
-                                child: const FaIcon(FontAwesomeIcons.github),
-                                onTap: () => {
-                                  launchUrl(
-                                    Uri.parse(
-                                      'https://github.com/liquiddevelopmentde',
-                                    ),
-                                  ),
-                                },
-                              ),
-                              GestureDetector(
-                                child: Icon(
-                                  Platform.isIOS
-                                      ? CupertinoIcons.mail_solid
-                                      : Icons.email,
-                                ),
-                                onTap: () => launchUrl(
-                                  Uri.parse('mailto:hi@liquid-dev.de'),
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                        Text(
-                          '© ${DateFormat('yyyy').format(DateTime.now())} Liquid Development',
-                          style: TextStyle(
-                            color: Colors.grey.shade600,
-                            fontSize: 14,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                        Text(
-                          'Version ${_packageInfo.version} (${_packageInfo.buildNumber})',
-                          style: TextStyle(
-                            color: Colors.grey.shade600,
-                            fontSize: 14,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  /// Displays a snackbar based on the import result.
-  ///
-  /// [context] The BuildContext to show the snackbar in.
-  /// [result] The result of the import operation.
-  void showImportSnackBar({
-    required BuildContext context,
-    required ImportResult result,
-  }) {
-    final loc = AppLocalizations.of(context);
-    switch (result) {
-      case ImportResult.success:
-        showSnackbar(context: context, message: loc.data_successfully_imported);
-      case ImportResult.invalidSchema:
-        showSnackbar(context: context, message: loc.invalid_schema);
-      case ImportResult.fileReadError:
-        showSnackbar(context: context, message: loc.error_reading_file);
-      case ImportResult.canceled:
-        showSnackbar(context: context, message: loc.import_canceled);
-      case ImportResult.formatException:
-        showSnackbar(context: context, message: loc.format_exception);
-      case ImportResult.unknownException:
-        showSnackbar(context: context, message: loc.unknown_exception);
-    }
-  }
-
-  /// Displays a snackbar based on the export result.
-  ///
-  /// [context] The BuildContext to show the snackbar in.
-  /// [result] The result of the export operation.
-  void showExportSnackBar({
-    required BuildContext context,
-    required ExportResult result,
-  }) {
-    final loc = AppLocalizations.of(context);
-    switch (result) {
-      case ExportResult.success:
-        showSnackbar(context: context, message: loc.data_successfully_exported);
-      case ExportResult.canceled:
-        showSnackbar(context: context, message: loc.export_canceled);
-      case ExportResult.unknownException:
-        showSnackbar(context: context, message: loc.unknown_exception);
-    }
-  }
-
-  /// Displays a snackbar with the given message and optional action.
-  ///
-  /// [context] The BuildContext to show the snackbar in.
-  /// [message] The message to display in the snackbar.
-  /// [duration] The duration for which the snackbar is displayed.
-  /// [action] An optional callback function to execute when the action button is pressed.
-  void showSnackbar({
-    required BuildContext context,
-    required String message,
-    Duration duration = const Duration(seconds: 3),
-    VoidCallback? action,
-  }) {
-    final loc = AppLocalizations.of(context);
-    final messenger = ScaffoldMessenger.of(context);
-    messenger.hideCurrentSnackBar();
-    messenger.showSnackBar(
-      SnackBar(
-        content: Text(message, style: const TextStyle(color: Colors.white)),
-        backgroundColor: CustomTheme.onBoxColor,
-        duration: duration,
-        action: action != null
-            ? SnackBarAction(label: loc.undo, onPressed: action)
-            : null,
-      ),
-    );
-  }
-
-  /// Initializes the package information.
-  Future<void> _initPackageInfo() async {
-    final info = await PackageInfo.fromPlatform();
-    setState(() {
-      _packageInfo = info;
-    });
-  }
-}
--- a/lib/presentation/widgets/player_selection.dart
+++ b/lib/presentation/widgets/player_selection.dart
@@ -70,6 +70,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
    super.initState();
    db = Provider.of<AppDatabase>(context, listen: false);
    suggestedPlayers = skeletonData;
+    selectedPlayers = widget.initialSelectedPlayers ?? [];
    loadPlayerList();
  }

@@ -99,7 +100,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                if (value.isEmpty) {
                  // If the search is empty, it shows all unselected players.
                  suggestedPlayers = allPlayers.where((player) {
-                    return !selectedPlayers.contains(player);
+                    return !selectedPlayers.any((p) => p.id == player.id);
                  }).toList();
                } else {
                  // If there is input, it filters by name match (case-insensitive) and ensures
@@ -108,9 +109,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                    final bool nameMatches = player.name.toLowerCase().contains(
                      value.toLowerCase(),
                    );
-                    final bool isNotSelected = !selectedPlayers.contains(
-                      player,
-                    );
+                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
                    return nameMatches && isNotSelected;
                  }).toList();
                }
@@ -125,46 +124,49 @@ class _PlayerSelectionState extends State<PlayerSelection> {
          const SizedBox(height: 10),
          SizedBox(
            height: 50,
-            child: selectedPlayers.isEmpty
-                ? Center(child: Text(loc.no_players_selected))
-                : SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    child: Row(
-                      children: [
-                        for (var player in selectedPlayers)
-                          Padding(
-                            padding: const EdgeInsets.only(right: 8.0),
-                            child: TextIconTile(
-                              text: player.name,
-                              onIconTap: () {
-                                setState(() {
-                                  // Removes the player from the selection and notifies the parent.
-                                  selectedPlayers.remove(player);
-                                  widget.onChanged([...selectedPlayers]);
+            child: AppSkeleton(
+              enabled: isLoading,
+              child: selectedPlayers.isEmpty
+                  ? Center(child: Text(loc.no_players_selected))
+                  : SingleChildScrollView(
+                      scrollDirection: Axis.horizontal,
+                      child: Row(
+                        children: [
+                          for (var player in selectedPlayers)
+                            Padding(
+                              padding: const EdgeInsets.only(right: 8.0),
+                              child: TextIconTile(
+                                text: player.name,
+                                onIconTap: () {
+                                  setState(() {
+                                    // Removes the player from the selection and notifies the parent.
+                                    selectedPlayers.remove(player);
+                                    widget.onChanged([...selectedPlayers]);

-                                  // Get the current search query
-                                  final currentSearch = _searchBarController
-                                      .text
-                                      .toLowerCase();
+                                    // Get the current search query
+                                    final currentSearch = _searchBarController
+                                        .text
+                                        .toLowerCase();

-                                  // If the player matches the current search query (or search is empty),
-                                  // they are added back to the `suggestedPlayers` and the list is re-sorted.
-                                  if (currentSearch.isEmpty ||
-                                      player.name.toLowerCase().contains(
-                                        currentSearch,
-                                      )) {
-                                    suggestedPlayers.add(player);
-                                    suggestedPlayers.sort(
-                                      (a, b) => a.name.compareTo(b.name),
-                                    );
-                                  }
-                                });
-                              },
+                                    // If the player matches the current search query (or search is empty),
+                                    // they are added back to the `suggestedPlayers` and the list is re-sorted.
+                                    if (currentSearch.isEmpty ||
+                                        player.name.toLowerCase().contains(
+                                          currentSearch,
+                                        )) {
+                                      suggestedPlayers.add(player);
+                                      suggestedPlayers.sort(
+                                        (a, b) => a.name.compareTo(b.name),
+                                      );
+                                    }
+                                  });
+                                },
+                              ),
                            ),
-                          ),
-                      ],
+                        ],
+                      ),
                    ),
-                  ),
+            ),
          ),
          const SizedBox(height: 10),
          Text(
@@ -243,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;
        });
--- a/lib/presentation/widgets/tiles/group_tile.dart
+++ b/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(
-      margin: CustomTheme.standardMargin,
-      padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
-      decoration: isHighlighted
-          ? CustomTheme.highlightedBoxDecoration
-          : CustomTheme.standardBoxDecoration,
-      duration: const Duration(milliseconds: 150),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Flexible(
-                child: Text(
-                  group.name,
-                  overflow: TextOverflow.ellipsis,
-                  style: const TextStyle(
-                    fontWeight: FontWeight.bold,
-                    fontSize: 18,
-                  ),
-                ),
-              ),
-              Row(
-                children: [
-                  Text(
-                    '${group.members.length}',
+    return GestureDetector(
+      onTap: onTap,
+      child: AnimatedContainer(
+        margin: CustomTheme.standardMargin,
+        padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
+        decoration: isHighlighted
+            ? CustomTheme.highlightedBoxDecoration
+            : CustomTheme.standardBoxDecoration,
+        duration: const Duration(milliseconds: 150),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Flexible(
+                  child: Text(
+                    group.name,
+                    overflow: TextOverflow.ellipsis,
                    style: const TextStyle(
-                      fontWeight: FontWeight.w900,
+                      fontWeight: FontWeight.bold,
                      fontSize: 18,
                    ),
                  ),
-                  const SizedBox(width: 3),
-                  const Icon(Icons.group, size: 22),
-                ],
-              ),
-            ],
-          ),
-          const SizedBox(height: 5),
-          Wrap(
-            alignment: WrapAlignment.start,
-            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),
-        ],
+                ),
+                Row(
+                  children: [
+                    Text(
+                      '${group.members.length}',
+                      style: const TextStyle(
+                        fontWeight: FontWeight.w900,
+                        fontSize: 18,
+                      ),
+                    ),
+                    const SizedBox(width: 3),
+                    const Icon(Icons.group, size: 22),
+                  ],
+                ),
+              ],
+            ),
+            const SizedBox(height: 5),
+            Wrap(
+              alignment: WrapAlignment.start,
+              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),
+          ],
+        ),
      ),
    );
  }
--- a/lib/presentation/widgets/tiles/license_tile.dart
+++ b/lib/presentation/widgets/tiles/license_tile.dart
@@ -1,106 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
-
-class LicenseTile extends StatelessWidget {
-  final Package package;
-
-  const LicenseTile({super.key, required this.package});
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () {
-        Navigator.of(context).push(
-          MaterialPageRoute(
-            builder: (context) => LicenseDetailView(package: package),
-          ),
-        );
-      },
-      child: Container(
-        margin: const EdgeInsets.only(bottom: 8),
-        padding: const EdgeInsets.all(16),
-        decoration: CustomTheme.standardBoxDecoration.copyWith(
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Row(
-          children: [
-            Container(
-              width: 48,
-              height: 48,
-              decoration: BoxDecoration(
-                color: CustomTheme.primaryColor.withAlpha(40),
-                borderRadius: BorderRadius.circular(10),
-              ),
-              child: Icon(
-                Icons.description,
-                color: CustomTheme.primaryColor,
-                size: 24,
-              ),
-            ),
-            const SizedBox(width: 16),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Flexible(
-                        child: Text(
-                          package.name,
-                          overflow: TextOverflow.ellipsis,
-                          maxLines: 1,
-                          style: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                      ),
-                      if (package.version != null &&
-                          package.version!.isNotEmpty) ...[
-                        const SizedBox(width: 12),
-                        Container(
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 8,
-                            vertical: 2,
-                          ),
-                          decoration: BoxDecoration(
-                            color: CustomTheme.onBoxColor,
-                            borderRadius: BorderRadius.circular(6),
-                          ),
-                          child: Text(
-                            'v${package.version}',
-                            style: TextStyle(
-                              fontSize: 11,
-                              color: Colors.grey.shade500,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ],
-                  ),
-                  const SizedBox(height: 4),
-                  Text(
-                    package.description,
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                      fontSize: 13,
-                      color: Colors.grey.shade400,
-                      height: 1.3,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(width: 12),
-            // Arrow Icon
-            Icon(Icons.chevron_right, color: Colors.grey.shade600, size: 24),
-          ],
-        ),
-      ),
-    );
-  }
-}
--- a/lib/presentation/widgets/tiles/settings_list_tile.dart
+++ b/lib/presentation/widgets/tiles/settings_list_tile.dart
@@ -47,26 +47,13 @@ class SettingsListTile extends StatelessWidget {
                    mainAxisSize: MainAxisSize.min,
                    children: [
                      Container(
-                        width: 48,
-                        height: 48,
-                        decoration: BoxDecoration(
-                          color: CustomTheme.primaryColor.withAlpha(40),
-                          borderRadius: BorderRadius.circular(10),
-                        ),
-                        child: Icon(
-                          icon,
-                          size: 28,
-                          color: CustomTheme.primaryColor.withGreen(40),
-                        ),
-                      ),
-                      /* Container(
                        padding: const EdgeInsets.all(8),
                        decoration: BoxDecoration(
                          color: CustomTheme.primaryColor,
                          shape: BoxShape.circle,
                        ),
                        child: Icon(icon, size: 24),
-                      ),*/
+                      ),
                      const SizedBox(width: 16),
                      Text(title, style: const TextStyle(fontSize: 18)),
                    ],
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.5+130
+version: 0.0.4+101

 environment:
  sdk: ^3.8.1
@@ -9,32 +9,27 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
-  flutter_localizations:
-    sdk: flutter
-  clock: ^1.1.2
-  cupertino_icons: ^1.0.6
  drift: ^2.27.0
  drift_flutter: ^0.2.4
-  file_picker: ^10.3.6
-  file_saver: ^0.3.1
-  font_awesome_flutter: ^10.12.0
-  intl: any
-  json_schema: ^5.2.2
-  package_info_plus: ^9.0.0
  path_provider: ^2.1.5
  provider: ^6.1.5
  skeletonizer: ^2.1.0+1
-  url_launcher: ^6.3.2
  uuid: ^4.5.2
-
+  file_picker: ^10.3.6
+  json_schema: ^5.2.2
+  file_saver: ^0.3.1
+  clock: ^1.1.2
+  intl: any
+  flutter_localizations:
+    sdk: flutter
+  package_info_plus: ^9.0.0

 dev_dependencies:
  flutter_test:
    sdk: flutter
-  build_runner: ^2.5.4
-  dart_pubspec_licenses: ^3.0.14
-  drift_dev: ^2.27.0
  flutter_lints: ^5.0.0
+  drift_dev: ^2.27.0
+  build_runner: ^2.5.4

 flutter:
  uses-material-design: true
Author	SHA1	Message	Date
Mathis Kirchner	caf60d046b	fix merge mistake All checks were successful Pull Request Pipeline / lint (pull_request) Successful in 3m9s Details Pull Request Pipeline / test (pull_request) Successful in 2m30s Details	2026-01-10 22:20:14 +01:00
Mathis Kirchner	38663c6b67	Merge remote-tracking branch 'origin/development' into feature/118-bearbeiten-und-löschen-von-gruppen All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m33s Details Pull Request Pipeline / lint (pull_request) Successful in 2m44s Details # 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	2026-01-10 22:19:19 +01:00
Mathis Kirchner	ee84c60ba6	remove questionmark All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m2s Details Pull Request Pipeline / lint (pull_request) Successful in 2m5s Details	2026-01-10 22:13:26 +01:00
Mathis Kirchner	b6dd0541ae	rename CreateGroupView to GroupDetailView for clarity and consistency All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m3s Details Pull Request Pipeline / lint (pull_request) Successful in 2m4s Details	2026-01-10 22:11:28 +01:00
Mathis Kirchner	525acec1d3	Merge branch 'development' into feature/118-bearbeiten-und-löschen-von-gruppen Some checks failed Pull Request Pipeline / test (pull_request) Successful in 2m1s Details Pull Request Pipeline / lint (pull_request) Failing after 2m3s Details	2026-01-10 20:48:25 +00:00
Mathis Kirchner	45a419cae7	implement group edit view Some checks failed Pull Request Pipeline / test (pull_request) Successful in 2m1s Details Pull Request Pipeline / lint (pull_request) Failing after 2m3s Details	2026-01-10 20:14:37 +01:00