fix merge issues

Merge remote-tracking branch 'origin/development' into enhancement/128-PageRoutes-adaptable-machen
# Conflicts: # lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
2026-01-10 15:00:33 +01:00 · 2026-01-10 14:57:33 +01:00 · 2026-01-10 13:54:57 +00:00 · 2026-01-10 14:52:59 +01:00 · 2026-01-10 14:44:53 +01:00 · 2026-01-10 14:44:33 +01:00
9 changed files with 321 additions and 289 deletions
--- a/lib/core/adaptive_page_route.dart
+++ b/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,
+  );
+}
--- a/lib/main.dart
+++ b/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(),
    );
--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/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++;
--- a/lib/presentation/views/main_menu/group_view/create_group_view.dart
+++ b/lib/presentation/views/main_menu/group_view/create_group_view.dart
@@ -44,7 +44,8 @@ class _CreateGroupViewState extends State<CreateGroupView> {
  @override
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      child: Scaffold(
        backgroundColor: CustomTheme.backgroundColor,
        appBar: AppBar(title: Text(loc.create_new_group)),
        body: SafeArea(
@@ -106,6 +107,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
            ],
          ),
        ),
+      ),
    );
  }
 }
--- a/lib/presentation/views/main_menu/group_view/groups_view.dart
+++ b/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();
                    },
--- 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
@@ -1,5 +1,6 @@
 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,7 +120,8 @@ class _CreateMatchViewState extends State<CreateMatchView> {
  @override
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      child: Scaffold(
        backgroundColor: CustomTheme.backgroundColor,
        appBar: AppBar(title: Text(loc.create_new_match)),
        body: SafeArea(
@@ -140,7 +142,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                    : games[selectedGameIndex].$1,
                onPressed: () async {
                  selectedGameIndex = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                      builder: (context) => ChooseGameView(
                        games: games,
                        initialGameIndex: selectedGameIndex,
@@ -168,7 +170,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                    : translateRulesetToString(selectedRuleset!, context),
                onPressed: () async {
                  selectedRuleset = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                      builder: (context) => ChooseRulesetView(
                        rulesets: _rulesets,
                        initialRulesetIndex: selectedRulesetIndex,
@@ -190,7 +192,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                    : selectedGroup!.name,
                onPressed: () async {
                  selectedGroup = await Navigator.of(context).push(
-                  MaterialPageRoute(
+                    adaptivePageRoute(
                      builder: (context) => ChooseGroupView(
                        groups: groupsList,
                        initialGroupId: selectedGroupId,
@@ -240,7 +242,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                        if (context.mounted) {
                          Navigator.pushReplacement(
                            context,
-                          CupertinoPageRoute(
+                            adaptivePageRoute(
                              fullscreenDialog: true,
                              builder: (context) => MatchResultView(
                                match: match,
@@ -255,6 +257,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
            ],
          ),
        ),
+      ),
    );
  }

--- 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/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';
@@ -82,7 +81,7 @@ class _MatchViewState extends State<MatchView> {
                    onTap: () async {
                      Navigator.push(
                        context,
-                        CupertinoPageRoute(
+                        adaptivePageRoute(
                          fullscreenDialog: true,
                          builder: (context) => MatchResultView(
                            match: matches[index],
@@ -105,10 +104,9 @@ class _MatchViewState extends State<MatchView> {
              onPressed: () async {
                Navigator.push(
                  context,
-                  MaterialPageRoute(
+                  adaptivePageRoute(
                      builder: (context) =>
-                        CreateMatchView(onWinnerChanged: loadGames),
-                  ),
+                          CreateMatchView(onWinnerChanged: loadGames))
                );
              },
            ),
--- a/lib/presentation/views/main_menu/settings_view.dart
+++ b/lib/presentation/views/main_menu/settings_view.dart
@@ -21,7 +21,8 @@ class _SettingsViewState extends State<SettingsView> {
  @override
  Widget build(BuildContext context) {
    final loc = AppLocalizations.of(context);
-    return Scaffold(
+    return ScaffoldMessenger(
+      child: Scaffold(
        appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
        backgroundColor: CustomTheme.backgroundColor,
        body: LayoutBuilder(
@@ -121,6 +122,7 @@ class _SettingsViewState extends State<SettingsView> {
                ),
              ),
        ),
+      ),
    );
  }

--- 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.1+21
+version: 0.0.1+37

 environment:
  sdk: ^3.8.1
Author	SHA1	Message	Date
Mathis Kirchner	54ec865f04	fix merge issues Some checks failed Pull Request Pipeline / test (pull_request) Successful in 2m14s Details Pull Request Pipeline / lint (pull_request) Failing after 2m23s Details	2026-01-10 15:00:33 +01:00
Mathis Kirchner	d5e7a17127	Merge remote-tracking branch 'origin/development' into enhancement/128-PageRoutes-adaptable-machen # Conflicts: # lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart	2026-01-10 14:57:33 +01:00
Felix Kirchner	275f64b296	Merge pull request 'SnackBar Sichtbarkeit' (#144 ) from bug/130-Snackbar-Sichtbarkeit into development Reviewed-on: #144 Reviewed-by: gelbeinhalb <spam@yannick-weigert.de> Reviewed-by: Felix Kirchner <felix.kirchner.fk@gmail.com>	2026-01-10 13:54:57 +00:00
Mathis Kirchner	97ca62b083	refactor: rename AdaptivePageRoute to adaptivePageRoute for lowerCamelCase All checks were successful Pull Request Pipeline / lint (pull_request) Successful in 2m13s Details Pull Request Pipeline / test (pull_request) Successful in 2m18s Details	2026-01-10 14:52:59 +01:00
Mathis Kirchner	32fb1550ff	Merge remote-tracking branch 'origin/enhancement/128-PageRoutes-adaptable-machen' into enhancement/128-PageRoutes-adaptable-machen Some checks failed Pull Request Pipeline / test (pull_request) Successful in 2m4s Details Pull Request Pipeline / lint (pull_request) Failing after 2m10s Details # Conflicts: # lib/main.dart	2026-01-10 14:44:53 +01:00
Mathis Kirchner	d67972624e	replaced ternary operator solution with custom adaptive_page_route.dart	2026-01-10 14:44:33 +01:00
Felix Kirchner	6faafe9fab	Changed android page transition to Android U transition All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m5s Details Pull Request Pipeline / lint (pull_request) Successful in 2m8s Details	2026-01-10 14:16:16 +01:00
Felix Kirchner	66b90aac25	Fixed issue with android page transition All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m1s Details Pull Request Pipeline / lint (pull_request) Successful in 2m5s Details	2026-01-10 14:09:08 +01:00
Felix Kirchner	db3e8215fa	Added ios swipe back gesture All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m1s Details Pull Request Pipeline / lint (pull_request) Successful in 2m6s Details	2026-01-10 13:42:09 +01:00
Mathis Kirchner	a4ef9705f9	made PageRoutes adapt to os, default to MaterialPageRoute All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m4s Details Pull Request Pipeline / lint (pull_request) Successful in 2m7s Details	2026-01-09 22:22:26 +01:00
Mathis Kirchner	799c849570	wrap every view that uses a snackbar in ScaffoldMessenger All checks were successful Pull Request Pipeline / test (pull_request) Successful in 2m1s Details Pull Request Pipeline / lint (pull_request) Successful in 2m6s Details	2026-01-09 21:55:58 +01:00