Начал экран успешного проведения покупки

lib/activate_token.dart

@@ -11,10 +11,6 @@ class FinishRegistrationScreen extends StatefulWidget {
 
 class _RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
 
-  @override Widget build(BuildContext context) {
-    return new Scaffold(appBar: _getAppBar(), body: _getScreen(context));
-  }
-
   @override String getTitle() {
     return "Регистрация";
   }
@@ -23,11 +19,11 @@ class _RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
     return 'ID merchant';
   }
 
-  @overide getMenuButtons() {
+  @overide getMenuButtons(BuildContext context) {
     return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})];
   }
 
-  Widget _getScreen(BuildContext context) {
+  @override Widget _getScreenContent(BuildContext context) {
     if (textFieldValue == "") {
       _getSavedValue();
     }

lib/base_state.dart

@@ -11,11 +11,21 @@ abstract class BaseState<T> extends State<T> {
   String error = null;
   String textFieldValue = "";
 
-  AppBar getAppBar() {
-    return new AppBar(title: new Text(getTitle(), style: new TextStyle(fontSize: 18.0)),
-        backgroundColor: primaryColor,  actions: getMenuButtons());
+  @override Widget build(BuildContext context) {
+    return new Scaffold(appBar: getAppBar(context), body: getBody(context));
   }
 
+  AppBar getAppBar(BuildContext context) {
+    return new AppBar(title: new Text(getTitle(), style: new TextStyle(fontSize: 18.0)),
+        backgroundColor: primaryColor,  actions: getMenuButtons(context));
+  }
+
+  Widget getBody(BuildContext context) {
+    return new Stack(children: <Widget>[getScreenContent(), getProgressIndicator()]);
+  }
+
+  Widget getScreenContent(BuildContext context);
+
   String getTitle();
 
   String getHint();

lib/main.dart

@@ -62,18 +62,7 @@ startScanner(BuildContext context) async {
   platform.setMethodCallHandler((MethodCall call) async {
     
     if (call.method == 'foo') {
-
-      String url = intUrl + 'tokens/' + token + '?_dmapptoken=' + intToken;
-
-      httpClient.delete(url).then((response) {
-
-        print(response.body);
-
-        }).catchError((error) {
-          print(error.toString());
-        });
-
-      pushRoute(context, new RegistrationScreen());
+      logout();
     } else {
       pushRoute(context, new PurchaseScreen());
     }
@@ -85,6 +74,19 @@ startScanner(BuildContext context) async {
   await platform.invokeMethod('startScanner');
 }
 
+logout(BuildContext context) {
+
+  // String url = intUrl + 'tokens/' + token + '?_dmapptoken=' + intToken;
+
+  // httpClient.delete(url).then((response) {
+  //   print(response.body);
+  // }).catchError((error) {
+  //   print(error.toString());
+  // });
+
+  pushRoute(context, new RegistrationScreen());
+}
+
 /// Навигация по приложению.
 /// widget - следующий экран приложения.
 pushRoute(BuildContext context, Widget widget) {

lib/purchase.dart

@@ -4,19 +4,17 @@ import 'dart:convert';
 import 'dart:async';
 
 import 'main.dart';
-import 'activate_token.dart';
 import 'base_state.dart';
+import 'purchase_success.dart';
 
 /// Экран проведения покупки.
 class PurchaseScreen extends StatefulWidget {
-  @override State createState() => new _PurchaseScreenState();
+  @override State createState() => new PurchaseScreenState<PurchaseScreen>();
 }
 
-class _PurchaseScreenState extends BaseState<PurchaseScreen> {
+class PurchaseScreenState<T> extends BaseState<T> {
 
-  @override Widget build(BuildContext context) {
-    return new Scaffold(appBar: getAppBar(), body: _getScreen(context));
-  }
+  String _sum = "1234.00";
 
   @override String getTitle() {
     return "Проведение покупки";
@@ -26,29 +24,28 @@ class _PurchaseScreenState extends BaseState<PurchaseScreen> {
     return 'Сумма';
   }
 
-  @overide getMenuButtons() {
-    return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})];
+  @overide getMenuButtons(BuildContext context) {
+    return <Widget>[
+      new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {}), 
+      new IconButton(icon: new Image.asset(logout_png, height: 20.0, width: 20.0), onPressed: () => logout(context))
+    ];
   }
 
-  Widget _getScreen(BuildContext context) {
-    return new Stack(children: <Widget>[_getScreenContent(context), getProgressIndicator()]);
-  }
-
-  Widget _getScreenContent(BuildContext context) {
+  @override Widget getScreenContent() {
     return new Container(height: 398.0,
         child: new ListView(reverse: true, children: <Widget>[
           new Column(children: <Widget>[
-            _getValueWithTitle('ФИО', 'Знаменитый Рокер Паук'),
-            _getValueWithTitle('Карта', 'B0399900702'),
-            _getValueWithTitle('Вознаграждение', '100%'),
+            getValueWithTitle('ФИО', 'Знаменитый Рокер Паук'),
+            getValueWithTitle('Карта', 'B0399900702'),
+            getValueWithTitle('Вознаграждение', '100%'),
             getHintLabel(),
             getDecoratedTextWidget(),
-            _getApprovePurchaseButton(context),
-            _getScanButton(context)])
+            getApprovePurchaseButton(context),
+            buildScanButton(context)])
         ].reversed.toList()));
   }
 
-  Widget _getValueWithTitle(String title, String value) {
+  Widget getValueWithTitle(String title, String value) {
   	return new Container(padding: new EdgeInsets.only(left: verticalMargin, right: verticalMargin, top: 12.0),
      child: new Column(children: <Widget>[
   		new Row(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[new Text(title, textAlign: TextAlign.left, style: new TextStyle(color: greyTextColor, fontSize: 14.0))]),
@@ -56,29 +53,53 @@ class _PurchaseScreenState extends BaseState<PurchaseScreen> {
   	]));
   }
  
-  Widget _getApprovePurchaseButton(BuildContext context) {
-    return new Container(margin: new EdgeInsets.only(top: 36.0), height: 42.0,
-            child: new RaisedButton(child: new Text('ЗАФИКСИРОВАТЬ ПОКУПКУ',
+  Widget getApprovePurchaseButton(BuildContext context) {
+    return new Container(margin: new EdgeInsets.only(top: 36.0), height: 44.0,
+            child: new RaisedButton(child: new Text('ЗАВЕРШИТЬ ПОКУПКУ',
                 style: new TextStyle(color: Colors.white)),
-                onPressed: () => _purchase(),
+                onPressed: () => _purchase(context),
                 color: primaryColor));
   }
 
-  Widget _getScanButton(BuildContext context) {
-    return new Container(margin: new EdgeInsets.only(top: 36.0), height: 42.0,
-      child: new RaisedButton(child: new Container(height: 42.0, child: new Text('СКАНИРОВАТЬ',
-        style: new TextStyle(color: Colors.white)), 
-        decoration: getDecoraionForScanButton()),
-        onPressed: () => _purchase()));
+  Widget buildScanButton(BuildContext context) {
+    return new Container(margin: new EdgeInsets.only(top: 24.0, left: 70.0, right: 70.0), child: _getScanButtonRow(context));
   }
 
-  getDecoraionForScanButton() {
+  Widget _getScanButtonRow(BuildContext context) {
+    return new Row(children: <Widget>[new Expanded(child: _getScanButton(context))]);
+  }
+
+  Widget _getScanButton(BuildContext context) {
+    return new Container(height: 44.0, child: new FlatButton(child: new Text('СКАНИРОВАТЬ',
+        style: new TextStyle(color: primaryColor)),
+        onPressed: () => startScanner(context)),
+        decoration: _getDecoraionForScanButton());
+  }
+
+  _getDecoraionForScanButton() {
     return new BoxDecoration(
       border: new Border.all(color: primaryColor, width: 1.0),
       borderRadius: new BorderRadius.all(new Radius.circular(4.0)));
   }
 
-  _purchase() {
+  _purchase(BuildContext context) {
+    showDialog(context: context, child: new AlertDialog(
+      title: new Text('Подтверждение'),
+      content: new Text('Вы подтверждаете покупку на ${_sum} руб?'),
+      actions: <Widget>[
+        new FlatButton(
+          child: new Text('Нет'),
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+        ),
+        new FlatButton(
+          child: new Text('Дат'),
+          onPressed: () {
+            pushRoute(context, new PurchaseSuccessScreen());
+          },
+        )
+      ]));
     print('purchase');
   }
 

lib/purchase_success.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'main.dart';
+import 'base_state.dart';
+import 'purchase.dart';
+
+/// Экран проведения покупки.
+class PurchaseSuccessScreen extends StatefulWidget {
+  @override State createState() => new _PurchaseSuccessScreenState();
+}
+
+class _PurchaseSuccessScreenState<T> extends PurchaseScreenState<T> {
+
+  @override String getTitle() {
+    return "Проведение покупки";
+  }
+
+  @overide getMenuButtons(BuildContext context) {
+    return <Widget>[
+      new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {}), 
+      new IconButton(icon: new Image.asset(logout_png, height: 20.0, width: 20.0), onPressed: () => logout(context))
+    ];
+  }
+
+  @override Widget getScreenContent() {
+    return new Column(children: <Widget>[
+            getValueWithTitle('Покупатель', 'Знаменитый Рокер Паук'),
+            _getSuccessMessage(),
+            getApprovePurchaseButton(context)
+        ]);
+  }
+
+  _getSuccessMessage() {
+  	return new Container(height: 64.0, decoration: new BoxDecoration(color: const Color(0x8ae28aff)), child: new Text('Покупка на сумму 1234.00 руб. проведена', style: new TextStyle(color: tokenActiveTextColor)));
+  }
+
+}

lib/registration.dart

@@ -16,10 +16,6 @@ class RegistrationScreen extends StatefulWidget {
 
 class _RegistrationScreenState extends BaseState<RegistrationScreen> {
 
-  @override build(BuildContext context) {
-    return new Scaffold(appBar: getAppBar(), body: _getScreen(context));
-  }
-
   @override String getTitle() {
     return "Регистрация";
   }
@@ -28,17 +24,13 @@ class _RegistrationScreenState extends BaseState<RegistrationScreen> {
     return 'ID merchant';
   }
 
-  @overide  getMenuButtons() {
+  @overide  getMenuButtons(BuildContext context) {
     return <Widget>[new IconButton(icon: new Icon(Icons.help_outline), onPressed: () {})];
   }
 
-  _getScreen(BuildContext context) {
-    return new Stack(children: <Widget>[_getScreenContent(), getProgressIndicator()]);
-  }
-
   /// Высота контейнера задана для того, чтобы элементы располагались вверху экрана 
   /// и список скроллился снизу вверх при открытии клавиатуры. 
-  _getScreenContent() {
+  @override Widget getScreenContent() {
     return new Container(height: 332.0,
       child: new ListView(reverse: true, children: <Widget>[
         new Center(child: new Column(children: <Widget>[

lib/splash.dart

@@ -17,8 +17,8 @@ class SplashScreen extends StatelessWidget {
     // После этого начинается проверка токена.
 
     new Future.delayed(const Duration(milliseconds: 1000), () {
-      // pushRoute(context, new PurchaseScreen());
-      _showNextScreen(context);
+      pushRoute(context, new PurchaseScreen());
+      // _showNextScreen(context);
     });
 
     return new Image.asset(splash_png, fit: BoxFit.cover);