tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Smoth screen changes. Step 1

Browse Source
This commit is contained in:
Ivan Murashov
2018-03-08 23:53:31 +03:00
parent cfdf5dcca2
commit 58e58671de
13 changed files with 238 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/screens/settings.dart
View File

@@ -36,9 +36,7 @@ class SettingsState extends BaseState<SettingsScreen> {
bool returnToScanner;
SettingsState(SqliteHelper helper, String app, bool returnToScanner) {
this.helper = helper;
this.app = app;
SettingsState(SqliteHelper helper, String app, bool returnToScanner) : super(helper, app) {
this.returnToScanner = returnToScanner;
}
@@ -55,7 +53,7 @@ class SettingsState extends BaseState<SettingsScreen> {
info['token'] == null ? '' : getTokenSuffix(info['token']);
});
});
return new WillPopScope(onWillPop: onWillPop, child: getMainWidget());
return getMainWidget();
}
String getTokenSuffix(String token) {
@@ -159,11 +157,11 @@ class SettingsState extends BaseState<SettingsScreen> {
return StringsLocalization.settings();
}
onWillPop() {
if (returnToScanner) {
return startScanner(context, app, helper);
} else {
return true;
}
}
// onWillPop() {
// if (returnToScanner) {
// return startScanner(context, app, helper);
// } else {
// return true;
// }
// }
}