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

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;
+    }
+  }
 }