Правки по меню, по локали, добавлены Евро и Тенге

lib/base/base_state.dart

@@ -77,7 +77,7 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
   void onOptionsItemClick(int index) {
     switch (index) {
       case 0: {
-        pushRoute(context, new SettingsScreen(helper, app));
+        pushRoute(context, new SettingsScreen(helper, app, false));
         break;
       }
       case 1: {

lib/common.dart

@@ -1,6 +1,6 @@
 import 'package:checker/screens/faq.dart';
 import 'package:checker/screens/purchase.dart';
-import 'package:checker/screens/registration.dart';
+import 'package:checker/screens/settings.dart';
 import 'package:checker/screens/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -65,7 +65,9 @@ forceLogout(String token , BuildContext context) async {
     helper.open().then((_) {
       helper.clear().then((_) {
         helper.close().then((_) {
-          Navigator.of(context).pop();
+          while (Navigator.of(context).canPop()) {
+            Navigator.of(context).pop();
+          }
           pushRouteReplacement(context, new SplashScreen());
         });
       });
@@ -78,50 +80,68 @@ forceLogout(String token , BuildContext context) async {
 /// Запуск спецефичной для каждой платформы части приложения - сканера.
 /// Может производиться с нескольких экранов (splash, finish_registration).
 startScanner(BuildContext context, String app, SqliteHelper helper) async {
-
-  String token = await helper.getToken();
-  helper.close();
-  // Канал ловит вызовы методов из "нативной" части приложения.
-  // Могут быть вызваны либо logout либо faq, либо purchase.
-  if (token != null) {
-    platform.setMethodCallHandler((MethodCall call) async {
-
-      if (call.method == 'logout') {
-        forceLogout(token, context);
-      } else if (call.method == 'faq') {
-        faq(context, true);
-      } else {
-        String userString = call.arguments[0];
-        String card = call.arguments[1];
-        var route = new MaterialPageRoute<Null>(builder: (BuildContext context) => new PurchaseScreen(userString, card));
-        Navigator.of(context).pushReplacement(route);
-      }
+  if (helper == null) {
+    helper = new SqliteHelper();
+    helper.open().then((_) {
+      startScanner(context, app, helper);
     });
+  } else {
+    String token = await helper.getToken();
+    helper.close();
+    // Канал ловит вызовы методов из "нативной" части приложения.
+    // Могут быть вызваны либо logout либо faq, либо purchase.
+    if (token != null) {
+      platform.setMethodCallHandler((MethodCall call) async {
+        if (call.method == 'logout') {
+          forceLogout(token, context);
+        } else if (call.method == 'faq') {
+          faq(context, true);
+        } else if(call.method == 'settings') {
+          helper = new SqliteHelper();
+          helper.open().then((_) {
+            pushRoute(context, new SettingsScreen(helper, app, true));
+          });
+        } else {
+          String userString = call.arguments[0];
+          String card = call.arguments[1];
+          var route = new MaterialPageRoute<Null>(
+              builder: (BuildContext context) =>
+              new PurchaseScreen(
+                  userString, card));
+          while (Navigator.of(context).canPop()) {
+            Navigator.of(context).pop();
+          }
+          Navigator.of(context).pushReplacement(route);
+        }
+      });
 
-    await platform.invokeMethod('startScanner', {
-      'token' : token,
-      'url': url,
-      'appToken': appToken,
-      'color': Resources.getPrimaryColor(app).value
-    });
+      await platform.invokeMethod('startScanner', {
+        'token': token,
+        'url': url,
+        'appToken': appToken,
+        'color': Resources
+            .getPrimaryColor(app)
+            .value
+      });
+    }
   }
 }
 
 // Запуск диалога с двумя кнопками
 showYesNoDialog(BuildContext context, String title, String content, VoidCallback positiveCallback) {
- showDialog(context: context, child: new AlertDialog(
-  title: new Text(title),
-  content: new Text(content),
-  actions: <Widget>[
-    new FlatButton(
-      child: new Text(StringsLocalization.no()),
-      onPressed: () {
-        Navigator.of(context).pop();
-      }
-    ),
-    new FlatButton(
-      child: new Text(StringsLocalization.yes()),
-      onPressed: positiveCallback)]));
+  showDialog(context: context, child: new AlertDialog(
+      title: new Text(title),
+      content: new Text(content),
+      actions: <Widget>[
+        new FlatButton(
+            child: new Text(StringsLocalization.no()),
+            onPressed: () {
+              Navigator.of(context).pop();
+            }
+        ),
+        new FlatButton(
+            child: new Text(StringsLocalization.yes()),
+            onPressed: positiveCallback)]));
 }
 
 getCurrencyTitle(int code) {
@@ -130,7 +150,7 @@ getCurrencyTitle(int code) {
     case 840: return StringsLocalization.nominativeDollar();
     case 980: return StringsLocalization.nominativeHryvna();
     case 978: return StringsLocalization.nominativeEuro();
-    case 398: return StringsLocalization.nominativeEuro();
+    case 398: return StringsLocalization.nominativeTenge();
   }
 }
 

lib/screens/settings.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:checker/base/base_screen.dart';
 import 'package:checker/base/base_state.dart';
 import 'package:checker/common.dart';
@@ -9,9 +11,11 @@ import 'package:flutter/material.dart';
 
 class SettingsScreen extends BaseScreen {
 
-  SettingsScreen(helper, app) : super(helper, app);
+  final bool returnToScanner;
 
-  @override State createState() => new SettingsState(helper, app);
+  SettingsScreen(helper, app, this.returnToScanner) : super(helper, app);
+
+  @override State createState() => new SettingsState(helper, app, returnToScanner);
 }
 
 class MenuItem {
@@ -26,9 +30,12 @@ class SettingsState extends BaseState<SettingsScreen> {
 
   List<MenuItem> menuItems = [new MenuItem(StringsLocalization.currency(), '')];
 
-  SettingsState(SqliteHelper helper, String app) {
+  bool returnToScanner;
+
+  SettingsState(SqliteHelper helper, String app, bool returnToScanner) {
     this.helper = helper;
     this.app = app;
+    this.returnToScanner = returnToScanner;
   }
 
   @override Widget build(BuildContext ctx) {
@@ -41,7 +48,7 @@ class SettingsState extends BaseState<SettingsScreen> {
         }
       }
     });
-    return getMainWidget();
+    return new WillPopScope(onWillPop: onWillPop, child: getMainWidget());
   }
 
   @override
@@ -104,4 +111,12 @@ class SettingsState extends BaseState<SettingsScreen> {
   String getTitle() {
     return StringsLocalization.settings();
   }
+
+  onWillPop() {
+    if(returnToScanner) {
+      return startScanner(context, app, helper);
+    } else {
+      return true;
+    }
+  }
 }