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

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

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,6 +1,3 @@
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/l10n/generated/app_localizations.dart';
@@ -59,7 +56,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                Platform.isIOS ? CupertinoPageRoute(builder: (_) => const SettingsView()) : MaterialPageRoute(builder: (_) => const SettingsView()),
+                MaterialPageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;

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

@@ -1,6 +1,3 @@
-import 'dart:io';
-
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
@@ -88,11 +85,7 @@ class _GroupsViewState extends State<GroupsView> {
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  Platform.isIOS ? CupertinoPageRoute(
+                  MaterialPageRoute(
-                  builder: (context) {
-                    return const CreateGroupView();
-                  },
-                  ) : MaterialPageRoute(
                     builder: (context) {
                       return const CreateGroupView();
                     },

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

@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
@@ -142,12 +140,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : games[selectedGameIndex].$1,
               onPressed: () async {
                 selectedGameIndex = await Navigator.of(context).push(
-                  Platform.isIOS ? CupertinoPageRoute(
+                  MaterialPageRoute(
-                    builder: (context) => ChooseGameView(
-                      games: games,
-                      initialGameIndex: selectedGameIndex,
-                    ),
-                  ) : MaterialPageRoute(
                     builder: (context) => ChooseGameView(
                       games: games,
                       initialGameIndex: selectedGameIndex,
@@ -175,12 +168,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : translateRulesetToString(selectedRuleset!, context),
               onPressed: () async {
                 selectedRuleset = await Navigator.of(context).push(
-                  Platform.isIOS ? CupertinoPageRoute(
+                  MaterialPageRoute(
-                  builder: (context) => ChooseRulesetView(
-                    rulesets: _rulesets,
-                    initialRulesetIndex: selectedRulesetIndex,
-                  ),
-                  ) : MaterialPageRoute(
                     builder: (context) => ChooseRulesetView(
                       rulesets: _rulesets,
                       initialRulesetIndex: selectedRulesetIndex,
@@ -202,12 +190,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : selectedGroup!.name,
               onPressed: () async {
                 selectedGroup = await Navigator.of(context).push(
-                  Platform.isIOS ? CupertinoPageRoute(
+                  MaterialPageRoute(
-                  builder: (context) => ChooseGroupView(
-                    groups: groupsList,
-                    initialGroupId: selectedGroupId,
-                  ),
-                  ): MaterialPageRoute(
                     builder: (context) => ChooseGroupView(
                       groups: groupsList,
                       initialGroupId: selectedGroupId,

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

@@ -1,5 +1,4 @@
 import 'dart:core' hide Match;
-import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -106,9 +105,7 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  Platform.isIOS ? CupertinoPageRoute(
+                  MaterialPageRoute(
-                      builder: (context) =>
-                          CreateMatchView(onWinnerChanged: loadGames)) : MaterialPageRoute(
                     builder: (context) =>
                         CreateMatchView(onWinnerChanged: loadGames),
                   ),

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