implement group edit view

2026-01-10 20:14:37 +01:00
27 changed files with 644 additions and 766 deletions
--- a/.gitea/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.gitea/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Erstelle eine Meldung für etwas, das nicht Funktioniert, wie es soll.
+title: ''
+labels: 'Task/Bug'
+assignees: ''
+
+---
+
+# Bug Report  
+
+## Beschreibung
+[Eine klare und prägnante Beschreibung des Bugs]  
+
+## Schritte zur Reproduktion
+1. Schritt 1  
+2. Schritt 2  
+3. ...  
+
+## Erwartetes Verhalten
+[Was hätte passieren sollen]  
+
+## Tatsächliches Verhalten
+[Was tatsächlich passiert ist]   
+
+## Screenshots/Protokolle
+[Falls zutreffend, füge Screenshots, Error Logs oder Stack Traces hinzu]   
+
+## Umgebung
+- Plattform: Android, iOS, Web
+- OS: [z. B. iOS 18.5, Android 14]  
+- Flutter Version: [z.B. 3.35.6]
+
+## Verwandte Issues
+[Verweisen Sie auf ähnliche Issues oder PRs]
--- a/.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md
+++ b/.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md
@@ -0,0 +1,22 @@
+---
+name: Enhancement
+about: Enhancements for current features
+title: ''
+labels: 'Task\Enhancement'
+assignees: ''
+
+---
+
+# Enhancement  
+
+## Aktuelles Verhalten
+[Beschreibe die bestehende Funktionalität]  
+
+## Einschränkungen/Probleme 
+[Was sind die aktuellen Mängel?]  
+
+## Vorgeschlagene Verbesserung  
+[Wie kann das Problem bzw. die Einschränkung verbessert werden?]  
+
+## Zugehörige Issues
+[Links zu verwandten oder blockierenden Issues]
--- a/.gitea/ISSUE_TEMPLATE/FEATURE.md
+++ b/.gitea/ISSUE_TEMPLATE/FEATURE.md
@@ -0,0 +1,19 @@
+---
+name: Feature
+about: Neues Feature für die App
+title: ''
+labels: 'Task\Feature'
+assignees: ''
+
+---
+
+# Feature  
+
+## Beschreibung
+[Ausführliche Erläuterung der vorgeschlagenen Funktion]  
+
+## Vorgeschlagene Lösung
+[Beschreibe, wie die Feature funktionieren soll]  
+
+## Zugehörige Issues
+[Links zu verwandten oder blockierenden Issues]
--- a/.gitea/PULL_REQUEST_TEMPLATE.md
+++ b/.gitea/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+# [PR Titel]
+
+**Zugehörige Issue(s):**  
+Closes `<issue-no>`
+
+## Beschreibung  
+*Eine klare und prägnante Übersicht über die vorgenommenen Änderungen. Erläutere nicht nur das was gemacht wurde, sondern auch warum.*
+
+## Änderungen  
+- [ ] Neue Funktion X hinzugefügt
+- [ ] Bug in Komponente Y behoben
+- [ ] Modul Z für bessere Leistung refactored
+- [ ] Dependencies aktualisiert
+
+## Zusätzliche Anmerkungen  
+*Gibt es zusätzlichen Kontext, Einschränkungen oder Informationen, die Reviewer wissen sollten?*  
--- a/.gitea/issue_template/bug.yaml
+++ b/.gitea/issue_template/bug.yaml
@@ -1,51 +0,0 @@
-name: Bug Report
-about: Erstelle eine Bug Report
-labels: 'Task/Bug'
-title: ''
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Beschreibung
-      description: Beschreibe klar und pregnant das Fehlerverhalten
-      placeholder: |
-        - Was genau ist das unerwünschte Verhalten?
-        - Welche Auswirkungen hat der Fehler?
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Schritte zur Reproduktion
-      description: Beschreibe, wie der Fehler reproduziert werden kann
-      placeholder: |
-        - 1. Schritt 1  
-        - 2. Schritt 2  
-        - 3. ...
-
-  - type: dropdown
-    id: enviroment
-    attributes:
-      label: Umgebung
-      description: Gebe an, auf welchen Platformen dieser Fehler auftritt
-      list: false
-      multiple: true
-      options: ['Android', 'iOS']
-
-  - type: textarea
-    id: bahaviour
-    attributes:
-      label: Unerwünschtes Verhalten
-      description: Beschreibe, was passiert ist, obwohl es nicht passieren sollte
-      placeholder: Bei Verhalten X tritt folgendes Verhalten auf ...
-
-
-  - type: textarea
-    attributes:
-      label: Verwandte Issues
-      description: Verweise auf ähnliche Issues oder PRs
-      placeholder: |
-        - Knüpft an Issue #35 an
-        - Ersetzt Issue #12
-        - Brauch Implementierung von #43
--- a/.gitea/issue_template/enhancement.yaml
+++ b/.gitea/issue_template/enhancement.yaml
@@ -1,36 +0,0 @@
-name: Enhancement
-about: Erstelle ein Enhancement-Ticket
-labels: 'Task/Enhancement'
-title: ''
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Aktuelles Verhalten
-      description: Beschreibe, wie die Funktionalität aktuell gestaltet ist
-      placeholder: |
-        - Aktuell macht Button X folgendes ...
-        - Das Problem ist, dass ...
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: Vorgeschlagene Verbesserung
-      description: Beschreibe, wie das Problem bzw. die Einschränkung verbessert werden kann
-      placeholder: |
-        - Button X ändern, sodass ...
-        - Funktion X so erweitern, dass ...
-        - Design anpassen, sodass ...
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Zugehörige Issues
-      description: Links zu verwandten oder blockierenden Issues
-      placeholder: |
-        - Knüpft an Issue #35 an
-        - Ersetzt Issue #12
-        - Brauch Implementierung von #43
--- a/.gitea/issue_template/feature.yaml
+++ b/.gitea/issue_template/feature.yaml
@@ -1,36 +0,0 @@
-name: Feature
-about: Erstelle ein Feature-Ticket
-labels: 'Task/Feature'
-title: ''
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Beschreibung
-      description: Ausführliche Erläuterung der vorgeschlagenen Funktion
-      placeholder: |
-        - Welchen Zweck erfüllt das Feature?
-        - Welches Problem löst das Feature?
-        - Wer profitiert davon? 
-        - Warum ist es wichtig?
-    validations:
-      required: true
-
-  - type: textarea
-    id: solution
-    attributes:
-      label: Vorgeschlagene Lösung
-      description: Beschreibe, wie das Feature funktionieren soll
-      placeholder: |
-        - Neues Widget, das folgendermaßen aussieht ...
-        - Neue Ansicht, die folgende Inhalte hat
-        - Neue Funktionsweise von Komponente XY
-
-  - type: textarea
-    attributes:
-      label: Zugehörige Issues
-      description: Links zu verwandten oder blockierenden Issues
-      placeholder: |
-        - Knüpft an Issue #35 an
-        - Ersetzt Issue #12
-        - Brauch Implementierung von #43
--- a/.gitea/pull_request_template.yaml
+++ b/.gitea/pull_request_template.yaml
@@ -1,47 +0,0 @@
-name: Pull Request
-about: Vorlage für Pull Requests
-title: "WIP: [Name des Issues]"
-
-body:
-  - type: input
-    id: related_issue
-    attributes:
-      label: Zugehörige Issue(s)
-      description: Issues welche mit diesem Pull Request geschlossen werden sollen
-      placeholder: "Closes #123"
-    validations:
-      required: true
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Beschreibung
-      description: |
-        Eine klare und prägnante Zusammenfassung aller vorgenommenen Änderungen.
-      placeholder: |
-        Was wurde geändert?
-    validations:
-      required: true
-
-  - type: textarea
-    id: changes
-    attributes:
-      label: Änderungen
-      description: Liste alle Änderungen detailiert auf, die in diesem Pull Request vorgenommen wurden.
-      placeholder: |
-        - Neue Funktion X hinzugefügt
-        - Bug in Komponente X behoben
-        - Modul X für bessere Leistung refactored
-        - Dependencies aktualisiert
-
-  - type: textarea
-    id: additional_notes
-    attributes:
-      label: Zusätzliche Anmerkungen
-      description: |
-        Gibt es zusätzlichen Kontext, Einschränkungen oder Informationen,
-        die Reviewer wissen sollten?
-      placeholder: |
-        - Bekannte Einschränkungen
-        - Offene TODOs
-        - Hinweise für Reviewer
--- a/lib/core/custom_theme.dart
+++ b/lib/core/custom_theme.dart
@@ -11,8 +11,6 @@ class CustomTheme {
  static Color onBoxColor = const Color(0xFF181818);
  static Color boxBorder = const Color(0xFF272727);
  static const Color textColor = Colors.white;
-  static Color navBarItemSelectedColor = primaryColor.withGreen(100);
-  static Color navBarItemUnselectedColor = Colors.grey.shade400;

  // ==================== Border Radius ====================
  static const double standardBorderRadius = 12.0;
--- a/lib/l10n/arb/app_de.arb
+++ b/lib/l10n/arb/app_de.arb
@@ -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_all_data": "Diese Gruppe löschen?",
+  "edit_group": "Gruppe bearbeiten",
  "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
+  "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",
+  "error_editing_group": "Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen",
  "error_reading_file": "Fehler beim Lesen der Datei",
  "export_canceled": "Export abgebrochen",
  "export_data": "Daten exportieren",
--- a/lib/l10n/arb/app_en.arb
+++ b/lib/l10n/arb/app_en.arb
@@ -34,10 +34,10 @@
    "description": "Button text to create a match"
  },
  "@create_new_group": {
-    "description": "Button text to create a new group"
+    "description": "Appbar text to create a group"
  },
  "@create_new_match": {
-    "description": "Button text to create a new match"
+    "description": "Appbar text to create a match"
  },
  "@data_successfully_deleted": {
    "description": "Success message after deleting data"
@@ -62,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"
  },
