13450 merge 12267_new_flow and update to new flutter version

This commit is contained in:
nikitateplyakov
2019-11-20 16:37:36 +03:00
16 changed files with 490 additions and 226 deletions

View File

@@ -2,6 +2,7 @@ import 'package:checker/base/base_state.dart';
import 'package:checker/common.dart';
import 'package:checker/consts.dart';
import 'package:checker/db.dart';
import 'package:checker/screens/purchase_sum.dart';
import 'package:checker/strings.dart';
import 'package:flutter/material.dart';
@@ -133,7 +134,11 @@ class PurchaseSuccessScreenState<T> extends BaseState<PurchaseSuccessScreen> {
getScanButton() {
String title = StringsLocalization.scan();
return buildRaisedButton(title, () => Navigator.of(context).pop(token));
return buildRaisedButton(title,
() => Navigator.pushAndRemoveUntil(context,
MaterialPageRoute(builder: (context) =>
PurchaseSumScreen(widget.helper, widget.app, token)),
(route) => false));
}