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

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

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/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(
-      child: Scaffold(
+    return 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/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()),
           ),
         );
       }

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(
-      child: Scaffold(
+    return 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,6 +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';
@@ -81,7 +82,7 @@ class _MatchViewState extends State<MatchView> {
                     onTap: () async {
                       Navigator.push(
                         context,
-                        adaptivePageRoute(
+                        CupertinoPageRoute(
                           fullscreenDialog: true,
                           builder: (context) => MatchResultView(
                             match: matches[index],
@@ -104,9 +105,10 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  adaptivePageRoute(
+                  MaterialPageRoute(
                     builder: (context) =>
-                          CreateMatchView(onWinnerChanged: loadGames))
+                        CreateMatchView(onWinnerChanged: loadGames),
+                  ),
                 );
               },
             ),

lib/presentation/views/main_menu/settings_view.dart

@@ -21,8 +21,7 @@ class _SettingsViewState extends State<SettingsView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    return ScaffoldMessenger(
-      child: Scaffold(
+    return Scaffold(
       appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
       backgroundColor: CustomTheme.backgroundColor,
       body: LayoutBuilder(
@@ -122,7 +121,6 @@ class _SettingsViewState extends State<SettingsView> {
               ),
             ),
       ),
-      ),
     );
   }
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.1+37
+version: 0.0.1+21
 
 environment:
   sdk: ^3.8.1