@@ -277,8 +289,12 @@
  "data_successfully_imported": "Data successfully imported",
  "days_ago": "{count} days ago",
  "delete": "Delete",
-  "delete_all_data": "Delete all data",
+  "delete_all_data": "Delete all data?",
+  "delete_group": "Delete this group?",
+  "edit_group": "Edit Group",
  "error_creating_group": "Error while creating group, please try again",
+  "error_deleting_group": "Error while deleting group, please try again",
+  "error_editing_group": "Error while editing group, please try again",
  "error_reading_file": "Error reading file",
  "export_canceled": "Export canceled",
  "export_data": "Export data",
--- a/lib/l10n/generated/app_localizations.dart
+++ b/lib/l10n/generated/app_localizations.dart
@@ -164,13 +164,13 @@ abstract class AppLocalizations {
  /// **'Create match'**
  String get create_match;

-  /// Button text to create a new group
+  /// Appbar text to create a group
  ///
  /// In en, this message translates to:
  /// **'Create new group'**
  String get create_new_group;

-  /// Button text to create a new match
+  /// Appbar text to create a match
  ///
  /// In en, this message translates to:
  /// **'Create new match'**
@@ -209,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:
--- a/lib/l10n/generated/app_localizations_de.dart
+++ b/lib/l10n/generated/app_localizations_de.dart
@@ -67,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 => 'Diese Gruppe löschen?';
+
+  @override
+  String get delete_group => 'Delete this group?';
+
+  @override
+  String get edit_group => 'Gruppe bearbeiten';

  @override
  String get error_creating_group =>
      'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';

+  @override
+  String get error_deleting_group =>
+      'Fehler beim Löschen der Gruppe, bitte erneut versuchen';
+
+  @override
+  String get error_editing_group =>
+      'Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen';
+
  @override
  String get error_reading_file => 'Fehler beim Lesen der Datei';

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

--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
@@ -73,61 +71,18 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
      backgroundColor: CustomTheme.backgroundColor,
      body: tabs[currentIndex],
      extendBody: true,
-      bottomNavigationBar: SizedBox(
-        height: 70 + MediaQuery.of(context).padding.bottom,
-        child: Stack(
-          children: [
-            // Dynamisch generierte Blur-Layer für ultra-smooth Übergang
-            ...List.generate(35, (index) {
-              // Verwende kubische Kurve für noch natürlicheren, weicheren Übergang
-              final progress = index / 34.0; // 0.0 bis 1.0
-              final cubic = progress * progress * progress; // Kubische Kurve
-              final blurStrength = 0.5 + (cubic * 50.0); // Sehr sanft von 0.5 bis 50.5
-
-              // Höhe geht jetzt komplett von 100% bis 0% (ganz nach unten)
-              // Mit extra Dichte am unteren Ende für weicheren Übergang
-              final heightFactor = index < 25
-                  ? 1.0 - (progress * 0.7)  // Erste 25 Layer: 100% bis 30%
-                  : 0.3 - ((index - 25) / 34.0); // Letzte 10 Layer: 30% bis 0% (dichter)
-
-              return Positioned(
-                left: 0,
-                right: 0,
-                bottom: 0,
-                height: (70 + MediaQuery.of(context).padding.bottom) * heightFactor.clamp(0.05, 1.0),
-                child: ClipRect(
-                  child: BackdropFilter(
-                    filter: ImageFilter.blur(
-                      sigmaX: blurStrength,
-                      sigmaY: blurStrength,
-                    ),
-                    child: Container(
-                      color: Colors.transparent,
-                    ),
-                  ),
-                ),
-              );
-            }),
-            // Gradient-Overlay
-            Positioned.fill(
+      bottomNavigationBar: SafeArea(
+        minimum: const EdgeInsets.only(bottom: 30),
        child: Container(
+          margin: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 10),
          decoration: BoxDecoration(
-                  gradient: LinearGradient(
-                    begin: Alignment.bottomCenter,
-                    end: Alignment.topCenter,
-                    colors: [
-                      CustomTheme.boxColor.withValues(alpha: 1),
-                      CustomTheme.boxColor.withValues(alpha: 0.0),
-                    ],
-                    stops: const [0.4, 1],
+            borderRadius: BorderRadius.circular(24),
+            color: CustomTheme.primaryColor,
          ),
-                ),
-              ),
-            ),
-            // Navbar-Inhalt
-            SafeArea(
+          child: ClipRRect(
+            borderRadius: BorderRadius.circular(24),
            child: SizedBox(
-                height: 70,
+              height: 60,
              child: Row(
                mainAxisAlignment: MainAxisAlignment.spaceAround,
                children: <Widget>[
@@ -163,7 +118,6 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
              ),
            ),
          ),
-          ],
        ),
      ),
    );
--- 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 CreateGroupView extends StatefulWidget {
+  const CreateGroupView({super.key, this.groupToEdit});
+
+  /// The group to edit, if any
+  final Group? groupToEdit;
+
+  @override
+  State<CreateGroupView> createState() => _CreateGroupViewState();
+}
+
+class _CreateGroupViewState extends State<CreateGroupView> {
+  late final AppDatabase db;
+
+  /// GlobalKey for ScaffoldMessenger to show snackbars
+  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
+  /// Controller for the group name input field
+  final _groupNameController = TextEditingController();
+
+  /// List of currently selected players
+  List<Player> selectedPlayers = [];
+
+  /// List of initially selected players (when editing a group)
+  List<Player> initialSelectedPlayers = [];
+
+  @override
+  void initState() {
+    super.initState();
+    db = Provider.of<AppDatabase>(context, listen: false);
+    if(widget.groupToEdit != null) {
+      _groupNameController.text = widget.groupToEdit!.name;
+      setState(() {
+        initialSelectedPlayers = widget.groupToEdit!.members;
+        selectedPlayers = widget.groupToEdit!.members;
+      });
+    }
+    _groupNameController.addListener(() {
+      setState(() {});
+    });
+  }
+
+  @override
+  void dispose() {
+    _groupNameController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+    return ScaffoldMessenger(
+      key: _scaffoldMessengerKey,
+      child: Scaffold(
+        backgroundColor: CustomTheme.backgroundColor,
+        appBar: AppBar(title: Text(widget.groupToEdit == null ? loc.create_new_group : loc.edit_group), actions: widget.groupToEdit == null ? [] : [IconButton(icon: const Icon(Icons.delete), onPressed: () async {
+          if(widget.groupToEdit != null) {
+            showDialog<bool>(
+              context: context,
+              builder: (context) => AlertDialog(
+                title: Text(loc.delete_group),
+                content: Text(loc.this_cannot_be_undone),
+                actions: [
+                  TextButton(
+                    onPressed: () => Navigator.of(context).pop(false),
+                    child: Text(loc.cancel),
+                  ),
+                  TextButton(
+                    onPressed: () => Navigator.of(context).pop(true),
+                    child: Text(loc.delete),
+                  ),
+                ],
+              ),
+            ).then((confirmed) async {
+              if (confirmed == true && context.mounted) {
+                bool success = await db.groupDao.deleteGroup(groupId: widget.groupToEdit!.id);
+                if (!context.mounted) return;
+                if (success) {
+                  Navigator.pop(context);
+                } else {
+                  showSnackbar(message: loc.error_deleting_group);
+                }
+              }
+            });
+          }
+        },)],),
+        body: SafeArea(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              Container(
+                margin: CustomTheme.standardMargin,
+                child: TextInputField(
+                  controller: _groupNameController,
+                  hintText: loc.group_name,
+                ),
+              ),
+              Expanded(
+                child: PlayerSelection(
+                  initialSelectedPlayers: initialSelectedPlayers,
+                  onChanged: (value) {
+                    setState(() {
+                      selectedPlayers = [...value];
+                    });
+                  },
+                ),
+              ),
+              CustomWidthButton(
+                text: widget.groupToEdit == null ? loc.create_group : loc.edit_group,
+                sizeRelativeToWidth: 0.95,
+                buttonType: ButtonType.primary,
+                onPressed:
+                    (_groupNameController.text.isEmpty ||
+                        (selectedPlayers.length < 2))
+                    ? null
+                    : () async {
+                        late bool success;
+                        if (widget.groupToEdit == null) {
+                          success = await db.groupDao.addGroup(
+                            group: Group(
+                              name: _groupNameController.text.trim(),
+                              members: selectedPlayers,
+                            ),
+                          );
+                        } else {
+                          //TODO: Implement group editing in database
+                          /*
+                          success = await db.groupDao.updateGroup(
+                            group: Group(
+                              id: widget.groupToEdit!.id,
+                              name: _groupNameController.text.trim(),
+                              members: selectedPlayers,
+                            ),
+                          );
+                          */
+                          success = false;
+                        };
+                        if (!context.mounted) return;
+                        if (success) {
+                          Navigator.pop(context);
+                        } else {
+                          showSnackbar(message: widget.groupToEdit == null ? loc.error_creating_group : loc.error_editing_group);
+                        }
+                      },
+              ),
+              const SizedBox(height: 20),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+  /// Displays a snackbar with the given message and optional action.
+  ///
+  /// [message] The message to display in the snackbar.
+  void showSnackbar({
+    required String message,
+  }) {
+    final messenger = _scaffoldMessengerKey.currentState;
+    if (messenger != null) {
+      messenger.hideCurrentSnackBar();
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text(message, style: const TextStyle(color: Colors.white)),
+          backgroundColor: CustomTheme.boxColor,
+        ),
+      );
+    }
+  }
+}
--- a/lib/presentation/views/main_menu/group_view/groups_view.dart
+++ b/lib/presentation/views/main_menu/group_view/groups_view.dart
@@ -6,9 +6,9 @@ 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/main_menu_button.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
@@ -73,16 +73,28 @@ 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 CreateGroupView(groupToEdit: groups[index]);
+                        },
+                      ),
+                    );
+                    setState(() {
+                      loadGroups();
+                    });
+                  });
                },
              ),
            ),
          ),
          Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom + 20,
