fix page pop
This commit is contained in:
parent
6206c8f900
commit
b106ed5717
@ -1,6 +1,5 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:tuple/tuple.dart';
|
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import '../common.dart';
|
import '../common.dart';
|
||||||
@ -164,7 +163,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
|
|||||||
icon: Icon(Icons.arrow_forward,
|
icon: Icon(Icons.arrow_forward,
|
||||||
color: MyTheme.darkGray, size: 45),
|
color: MyTheme.darkGray, size: 45),
|
||||||
onPressed: onConnect,
|
onPressed: onConnect,
|
||||||
autofocus: _idController.text.isNotEmpty,
|
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
|
@ -29,7 +29,18 @@ class _HomePageState extends State<HomePage> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return WillPopScope(
|
||||||
|
onWillPop: () async {
|
||||||
|
if (_selectedIndex != 0) {
|
||||||
|
setState(() {
|
||||||
|
_selectedIndex = 0;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
child: Scaffold(
|
||||||
backgroundColor: MyTheme.grayBg,
|
backgroundColor: MyTheme.grayBg,
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
centerTitle: true,
|
centerTitle: true,
|
||||||
@ -50,6 +61,6 @@ class _HomePageState extends State<HomePage> {
|
|||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
body: _pages.elementAt(_selectedIndex),
|
body: _pages.elementAt(_selectedIndex),
|
||||||
);
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -209,7 +209,11 @@ void showLoginReqAlert(String peerID, String name) async {
|
|||||||
builder: (alertContext) {
|
builder: (alertContext) {
|
||||||
DialogManager.reset();
|
DialogManager.reset();
|
||||||
DialogManager.register(alertContext);
|
DialogManager.register(alertContext);
|
||||||
return AlertDialog(
|
return WillPopScope(
|
||||||
|
onWillPop: () async {
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
child: AlertDialog(
|
||||||
title: Text("Control Request"),
|
title: Text("Control Request"),
|
||||||
content: Container(
|
content: Container(
|
||||||
height: 100,
|
height: 100,
|
||||||
@ -240,9 +244,9 @@ void showLoginReqAlert(String peerID, String name) async {
|
|||||||
DialogManager.reset();
|
DialogManager.reset();
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
);
|
));
|
||||||
});
|
});
|
||||||
DialogManager.reset();
|
DialogManager.drop();
|
||||||
}
|
}
|
||||||
|
|
||||||
class PermissionRow extends StatelessWidget {
|
class PermissionRow extends StatelessWidget {
|
||||||
@ -403,7 +407,7 @@ showInputWarnAlert() async {
|
|||||||
],
|
],
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
DialogManager.reset();
|
DialogManager.drop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void toAndroidChannelInit() {
|
void toAndroidChannelInit() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user