fix merge issues
This commit is contained in:
@@ -142,7 +142,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
|
|||||||
: games[selectedGameIndex].$1,
|
: games[selectedGameIndex].$1,
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
selectedGameIndex = await Navigator.of(context).push(
|
selectedGameIndex = await Navigator.of(context).push(
|
||||||
MaterialPageRoute(
|
adaptivePageRoute(
|
||||||
builder: (context) => ChooseGameView(
|
builder: (context) => ChooseGameView(
|
||||||
games: games,
|
games: games,
|
||||||
initialGameIndex: selectedGameIndex,
|
initialGameIndex: selectedGameIndex,
|
||||||
@@ -170,7 +170,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
|
|||||||
: translateRulesetToString(selectedRuleset!, context),
|
: translateRulesetToString(selectedRuleset!, context),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
selectedRuleset = await Navigator.of(context).push(
|
selectedRuleset = await Navigator.of(context).push(
|
||||||
MaterialPageRoute(
|
adaptivePageRoute(
|
||||||
builder: (context) => ChooseRulesetView(
|
builder: (context) => ChooseRulesetView(
|
||||||
rulesets: _rulesets,
|
rulesets: _rulesets,
|
||||||
initialRulesetIndex: selectedRulesetIndex,
|
initialRulesetIndex: selectedRulesetIndex,
|
||||||
@@ -192,7 +192,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
|
|||||||
: selectedGroup!.name,
|
: selectedGroup!.name,
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
selectedGroup = await Navigator.of(context).push(
|
selectedGroup = await Navigator.of(context).push(
|
||||||
MaterialPageRoute(
|
adaptivePageRoute(
|
||||||
builder: (context) => ChooseGroupView(
|
builder: (context) => ChooseGroupView(
|
||||||
groups: groupsList,
|
groups: groupsList,
|
||||||
initialGroupId: selectedGroupId,
|
initialGroupId: selectedGroupId,
|
||||||
@@ -242,7 +242,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
|
|||||||
if (context.mounted) {
|
if (context.mounted) {
|
||||||
Navigator.pushReplacement(
|
Navigator.pushReplacement(
|
||||||
context,
|
context,
|
||||||
CupertinoPageRoute(
|
adaptivePageRoute(
|
||||||
fullscreenDialog: true,
|
fullscreenDialog: true,
|
||||||
builder: (context) => MatchResultView(
|
builder: (context) => MatchResultView(
|
||||||
match: match,
|
match: match,
|
||||||
|
|||||||
Reference in New Issue
Block a user