-            child: MainMenuButton(
+            bottom: MediaQuery.paddingOf(context).bottom,
+            child: CustomWidthButton(
              text: loc.create_group,
-              icon: Icons.group_add,
+              sizeRelativeToWidth: 0.90,
              onPressed: () async {
                await Navigator.push(
                  context,
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
@@ -140,11 +140,7 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
        filteredGroups.clear();
        filteredGroups.addAll(
          widget.groups.where(
-                (group) =>
-            group.name.toLowerCase().contains(query.toLowerCase()) ||
-                group.members.any(
-                      (player) => player.name.toLowerCase().contains(query.toLowerCase()),
-                ),
+            (group) => group.name.toLowerCase().contains(query.toLowerCase()),
          ),
        );
      }
--- 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/match_view/match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_view.dart
@@ -1,7 +1,6 @@
 import 'dart:core' hide Match;

 import 'package:flutter/material.dart';
-import 'package:fluttericon/rpg_awesome_icons.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';
@@ -13,7 +12,7 @@ import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/create_match_view.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/main_menu_button.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
@@ -105,10 +104,10 @@ class _MatchViewState extends State<MatchView> {
            ),
          ),
          Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom + 20,
-            child: MainMenuButton(
-              text: 'Spiel erstellen',
-              icon: RpgAwesome.clovers_card,
+            bottom: MediaQuery.paddingOf(context).bottom,
+            child: CustomWidthButton(
+              text: loc.create_match,
+              sizeRelativeToWidth: 0.90,
              onPressed: () async {
                Navigator.push(
                  context,
--- a/lib/presentation/views/main_menu/settings_view.dart
+++ b/lib/presentation/views/main_menu/settings_view.dart
@@ -4,7 +4,6 @@ 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});
@@ -14,26 +13,27 @@ class SettingsView extends StatefulWidget {
 }

 class _SettingsViewState extends State<SettingsView> {
-  PackageInfo _packageInfo = PackageInfo(
-    appName: 'n.A.',
-    packageName: 'n.A.',
-    version: 'n.A.',
-    buildNumber: 'n.A.',
-  );
+
+  /// GlobalKey for ScaffoldMessenger to show snackbars
+  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
  @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(
+        body: LayoutBuilder(
+          builder: (BuildContext context, BoxConstraints constraints) =>
+              SingleChildScrollView(
+                child: Column(
                  mainAxisAlignment: MainAxisAlignment.start,
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
@@ -49,7 +49,10 @@ class _SettingsViewState extends State<SettingsView> {
                      ),
                    ),
                    Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 24,
+                        vertical: 10,
+                      ),
                      child: Text(
                        textAlign: TextAlign.start,
                        loc.settings,
@@ -64,9 +67,8 @@ class _SettingsViewState extends State<SettingsView> {
                      icon: Icons.upload_rounded,
                      suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
                      onPressed: () async {
-                final String json = await DataTransferService.getAppDataAsJson(
-                  context,
-                );
+                        final String json =
+                            await DataTransferService.getAppDataAsJson(context);
                        final result = await DataTransferService.exportData(
                          json,
                          'game_tracker-data',
@@ -80,7 +82,9 @@ class _SettingsViewState extends State<SettingsView> {
                      icon: Icons.download_rounded,
                      suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
                      onPressed: () async {
-                final result = await DataTransferService.importData(context);
+                        final result = await DataTransferService.importData(
+                          context,
+                        );
                        if (!context.mounted) return;
                        showImportSnackBar(context: context, result: result);
                      },
@@ -93,7 +97,7 @@ class _SettingsViewState extends State<SettingsView> {
                        showDialog<bool>(
                          context: context,
                          builder: (context) => AlertDialog(
-                    title: Text('${loc.delete_all_data}?'),
+                            title: Text(loc.delete_all_data),
                            content: Text(loc.this_cannot_be_undone),
                            actions: [
                              TextButton(
@@ -119,23 +123,11 @@ class _SettingsViewState extends State<SettingsView> {
                        });
                      },
                    ),
-            const Spacer(),
-            Padding(
-              padding: const EdgeInsets.all(20),
-              child: Center(
-                child: Text(
-                  'Version ${_packageInfo.version} (${_packageInfo.buildNumber})',
-                  style: TextStyle(
-                    color: Colors.grey.shade600,
-                    fontSize: 14,
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-              ),
-            ),
                  ],
                ),
              ),
+        ),
+      ),
    );
  }

@@ -209,11 +201,4 @@ class _SettingsViewState extends State<SettingsView> {
      ),
    );
  }
-
-  Future<void> _initPackageInfo() async {
-    final info = await PackageInfo.fromPlatform();
-    setState(() {
-      _packageInfo = info;
-    });
-  }
 }
--- a/lib/presentation/widgets/buttons/main_menu_button.dart
+++ b/lib/presentation/widgets/buttons/main_menu_button.dart
@@ -1,98 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// A button for the main menu with an optional icon and a press animation.
-/// - [text]: The text of the button.
-/// - [icon]: The icon of the button.
-/// - [onPressed]: The callback to be invoked when the button is pressed.
-class MainMenuButton extends StatefulWidget {
-  const MainMenuButton({
-    super.key,
-    required this.text,
-    this.icon,
-    required this.onPressed,
-  });
-
-  /// The text of the button.
-  final String text;
-
-  /// The icon of the button.
-  final IconData? icon;
-
-  /// The callback to be invoked when the button is pressed.
-  final void Function() onPressed;
-
-  @override
-  State<MainMenuButton> createState() => _MainMenuButtonState();
-}
-
-class _MainMenuButtonState extends State<MainMenuButton>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _animationController;
-  late Animation<double> _scaleAnimation;
-
-  @override
-  void initState() {
-    super.initState();
-
-    _animationController = AnimationController(
-      duration: const Duration(milliseconds: 100),
-      vsync: this,
-    );
-
-    _scaleAnimation = Tween<double>(begin: 1.0, end: 0.95).animate(
-      CurvedAnimation(parent: _animationController, curve: Curves.easeInOut),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ScaleTransition(
-      scale: _scaleAnimation,
-      child: GestureDetector(
-        onTapDown: (_) {
-          _animationController.forward();
-        },
-        onTapUp: (_) async {
-          await _animationController.reverse();
-          if (mounted) {
-            widget.onPressed();
-          }
-        },
-        onTapCancel: () {
-          _animationController.reverse();
-        },
-        child: Container(
-          decoration: BoxDecoration(
-            color: Colors.white,
-            borderRadius: BorderRadius.circular(30),
-          ),
-          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14),
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              if (widget.icon != null) ...[
-                Icon(widget.icon, size: 26, color: Colors.black),
-                const SizedBox(width: 7),
-              ],
-              Text(
-                widget.text,
-                style: const TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                  color: Colors.black,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-}
--- a/lib/presentation/widgets/navbar_item.dart
+++ b/lib/presentation/widgets/navbar_item.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';

 /// A navigation bar item widget that represents a single tab in a navigation bar.
 /// - [index]: The index of the tab.
@@ -36,45 +35,7 @@ class NavbarItem extends StatefulWidget {
  State<NavbarItem> createState() => _NavbarItemState();
 }

-class _NavbarItemState extends State<NavbarItem>
-    with SingleTickerProviderStateMixin {
-  /// Animation controller for the scale animation
-  late AnimationController _animationController;
-
-  /// Scale animation for the icon when selected
-  late Animation<double> _scaleAnimation;
-
-  @override
-  void initState() {
-    super.initState();
-    _animationController = AnimationController(
-      duration: const Duration(milliseconds: 300),
-      vsync: this,
-    );
-
-    _scaleAnimation = Tween<double>(begin: 1.0, end: 1.2).animate(
-      CurvedAnimation(
-        parent: _animationController,
-        curve: Curves.easeInOutBack,
-      ),
-    );
-
-    if (widget.isSelected) {
-      _animationController.forward();
-    }
-  }
-
-  // Retrigger animation on selection change
-  @override
-  void didUpdateWidget(NavbarItem oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.isSelected && !oldWidget.isSelected) {
-      _animationController.forward();
-    } else if (!widget.isSelected && oldWidget.isSelected) {
-      _animationController.reverse();
-    }
-  }
-
+class _NavbarItemState extends State<NavbarItem> {
  @override
  Widget build(BuildContext context) {
    return Expanded(
@@ -87,29 +48,19 @@ class _NavbarItemState extends State<NavbarItem>
            mainAxisSize: MainAxisSize.min,
            mainAxisAlignment: MainAxisAlignment.center,
            children: [
-              ScaleTransition(
-                scale: widget.isSelected
-                    ? _scaleAnimation
-                    : const AlwaysStoppedAnimation(1.0),
-                child: Icon(
+              Icon(
                widget.icon,
-                  color: widget.isSelected
-                      ? CustomTheme.navBarItemSelectedColor
-                      : CustomTheme.navBarItemUnselectedColor,
-                  size: 32,
-                ),
+                color: widget.isSelected ? Colors.white : Colors.black,
              ),
              const SizedBox(height: 4),
              Text(
                widget.label,
                style: TextStyle(
-                  color: widget.isSelected
-                      ? CustomTheme.navBarItemSelectedColor
-                      : CustomTheme.navBarItemUnselectedColor,
-                  fontSize: widget.isSelected ? 12 : 11,
+                  color: widget.isSelected ? Colors.white : Colors.black,
+                  fontSize: 12,
                  fontWeight: widget.isSelected
                      ? FontWeight.bold
-                      : FontWeight.w500,
+                      : FontWeight.normal,
                ),
              ),
            ],
@@ -118,10 +69,4 @@ class _NavbarItemState extends State<NavbarItem>
      ),
    );
  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
 }
--- 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,6 +124,8 @@ class _PlayerSelectionState extends State<PlayerSelection> {
          const SizedBox(height: 10),
          SizedBox(
            height: 50,
+            child: AppSkeleton(
+              enabled: isLoading,
              child: selectedPlayers.isEmpty
                  ? Center(child: Text(loc.no_players_selected))
                  : SingleChildScrollView(
@@ -166,6 +167,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                      ),
                    ),
            ),
+          ),
          const SizedBox(height: 10),
          Text(
            loc.all_players,
@@ -243,8 +245,22 @@ class _PlayerSelectionState extends State<PlayerSelection> {
            // Otherwise, use the loaded players from the database.
            loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
            allPlayers = [...loadedPlayers];
+            if (widget.initialSelectedPlayers != null) {
+              // Excludes already selected players from the suggested players list.
+              suggestedPlayers = loadedPlayers.where((p) => !widget.initialSelectedPlayers!.any((ip) => ip.id == p.id)).toList();
+              // Ensures that only players available for selection are pre-selected.
+              selectedPlayers = widget.initialSelectedPlayers!
+                  .where(
+                    (p) => allPlayers.any(
+                      (available) => available.id == p.id,
+                ),
+              )
+                  .toList();
+            } else {
+              // If no initial selection, all loaded players are suggested.
              suggestedPlayers = [...loadedPlayers];
            }
+          }
          isLoading = false;
        });
      });
--- 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,9 +16,14 @@ class GroupTile extends StatelessWidget {
  /// Whether the tile should be highlighted.
  final bool isHighlighted;

+  /// Callback function to handle tap events.
+  final VoidCallback? onTap;
+
  @override
  Widget build(BuildContext context) {
-    return AnimatedContainer(
+    return GestureDetector(
+      onTap: onTap,
+      child: AnimatedContainer(
        margin: CustomTheme.standardMargin,
        padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
        decoration: isHighlighted
@@ -71,6 +77,7 @@ class GroupTile extends StatelessWidget {
            const SizedBox(height: 2.5),
          ],
        ),
+      ),
    );
  }
 }
--- 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+161
+version: 0.0.3+93

 environment:
  sdk: ^3.8.1
@@ -22,8 +22,6 @@ dependencies:
  intl: any
  flutter_localizations:
    sdk: flutter
-  package_info_plus: ^9.0.0
-  fluttericon: ^2.0.0

 dev_dependencies:
  flutter_test: