Merge pull request 'MVP' (#141) from development into main

Reviewed-on: #141
Reviewed-by: gelbeinhalb <spam@yannick-weigert.de>

.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]

.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]

.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]

.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?*  

.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

.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

.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

.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

lib/core/adaptive_page_route.dart

@@ -1,19 +0,0 @@
-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;
-  Player? winner;
+  final 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,12 +44,6 @@ 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,5 +1,4 @@
 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';
@@ -57,7 +56,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                adaptivePageRoute(builder: (_) => const SettingsView()),
+                MaterialPageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;

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

@@ -44,8 +44,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
+    return Scaffold(
-      child: Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
       appBar: AppBar(title: Text(loc.create_new_group)),
       body: SafeArea(
@@ -107,7 +106,6 @@ class _CreateGroupViewState extends State<CreateGroupView> {
           ],
         ),
       ),
-      ),
     );
   }
 }

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

@@ -1,5 +1,4 @@
 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 +85,7 @@ class _GroupsViewState extends State<GroupsView> {
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) {
                       return const CreateGroupView();
                     },

lib/presentation/views/main_menu/home_view.dart

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

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

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

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

@@ -1,7 +1,7 @@
 import 'dart:core' hide Match;
 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/adaptive_page_route.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
@@ -78,15 +78,11 @@ class _MatchViewState extends State<MatchView> {
                       height: MediaQuery.paddingOf(context).bottom - 20,
                     );
                   }
-                  return Center(
+                  return MatchTile(
-                    child: Padding(
-                      padding: const EdgeInsets.only(bottom: 12.0),
-                      child: MatchTile(
-                        width: MediaQuery.sizeOf(context).width * 0.95,
                     onTap: () async {
                       Navigator.push(
                         context,
-                            adaptivePageRoute(
+                        CupertinoPageRoute(
                           fullscreenDialog: true,
                           builder: (context) => MatchResultView(
                             match: matches[index],
@@ -96,8 +92,6 @@ class _MatchViewState extends State<MatchView> {
                       );
                     },
                     match: matches[index],
-                      ),
-                    ),
                   );
                 },
               ),
@@ -111,7 +105,7 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),

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,21 @@ 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 ScaffoldMessenger(
+    return Scaffold(
-      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 +43,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 +61,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(
+                      final String json =
-                  context,
+                          await DataTransferService.getAppDataAsJson(context);
-                );
                       final result = await DataTransferService.exportData(
                         json,
                         'game_tracker-data',
@@ -80,7 +76,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 +91,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 +117,10 @@ 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 +194,4 @@ class _SettingsViewState extends State<SettingsView> {
       ),
     );
   }
-
-  Future<void> _initPackageInfo() async {
-    final info = await PackageInfo.fromPlatform();
-    setState(() {
-      _packageInfo = info;
-    });
-  }
 }

lib/presentation/widgets/tiles/match_tile.dart

@@ -10,16 +10,8 @@ import 'package:intl/intl.dart';
 /// creation date, associated group, winner, and players.
 /// - [match]: The match data to be displayed.
 /// - [onTap]: The callback invoked when the tile is tapped.
-/// - [width]: Optional width for the tile.
-/// - [compact]: Whether to display the tile in a compact mode
 class MatchTile extends StatefulWidget {
-  const MatchTile({
+  const MatchTile({super.key, required this.match, required this.onTap});
-    super.key,
-    required this.match,
-    required this.onTap,
-    this.width,
-    this.compact = false,
-  });
 
   /// The match data to be displayed.
   final Match match;
@@ -27,12 +19,6 @@ class MatchTile extends StatefulWidget {
   /// The callback invoked when the tile is tapped.
   final VoidCallback onTap;
 
-  /// Optional width for the tile.
-  final double? width;
-
-  /// Whether to display the tile in a compact mode
-  final bool compact;
-
   @override
   State<MatchTile> createState() => _MatchTileState();
 }
@@ -55,10 +41,13 @@ class _MatchTileState extends State<MatchTile> {
     return GestureDetector(
       onTap: widget.onTap,
       child: Container(
-        margin: EdgeInsets.zero,
+        margin: CustomTheme.tileMargin,
-        width: widget.width,
         padding: const EdgeInsets.all(12),
-        decoration: CustomTheme.standardBoxDecoration,
+        decoration: BoxDecoration(
+          color: CustomTheme.boxColor,
+          border: Border.all(color: CustomTheme.boxBorder),
+          borderRadius: BorderRadius.circular(12),
+        ),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -91,22 +80,7 @@ class _MatchTileState extends State<MatchTile> {
                   const SizedBox(width: 6),
                   Expanded(
                     child: Text(
-                      '${group.name}${widget.match.players != null ? ' + ${widget.match.players?.length}' : ''}',
+                      group.name,
-                      style: const TextStyle(fontSize: 14, color: Colors.grey),
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 12),
-            ] else if (widget.compact) ...[
-              Row(
-                children: [
-                  const Icon(Icons.person, size: 16, color: Colors.grey),
-                  const SizedBox(width: 6),
-                  Expanded(
-                    child: Text(
-                      '${widget.match.players!.length} ${loc.players}',
                       style: const TextStyle(fontSize: 14, color: Colors.grey),
                       overflow: TextOverflow.ellipsis,
                     ),
@@ -153,46 +127,9 @@ class _MatchTileState extends State<MatchTile> {
                 ),
               ),
               const SizedBox(height: 12),
-            ] else ...[
-              Container(
-                padding: const EdgeInsets.symmetric(
-                  vertical: 8,
-                  horizontal: 12,
-                ),
-                decoration: BoxDecoration(
-                  color: Colors.amber.withValues(alpha: 0.1),
-                  borderRadius: BorderRadius.circular(8),
-                  border: Border.all(
-                    color: Colors.amber.withValues(alpha: 0.3),
-                    width: 1,
-                  ),
-                ),
-                child: Row(
-                  children: [
-                    const Icon(
-                      Icons.watch_later,
-                      size: 20,
-                      color: Colors.amber,
-                    ),
-                    const SizedBox(width: 8),
-                    Expanded(
-                      child: Text(
-                        loc.match_in_progress,
-                        style: const TextStyle(
-                          fontSize: 14,
-                          fontWeight: FontWeight.w600,
-                          color: CustomTheme.textColor,
-                        ),
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 12),
             ],
 
-            if (_allPlayers.isNotEmpty && widget.compact == false) ...[
+            if (_allPlayers.isNotEmpty) ...[
               Text(
                 loc.players,
                 style: const TextStyle(

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.4+101
+version: 0.0.1+21
 
 environment:
   sdk: ^3.8.1
@@ -9,6 +9,11 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  material_symbols_icons: ^4.2815.1
+
+  # The following adds the Cupertino Icons font to your application.
+  # Use with the CupertinoIcons class for iOS style icons.
+  cupertino_icons: ^1.0.8
   drift: ^2.27.0
   drift_flutter: ^0.2.4
   path_provider: ^2.1.5
@@ -22,7 +27,6 @@ dependencies:
   intl: any
   flutter_localizations:
     sdk: flutter
-  package_info_plus: ^9.0.0
 
 dev_dependencies:
   flutter_test: