Merge pull request 'Issue-Templates aktualisiert' (#154) from setup/update-issue-and-pr-templates into development

Reviewed-on: #154
Reviewed-by: Mathis Kirchner <mathis.kirchner.mk@gmail.com>

.gitea/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -1,35 +0,0 @@
----
-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]

.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md

@@ -1,22 +0,0 @@
----
-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]

.gitea/ISSUE_TEMPLATE/FEATURE.md

@@ -1,19 +0,0 @@
----
-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]

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +0,0 @@
-# [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?*  

.gitea/issue_template/bug.yaml

@@ -0,0 +1,51 @@
+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

.gitea/issue_template/enhancement.yaml

@@ -0,0 +1,36 @@
+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

.gitea/issue_template/feature.yaml

@@ -0,0 +1,36 @@
+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

.gitea/pull_request_template.yaml

@@ -0,0 +1,47 @@
+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

lib/core/adaptive_page_route.dart

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

lib/data/dto/match.dart

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

lib/l10n/arb/app_de.arb

@@ -17,7 +17,7 @@
   "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",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",

lib/l10n/arb/app_en.arb

@@ -277,7 +277,7 @@
   "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",
   "error_creating_group": "Error while creating group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",

lib/l10n/generated/app_localizations.dart

@@ -209,7 +209,7 @@ 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;
 
   /// Error message when group creation fails

lib/l10n/generated/app_localizations_de.dart

@@ -67,7 +67,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete => 'Löschen';
 
   @override
-  String get delete_all_data => 'Alle Daten löschen?';
+  String get delete_all_data => 'Alle Daten löschen';
 
   @override
   String get error_creating_group =>

lib/l10n/generated/app_localizations_en.dart

@@ -67,7 +67,7 @@ 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 error_creating_group =>

lib/main.dart

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

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
@@ -56,7 +57,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                MaterialPageRoute(builder: (_) => const SettingsView()),
+                adaptivePageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;

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

@@ -44,66 +44,68 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return Scaffold(
-      backgroundColor: CustomTheme.backgroundColor,
-      appBar: AppBar(title: Text(loc.create_new_group)),
-      body: SafeArea(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          children: [
-            Container(
-              margin: CustomTheme.standardMargin,
-              child: TextInputField(
-                controller: _groupNameController,
-                hintText: loc.group_name,
+    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];
-                  });
-                },
+              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),
-                              ),
-                            ),
+              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,
                           ),
                         );
-                      }
-                    },
-            ),
-            const SizedBox(height: 20),
-          ],
+                        if (!context.mounted) return;
+                        if (success) {
+                          Navigator.pop(context);
+                        } else {
+                          ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              backgroundColor: CustomTheme.boxColor,
+                              content: Center(
+                                child: Text(
+                                  AppLocalizations.of(
+                                    context,
+                                  ).error_creating_group,
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                              ),
+                            ),
+                          );
+                        }
+                      },
+              ),
+              const SizedBox(height: 20),
+            ],
+          ),
         ),
       ),
     );

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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -85,7 +86,7 @@ class _GroupsViewState extends State<GroupsView> {
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) {
                       return const CreateGroupView();
                     },

lib/presentation/views/main_menu/home_view.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/data/db/database.dart';
 import 'package:game_tracker/data/dto/group.dart';
@@ -34,7 +35,7 @@ class _HomeViewState extends State<HomeView> {
 
   /// Recent matches to display, initially filled with skeleton matches
   List<Match> recentMatches = List.filled(
-    3,
+    2,
     Match(
       name: 'Skeleton Match',
       group: Group(
@@ -103,14 +104,15 @@ class _HomeViewState extends State<HomeView> {
                                 compact: true,
                                 width: constraints.maxWidth * 0.9,
                                 match: match,
-                                onTap: () {
-                                  Navigator.of(context).push(
-                                    MaterialPageRoute(
+                                onTap: () async {
+                                  await Navigator.of(context).push(
+                                    adaptivePageRoute(
                                       fullscreenDialog: true,
                                       builder: (context) =>
                                           MatchResultView(match: match),
                                     ),
                                   );
+                                  await updatedWinnerinRecentMatches(match.id);
                                 },
                               ),
                             )
@@ -185,7 +187,7 @@ class _HomeViewState extends State<HomeView> {
 
   /// Loads the data for the HomeView from the database.
   /// This includes the match count, group count, and recent matches.
-  void loadHomeViewData() {
+  Future<void> loadHomeViewData() async {
     final db = Provider.of<AppDatabase>(context, listen: false);
     Future.wait([
       db.matchDao.getMatchCount(),
@@ -208,4 +210,16 @@ class _HomeViewState extends State<HomeView> {
       }
     });
   }
+
+  /// Updates the winner information for a specific match in the recent matches list.
+  Future<void> updatedWinnerinRecentMatches(String matchId) async {
+    final db = Provider.of<AppDatabase>(context, listen: false);
+    final winner = await db.matchDao.getWinner(matchId: matchId);
+    final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
+    if (matchIndex != -1) {
+      setState(() {
+        recentMatches[matchIndex].winner = winner;
+      });
+    }
+  }
 }

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

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

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

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

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

@@ -1,7 +1,7 @@
 import 'dart:core' hide Match;
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -86,7 +86,7 @@ class _MatchViewState extends State<MatchView> {
                         onTap: () async {
                           Navigator.push(
                             context,
-                            CupertinoPageRoute(
+                            adaptivePageRoute(
                               fullscreenDialog: true,
                               builder: (context) => MatchResultView(
                                 match: matches[index],
@@ -111,7 +111,7 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),

lib/presentation/views/main_menu/settings_view.dart

@@ -4,6 +4,7 @@ import 'package:game_tracker/core/enums.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/widgets/tiles/settings_list_tile.dart';
 import 'package:game_tracker/services/data_transfer_service.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class SettingsView extends StatefulWidget {
   const SettingsView({super.key});
@@ -13,113 +14,127 @@ class SettingsView extends StatefulWidget {
 }
 
 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 Scaffold(
-      appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
-      backgroundColor: CustomTheme.backgroundColor,
-      body: LayoutBuilder(
-        builder: (BuildContext context, BoxConstraints constraints) =>
-            SingleChildScrollView(
-              child: 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,
-                          );
-                        }
-                      });
-                    },
-                  ),
-                ],
+    return ScaffoldMessenger(
+      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,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
       ),
     );
   }
@@ -194,4 +209,11 @@ class _SettingsViewState extends State<SettingsView> {
       ),
     );
   }
+
+  Future<void> _initPackageInfo() async {
+    final info = await PackageInfo.fromPlatform();
+    setState(() {
+      _packageInfo = info;
+    });
+  }
 }

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.2+70
+version: 0.0.4+101
 
 environment:
   sdk: ^3.8.1
@@ -22,6 +22,7 @@ dependencies:
   intl: any
   flutter_localizations:
     sdk: flutter
+  package_info_plus: ^9.0.0
 
 dev_dependencies:
   flutter_test: