RG-3444

lib/base/base_state.dart

@@ -1,7 +1,6 @@
 import 'package:checker/resources.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:intl/intl.dart';
 
 import 'package:checker/common.dart';
 import 'package:checker/consts.dart';
@@ -52,7 +51,9 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
   }
 
   AppBar getAppBar() {
-    return new AppBar(title: new Text(getTitle(), style: new TextStyle(fontSize: 18.0)),
+    return new AppBar(title: new Container(
+        margin: new EdgeInsets.only(left: 16.0),
+        child: new Text(getTitle(), style: new TextStyle(fontSize: 18.0))),
         backgroundColor: Resources.getPrimaryColor(app),  actions: getMenuButtons());
   }
 

lib/db.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:ui';
 
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart';

lib/i18n/messages_en.dart

@@ -50,6 +50,21 @@ class MessageLookup extends MessageLookupByLibrary {
     "ruble" : MessageLookupByLibrary.simpleMessage("Ruble"),
     "dollar" : MessageLookupByLibrary.simpleMessage("Dollar"),
     "hryvna" : MessageLookupByLibrary.simpleMessage("Hryvna"),
+    "nominative_ruble": MessageLookupByLibrary.simpleMessage("Ruble"),
+    "singular_ruble": MessageLookupByLibrary.simpleMessage("Ruble"),
+    "plural_ruble": MessageLookupByLibrary.simpleMessage("Rubles"),
+    "nominative_dollar": MessageLookupByLibrary.simpleMessage("US Dollar"),
+    "singular_dollar": MessageLookupByLibrary.simpleMessage("US Dollar"),
+    "plural_dollar": MessageLookupByLibrary.simpleMessage("US Dollars"),
+    "nominative_hryvna": MessageLookupByLibrary.simpleMessage("Hryvnia"),
+    "singular_hryvna": MessageLookupByLibrary.simpleMessage("Hryvnia"),
+    "plural_hryvna": MessageLookupByLibrary.simpleMessage("Hryvnia"),
+    "nominative_tenge": MessageLookupByLibrary.simpleMessage("Tenge"),
+    "singular_tenge": MessageLookupByLibrary.simpleMessage("Tenge"),
+    "plural_tenge": MessageLookupByLibrary.simpleMessage("Tenge"),
+    "nominative_euro": MessageLookupByLibrary.simpleMessage("Euro"),
+    "singular_euro": MessageLookupByLibrary.simpleMessage("Euro"),
+    "plural_euro": MessageLookupByLibrary.simpleMessage("Euro"),
     "registration_guide": MessageLookupByLibrary.simpleMessage('''
 Store log in screen is the first thing you will see after starting the application.
 

lib/i18n/messages_es.dart

@@ -47,8 +47,57 @@ class MessageLookup extends MessageLookupByLibrary {
     "ruble" : MessageLookupByLibrary.simpleMessage("Ruble"),
     "dollar" : MessageLookupByLibrary.simpleMessage("Dollar"),
     "hryvna" : MessageLookupByLibrary.simpleMessage("Hryvna"),
+    "nominative_ruble": MessageLookupByLibrary.simpleMessage("Rublo"),
+    "singular_ruble": MessageLookupByLibrary.simpleMessage("Rublo"),
+    "plural_ruble": MessageLookupByLibrary.simpleMessage("Rublos"),
+    "nominative_dollar": MessageLookupByLibrary.simpleMessage("Dólar Dolares"),
+    "singular_dollar": MessageLookupByLibrary.simpleMessage("Dólar Dolares"),
+    "plural_dollar": MessageLookupByLibrary.simpleMessage("Dólar Dolares"),
+    "nominative_hryvna": MessageLookupByLibrary.simpleMessage("Hryvnia"),
+    "singular_hryvna": MessageLookupByLibrary.simpleMessage("Hryvnia"),
+    "plural_hryvna": MessageLookupByLibrary.simpleMessage("Hryvnia"),
+    "nominative_tenge": MessageLookupByLibrary.simpleMessage("Tenge"),
+    "singular_tenge": MessageLookupByLibrary.simpleMessage("Tenge"),
+    "plural_tenge": MessageLookupByLibrary.simpleMessage("Tenge"),
+    "nominative_euro": MessageLookupByLibrary.simpleMessage("Euro"),
+    "singular_euro": MessageLookupByLibrary.simpleMessage("Euro"),
+    "plural_euro": MessageLookupByLibrary.simpleMessage("Euro"),
     "registration_guide": MessageLookupByLibrary.simpleMessage('''
-Después del inicio de una aplicación móvil usted será movido a la página del registro del negocio. Ponga DIN del negocio (DIN está generada por el sistema en el paso del registro del negocio). 
-''')
+Store log in screen is the first thing you will see after starting the application.
+
+Enter the store number (DIN). You can look it up in the loyalty program control panel. If you do not have access to the control panel, ask the administrator.
+
+Click the ""Login"" button.
+
+Please wait while the administrator activates your request. You can refresh your store activation status by pressing the ""Update activation status"" button.
+
+After the administrator activates your request, click the ""Complete activation"" button. The application is ready to use.
+
+If you want to log in as another store, click the Menu button (upper right corner of the screen) and select "Exit".
+'''),
+    "usage_guide": MessageLookupByLibrary.simpleMessage('''
+Step 1:
+
+Launch this application and scan your customer's loyalty card using the built in scanner.
+
+If the scan is successful, the customer's information will appear on the screen.
+
+Step 2:
+
+Enter the purchase amount and click the ""Create a purchase"" button.
+
+In a pop-up window press ""YES"" to confirm the amount and allot the points to a customer.
+
+If you want to correct the amount, press ""NO"" and you will return back to the purchase screen where you can adjust the amount.
+'''),
+    "support_guide": MessageLookupByLibrary.simpleMessage('''
+Always recommend your customers to install your loyalty card app, so they can participate in your loyalty program.
+
+If you have any problems with the application, feel free to contact the support.
+
+Phone:\n%s\n
+Our website:\n%s'''),
+    "common_guide": MessageLookupByLibrary.simpleMessage('''
+To improve barcode scanning quality, adjust the distance between the camera and the barcode so that the border around the barcode (if any) is not visible. Otherwise the vertical lines of the border could be wrongly considered as part of the code.''')
   };
 }

