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

Merge branch 'development' into enhancement/137-matchsummarytile-durch-matchtile-ersetzen

Browse Source 
# Conflicts:
#	lib/presentation/views/main_menu/match_view/match_view.dart
#	pubspec.yaml
This commit is contained in:
Felix Kirchner
2026-01-10 15:15:14 +01:00
parent c4f6749882 14a043785e
commit 9221f64fa5
8 changed files with 320 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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