liquid-development/game-tracker
3
0
Fork 0
Code Issues 14 Pull Requests 6 Actions Releases 1 Activity

PageRoutes adaptable machen #145

Merged
flixcoo merged 10 commits from enhancement/128-PageRoutes-adaptable-machen into development 2026-01-10 14:06:10 +00:00
Conversation 5 Commits 10 Files Changed 7 +34 -40
6 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d67972624e - Show all commits

19
lib/core/adaptive_page_route.dart Normal file
View File

@@ -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,
);
}

3
lib/main.dart
View File

@@ -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(),

5
lib/presentation/views/main_menu/custom_navigation_bar.dart
View File

@@ -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++;

9
lib/presentation/views/main_menu/group_view/groups_view.dart
View File

@@ -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(
builder: (context) {
return const CreateGroupView();
},
) : MaterialPageRoute(
AdaptivePageRoute(
builder: (context) {
return const CreateGroupView();
},

26
lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
View File

@@ -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(
builder: (context) => ChooseGameView(
games: games,
initialGameIndex: selectedGameIndex,
),
) : MaterialPageRoute(
AdaptivePageRoute(
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(
builder: (context) => ChooseRulesetView(
rulesets: _rulesets,
initialRulesetIndex: selectedRulesetIndex,
),
) : MaterialPageRoute(
AdaptivePageRoute(
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(
builder: (context) => ChooseGroupView(
groups: groupsList,
initialGroupId: selectedGroupId,
),
): MaterialPageRoute(
AdaptivePageRoute(
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,

12
lib/presentation/views/main_menu/match_view/match_view.dart
View File

@@ -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(
builder: (context) =>
CreateMatchView(onWinnerChanged: loadGames),
),
CreateMatchView(onWinnerChanged: loadGames))
);
},
),