lib/screens/currencies.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:checker/base/base_screen.dart';
 import 'package:checker/base/settings_base_state.dart';
 import 'package:checker/db.dart';

lib/screens/faq.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:checker/resources.dart';
 import 'package:checker/strings.dart';
 import 'package:flutter/material.dart';
@@ -5,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:checker/base/base_state.dart';
 import 'package:checker/consts.dart';
 import 'package:checker/common.dart';
-import 'package:checker/db.dart';
 
 /// Класс содержит заголовки и текст блоков FAQ.
 class Entry {
@@ -88,25 +89,19 @@ class FAQScreenState<T> extends BaseState<FAQScreen> {
   @override Widget build(BuildContext context) {
     if (app == null) {
       platform.invokeMethod('getFlavor').then((flavor) {
-        setState(() {
-          app = flavor;
-          initPhoneAndUrl();
+        initPhoneAndUrl().then((_) {
+          setState(() {
+            app = flavor;
+          });
         });
       });
     }
     return new Scaffold(appBar: getAppBar(), body: getScreenContent());
   }
 
-  void initPhoneAndUrl() {
-    String phone, url;
-    if (app == 'pip') {
-      phone = '+38 080 030 9997\n+38 044 390 1697';
-      url = 'http://discount.kiev.ua/';
-    } else if (app == 'autobonus') {
-      phone = '8-800-234-6064';
-      url = 'https://www.auto-club.biz';
-    }
-    initHelp(phone, url);
+  Future initPhoneAndUrl() async {
+    initHelp(await platform.invokeMethod('getSupportPhone'),
+        await platform.invokeMethod('getSupportUrl'));
   }
 
   void initHelp(String phone, String url) {

lib/screens/languages.dart

@@ -2,7 +2,6 @@ import 'package:checker/base/base_screen.dart';
 import 'package:checker/base/settings_base_state.dart';
 import 'package:checker/db.dart';
 import 'package:flutter/material.dart';
-import 'package:checker/consts.dart';
 import 'package:checker/strings.dart';
 import 'package:checker/common.dart';
 import 'package:intl/intl.dart';

lib/screens/settings.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:checker/base/base_screen.dart';
 import 'package:checker/base/base_state.dart';
 import 'package:checker/common.dart';