replaced ternary operator solution with custom adaptive_page_route.dart

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/main.dart

@@ -45,7 +45,8 @@ class GameTracker extends StatelessWidget {
           brightness: Brightness.dark,
         ).copyWith(surface: CustomTheme.backgroundColor),
         pageTransitionsTheme: const PageTransitionsTheme(
-          builders: {TargetPlatform.iOS: CupertinoPageTransitionsBuilder()},
+          builders: {TargetPlatform.iOS: CupertinoPageTransitionsBuilder(), TargetPlatform.android: PredictiveBackPageTransitionsBuilder()
+          },
         ),
       ),
       home: const CustomNavigationBar(),

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,7 +1,6 @@
-import 'dart:io';
-
 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/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
@@ -59,7 +58,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
             onPressed: () async {
               await Navigator.push(
                 context,
-                Platform.isIOS ? CupertinoPageRoute(builder: (_) => const SettingsView()) : MaterialPageRoute(builder: (_) => const SettingsView()),
+                AdaptivePageRoute(builder: (_) => const SettingsView()),
               );
               setState(() {
                 tabKeyCount++;

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

@@ -1,7 +1,6 @@
-import 'dart:io';
-
 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';
@@ -88,11 +87,7 @@ class _GroupsViewState extends State<GroupsView> {
               onPressed: () async {
                 await Navigator.push(
                   context,
-                  Platform.isIOS ? CupertinoPageRoute(
+                  AdaptivePageRoute(
-                  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,7 +1,6 @@
-import 'dart:io';
-
 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';
@@ -142,12 +141,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : games[selectedGameIndex].$1,
               onPressed: () async {
                 selectedGameIndex = await Navigator.of(context).push(
-                  Platform.isIOS ? CupertinoPageRoute(
+                  AdaptivePageRoute(
-                    builder: (context) => ChooseGameView(
-                      games: games,
-                      initialGameIndex: selectedGameIndex,
-                    ),
-                  ) : MaterialPageRoute(
                     builder: (context) => ChooseGameView(
                       games: games,
                       initialGameIndex: selectedGameIndex,
@@ -175,12 +169,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : translateRulesetToString(selectedRuleset!, context),
               onPressed: () async {
                 selectedRuleset = await Navigator.of(context).push(
-                  Platform.isIOS ? CupertinoPageRoute(
+                  AdaptivePageRoute(
-                  builder: (context) => ChooseRulesetView(
-                    rulesets: _rulesets,
-                    initialRulesetIndex: selectedRulesetIndex,
-                  ),
-                  ) : MaterialPageRoute(
                     builder: (context) => ChooseRulesetView(
                       rulesets: _rulesets,
                       initialRulesetIndex: selectedRulesetIndex,
@@ -202,12 +191,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                   : selectedGroup!.name,
               onPressed: () async {
                 selectedGroup = await Navigator.of(context).push(
-                  Platform.isIOS ? CupertinoPageRoute(
+                  AdaptivePageRoute(
-                  builder: (context) => ChooseGroupView(
-                    groups: groupsList,
-                    initialGroupId: selectedGroupId,
-                  ),
-                  ): MaterialPageRoute(
                     builder: (context) => ChooseGroupView(
                       groups: groupsList,
                       initialGroupId: selectedGroupId,
@@ -257,7 +241,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                       if (context.mounted) {
                         Navigator.pushReplacement(
                           context,
-                          CupertinoPageRoute(
+                          AdaptivePageRoute(
                             fullscreenDialog: true,
                             builder: (context) => MatchResultView(
                               match: match,

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

@@ -1,8 +1,7 @@
 import 'dart:core' hide Match;
-import 'dart:io';
-
 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';
@@ -83,7 +82,7 @@ class _MatchViewState extends State<MatchView> {
                     onTap: () async {
                       Navigator.push(
                         context,
-                        CupertinoPageRoute(
+                        AdaptivePageRoute(
                           fullscreenDialog: true,
                           builder: (context) => MatchResultView(
                             match: matches[index],
@@ -106,12 +105,9 @@ class _MatchViewState extends State<MatchView> {
               onPressed: () async {
                 Navigator.push(
                   context,
-                  Platform.isIOS ? CupertinoPageRoute(
+                  AdaptivePageRoute(
                       builder: (context) =>
-                          CreateMatchView(onWinnerChanged: loadGames)) : MaterialPageRoute(
+                          CreateMatchView(onWinnerChanged: loadGames))
-                    builder: (context) =>
-                        CreateMatchView(onWinnerChanged: loadGames),
-                  ),
                 );
               },
             ),