From bb45d252f1fd5e0c9ba345e5c920a8c0c8502544 Mon Sep 17 00:00:00 2001
From: Ivan Murashov <ivan.murashov@u-s.su>
Date: Wed, 19 Jul 2017 18:59:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=AD=D0=BA=D1=80=D0=B0=D0=BD=20=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/build.gradle                      |   8 +-
 android/app/src/main/AndroidManifest.xml      |   4 +-
 .../checker/activity/CameraActivity.java      |  90 +++++++++++++-----
 .../dinect/checker/view/CameraPreview.java    |  85 -----------------
 .../res/drawable-xxxhdpi/help_outline.png     | Bin 0 -> 1766 bytes
 .../src/main/res/drawable-xxxhdpi/logout.png  | Bin 0 -> 1300 bytes
 .../drawable-xxxhdpi/shape_bottom_left.png    | Bin 0 -> 413 bytes
 .../drawable-xxxhdpi/shape_bottom_right.png   | Bin 0 -> 394 bytes
 .../res/drawable-xxxhdpi/shape_top_left.png   | Bin 0 -> 419 bytes
 .../res/drawable-xxxhdpi/shape_top_right.png  | Bin 0 -> 385 bytes
 .../app/src/main/res/drawable/button_blue.xml |  17 ++++
 .../src/main/res/drawable/shadow_bottom.xml   |   7 ++
 android/app/src/main/res/layout/a_scanner.xml |  86 ++++++++++++++++-
 android/app/src/main/res/menu/menu.xml        |  17 ++++
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 544 -> 0 bytes
 .../main/res/mipmap-hdpi/ic_launcher_app.png  | Bin 0 -> 2453 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 442 -> 0 bytes
 .../main/res/mipmap-mdpi/ic_launcher_app.png  | Bin 0 -> 1763 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 0 bytes
 .../main/res/mipmap-xhdpi/ic_launcher_app.png | Bin 0 -> 3290 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 1031 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_app.png     | Bin 0 -> 6013 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 1443 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_app.png    | Bin 0 -> 8267 bytes
 android/app/src/main/res/values/dimens.xml    |   5 +
 android/app/src/main/res/values/strings.xml   |   7 ++
 android/app/src/main/res/values/styles.xml    |   6 ++
 lib/activate_token.dart                       |   2 +-
 lib/main.dart                                 |   5 +-
 lib/registration.dart                         |   9 +-
 lib/splash.dart                               |   2 +-
 31 files changed, 223 insertions(+), 127 deletions(-)
 delete mode 100644 android/app/src/main/java/com/dinect/checker/view/CameraPreview.java
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/help_outline.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/logout.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/shape_bottom_left.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/shape_bottom_right.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/shape_top_left.png
 create mode 100644 android/app/src/main/res/drawable-xxxhdpi/shape_top_right.png
 create mode 100644 android/app/src/main/res/drawable/button_blue.xml
 create mode 100644 android/app/src/main/res/drawable/shadow_bottom.xml
 create mode 100644 android/app/src/main/res/menu/menu.xml
 delete mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 android/app/src/main/res/mipmap-hdpi/ic_launcher_app.png
 delete mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 android/app/src/main/res/mipmap-mdpi/ic_launcher_app.png
 delete mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 android/app/src/main/res/mipmap-xhdpi/ic_launcher_app.png
 delete mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 android/app/src/main/res/mipmap-xxhdpi/ic_launcher_app.png
 delete mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_app.png
 create mode 100644 android/app/src/main/res/values/dimens.xml
 create mode 100644 android/app/src/main/res/values/strings.xml
 create mode 100644 android/app/src/main/res/values/styles.xml

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1ea1db3..6b73299 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -15,8 +15,8 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.0.0'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
 
     lintOptions {
         disable 'InvalidPackage'
@@ -48,7 +48,5 @@ flutter {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile "com.google.android.gms:play-services-gcm:11.0.1"
-    androidTestCompile 'com.android.support:support-annotations:21.0.0'
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
+    compile 'com.android.support:appcompat-v7:25.0.0'
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b28861b..d7a6f2b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
-    <application android:name="io.flutter.app.FlutterApplication" android:label="checker" android:icon="@mipmap/ic_launcher">
+    <application android:name="io.flutter.app.FlutterApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher_app">
         <activity android:name="com.dinect.checker.activity.MainActivity"
                   android:launchMode="singleTop"
                   android:theme="@android:style/Theme.Black.NoTitleBar"
@@ -31,7 +31,7 @@
         </activity>
 
         <activity android:name="com.dinect.checker.activity.CameraActivity"
-                  android:theme="@android:style/Theme.Black.NoTitleBar"/>
+                  android:theme="@style/AppTheme"/>
 
         <service
                 android:name="com.dinect.checker.service.RegistrationIntentService"
diff --git a/android/app/src/main/java/com/dinect/checker/activity/CameraActivity.java b/android/app/src/main/java/com/dinect/checker/activity/CameraActivity.java
index b61d425..e4b2bc1 100644
--- a/android/app/src/main/java/com/dinect/checker/activity/CameraActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/activity/CameraActivity.java
@@ -1,46 +1,53 @@
 package com.dinect.checker.activity;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
-
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.util.DisplayMetrics;
+import android.content.res.Resources ;
 import android.view.View;
+import android.view.Menu;
 import android.view.View.OnClickListener;
 import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.Button;
-
+import android.graphics.Rect;
+import android.support.v7.widget.Toolbar;
 import android.hardware.Camera;
 import android.hardware.Camera.PreviewCallback;
 import android.hardware.Camera.AutoFocusCallback;
 import android.hardware.Camera.Parameters;
 import android.hardware.Camera.Size;
-
+import android.support.v7.app.ActionBar;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.view.SurfaceView;
 import android.view.SurfaceHolder;
 import android.graphics.ImageFormat;
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
 import net.sourceforge.zbar.ImageScanner;
 import net.sourceforge.zbar.Image;
 import net.sourceforge.zbar.Symbol;
 import net.sourceforge.zbar.SymbolSet;
 import net.sourceforge.zbar.Config;
+import android.graphics.YuvImage;
 
 import com.dinect.checker.R;
-import com.dinect.checker.view.CameraPreview;
 
-public class CameraActivity extends Activity {
+public class CameraActivity extends AppCompatActivity {
 
     private Camera mCamera;
-    private SurfaceView mPreview;
-    private Handler autoFocusHandler;
+    private Handler mAutoFocusHandler;
+    private ImageScanner mScanner;
+    private HashMap<String, Integer> mContours = new HashMap<>();
 
-    ImageScanner scanner;
-
-    private boolean barcodeScanned = false;
+    private boolean mBarcodeScanned = false;
     private boolean previewing = true;
 
     static {
@@ -49,28 +56,37 @@ public class CameraActivity extends Activity {
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         setContentView(R.layout.a_scanner);
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 
-        autoFocusHandler = new Handler();
+        mAutoFocusHandler = new Handler();
         mCamera = getCameraInstance();
+        mScanner = new ImageScanner();
 
-        /* Instance barcode scanner */
-        scanner = new ImageScanner();
-        scanner.setConfig(0, Config.X_DENSITY, 3);
-        scanner.setConfig(0, Config.Y_DENSITY, 3);
+        SurfaceView preview = (SurfaceView) findViewById(R.id.cameraPreview);
+        SurfaceHolder holder = preview.getHolder();
 
-        mPreview = (SurfaceView) findViewById(R.id.cameraPreview);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setTitle(getString(R.string.scanner_title));
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
-        SurfaceHolder holder = mPreview.getHolder();
         holder.addCallback(new SurfaceHolder.Callback() {
             @Override
             public void surfaceCreated(SurfaceHolder holder) {
                 try {
+
                     mCamera.setPreviewDisplay(holder);
                     mCamera.startPreview();
                     mCamera.setPreviewCallback(previewCallback);
                     mCamera.autoFocus(autoFocusCB);
+                    mCamera.setDisplayOrientation(90);
+                    initCountours();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -78,7 +94,6 @@ public class CameraActivity extends Activity {
 
             @Override
             public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-                mCamera.setDisplayOrientation(270);
             }
 
             @Override
@@ -88,6 +103,31 @@ public class CameraActivity extends Activity {
         });
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu, menu);
+        return true;
+    }
+
+
+    private void initCountours() {
+
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        int width = displayMetrics.widthPixels;
+
+        Resources res = getResources();
+        mContours.put("left", (int) res.getDimension(R.dimen.scanner_contour_top));
+        mContours.put("top", (int) res.getDimension(R.dimen.scanner_contour_left));
+        mContours.put("width", (int) res.getDimension(R.dimen.scanner_contour_height));
+        mContours.put("height", width - (2 * (int) res.getDimension(R.dimen.scanner_contour_left)));
+
+            Log.d("kifio", "left: " + mContours.get("left"));
+            Log.d("kifio", "top: " + mContours.get("top"));
+            Log.d("kifio", "width: " + mContours.get("width"));
+            Log.d("kifio", "height: " + mContours.get("height"));
+    }
+
     public void onPause() {
         super.onPause();
         releaseCamera();
@@ -121,22 +161,24 @@ public class CameraActivity extends Activity {
 
     PreviewCallback previewCallback = new PreviewCallback() {
         public void onPreviewFrame(byte[] data, Camera camera) {
-            Camera.Parameters parameters = camera.getParameters();
+
+            Parameters parameters = camera.getParameters();
             Size size = parameters.getPreviewSize();
 
             Image barcode = new Image(size.width, size.height, "Y800");
             barcode.setData(data);
+//            barcode.setCrop(mContours.get("left"), mContours.get("top"), mContours.get("width"), mContours.get("height"));
 
-            int result = scanner.scanImage(barcode);
+            int result = mScanner.scanImage(barcode);
 
             if (result != 0) {
                 previewing = false;
                 mCamera.setPreviewCallback(null);
                 mCamera.stopPreview();
 
-                SymbolSet syms = scanner.getResults();
+                SymbolSet syms = mScanner.getResults();
                 for (Symbol sym : syms) {
-                    barcodeScanned = true;
+                    mBarcodeScanned = true;
                     Toast.makeText(CameraActivity.this, sym.getData(), Toast.LENGTH_SHORT).show();
                 }
             }
@@ -146,7 +188,7 @@ public class CameraActivity extends Activity {
     // Mimic continuous auto-focusing
     AutoFocusCallback autoFocusCB = new AutoFocusCallback() {
         public void onAutoFocus(boolean success, Camera camera) {
-            autoFocusHandler.postDelayed(doAutoFocus, 1000);
+            mAutoFocusHandler.postDelayed(doAutoFocus, 1000);
         }
     };
 }
\ No newline at end of file
diff --git a/android/app/src/main/java/com/dinect/checker/view/CameraPreview.java b/android/app/src/main/java/com/dinect/checker/view/CameraPreview.java
deleted file mode 100644
index 040215e..0000000
--- a/android/app/src/main/java/com/dinect/checker/view/CameraPreview.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.dinect.checker.view;
-
-import java.io.IOException;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import android.util.Log;
-
-import android.view.View;
-import android.view.Surface;
-import android.view.SurfaceView;
-import android.view.SurfaceHolder;
-
-import android.content.Context;
-
-import android.hardware.Camera;
-import android.hardware.Camera.PreviewCallback;
-import android.hardware.Camera.AutoFocusCallback;
-import android.hardware.Camera.Parameters;
-
-public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback {
-
-    private SurfaceHolder mHolder;
-    private Camera mCamera;
-    private PreviewCallback previewCallback;
-    private AutoFocusCallback autoFocusCallback;
-
-    public CameraPreview(Context context, Camera camera,
-                         PreviewCallback previewCb,
-                         AutoFocusCallback autoFocusCb) {
-        super(context);
-        mCamera = camera;
-        previewCallback = previewCb;
-        autoFocusCallback = autoFocusCb;
-        mHolder = getHolder();
-        mHolder.addCallback(this);
-
-        // deprecated setting, but required on Android versions prior to 3.0
-        mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-    }
-
-    public void surfaceCreated(SurfaceHolder holder) {
-        // The Surface has been created, now tell the camera where to draw the preview.
-        try {
-            mCamera.setPreviewDisplay(holder);
-        } catch (IOException e) {
-            Log.d("DBG", "Error setting camera preview: " + e.getMessage());
-        }
-    }
-
-    public void surfaceDestroyed(SurfaceHolder holder) {
-        // Camera preview released in activity
-    }
-
-    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-        /*
-         * If your preview can change or rotate, take care of those events here.
-         * Make sure to stop the preview before resizing or reformatting it.
-         */
-        if (mHolder.getSurface() == null){
-          // preview surface does not exist
-          return;
-        }
-
-        // stop preview before making changes
-        try {
-            mCamera.stopPreview();
-        } catch (Exception e){
-          // ignore: tried to stop a non-existent preview
-        }
-
-        try {
-            // Hard code camera surface rotation 90 degs to match Activity view in portrait
-            mCamera.setDisplayOrientation(90);
-
-            mCamera.setPreviewDisplay(mHolder);
-            mCamera.setPreviewCallback(previewCallback);
-            mCamera.startPreview();
-            mCamera.autoFocus(autoFocusCallback);
-        } catch (Exception e){
-            Log.d("DBG", "Error starting camera preview: " + e.getMessage());
-        }
-    }
-}
diff --git a/android/app/src/main/res/drawable-xxxhdpi/help_outline.png b/android/app/src/main/res/drawable-xxxhdpi/help_outline.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b4a2fc6cdd199430595ee069d2f37453a47543b
GIT binary patch
literal 1766
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
IM6N<$f=!e#;{X5v

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/logout.png b/android/app/src/main/res/drawable-xxxhdpi/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..83b23bb6bb28288ea7e97d39d07fb80ee2b8d074
GIT binary patch
literal 1300
zcmV+v1?&2WP)<h;3K|Lk000e1NJLTq002b*002P<1^@s6ha71?000ErNkl<ZcwX(C
zJ#JJ%49D$;h5|SN$q68$phAQbkeq<z1VE2Oaso(AL2?3;9*Hza6i9><5DFwZf<!@Q
z^k2=3X5Y?-Ju}%ii5Mvj@_hZC$K$cRFh!b(tPs&-BHAFLyF_#|CL8(p6C%RjAu}Ht
z`)0*O1nYX~)^<ol&zbo&+fgCFV;K>_=3f!fmZHB_1dH8a<^yeql$?m{6Va2A4CYv4
z=Cj&4=AeiOG~z>nR%q9;&&=Ce;gDPe$RN7O%+Q*ub`He>`BF8St}~9)rcQKTDgy+<
zI6|*W#`gQnptvLR?E*Dqyv{vler8#`i0n8UlIphF!mbQZLTA*n<`P-;21Eq*?QLd~
zZDz(ksvEmo23itpzj1>Qk=3%}cDR!m_kfwR#(dd8uwFoc8soMJwXa09UTV?ZwfQbG
z_8BwZN`2NTfDBNMiRfWqanO*JQXs>48C&p(nKA!Dn+nJP1;^rcU|nWo7}*^Bo?j7-
z2;LSV@|lS4RT~HW0AK)jVRwKck-p6gmx#o`?=mxPmGdSdpNQzbem_kmXX}AYi9v~~
zwsjdI5<8+HD6#cer!A2`W#-lYP)6t&twT-uLqyk0K68UUN6fs@BNUCJ)?oh&L%{vm
zfJfXN6f9Ll9uU!cBD$8?{ZAsotNU*QLdU*q&?OWH1}}CP=o^VmBVL0Gp*mdP&(STE
zDZz9NWhyY;L$QEi=Cua)W%eNK%6W@z$_2r4Hl~TgnS!$5ZI*ro5rH8L8BEh03NURV
zZz2K<9*TR+9GOxOL%&SC#{9m@fI;9I`>ATs6a<iv$_TY;bxgc_FkjIo92l(If895E
z)nieBlJX#-_V}9S2)T><B7_*zw(rc0+)`0<<6~@$G3R_04d`_O6vR95v`;xnfMZch
zj0xu})lBxJcB7X5L*P0UlC+Gcm2DE$(@tiU^YcEjn1^*tjeNDO(o9k+<3oYU157Fc
zUpkN9&wS&wnA9@HIBg0r$eqM)Bg@!hSsa<I5~E!+X-VIO1Um*1k#z?r6wof2XU`?r
zo4#gC7NY4Bgfet=ju);yXb?bY8*VfFom>XZ7;h>GMN8nS$z2*K%Pb=59?BF&L|sFf
zs)(ptC{q>@bqQtaBBEZQOj<-#4aL>BJaxXzP`X*{r1ellR0Snc@KcqGQ4|r)vUnxF
zk+z7a7D}wdq8LmfQr9HhpeZ7%g%S%$<3kpKNz}452{$?;o-87&g_1LfW-y7AOS6ze
zu861>3gV;Kc(Z(O4|%96C@##<G!cF!ptJ^aWuUYK(+w06f%AokesLbg=r{ZzqBlc{
zrr);<C>dwTxL32dr8=@%1|V0hiDVe+@|UF{V`{S!%^o!+<$#$#y|n`>G<$@SbHJ?o
zw8$@1HuPdsaCGpxz33#^7}j}-W_Oz6r8AJiu%t0U8UaTxmq`0aL@yG*-iTFJHA~3n
ziioN`S`VtGC^-9m>7j_I36z$<&FP_ts2YkAi0Y?t&NH68h^PumCXzLrEHw}ZW%44T
zS}3t1!XhA^eVVk0s1{1<2TLXm8DC|Y0z!)~q>-I_LexTuRaRC3@s80XMMSkwLII{G
zu~ZMt(u;_ypm+<%jR6CR|Hr^mMX6Ekr56!ZLs9Ljk<hY=i2eb9oFZ>kq^0u!0000<
KMNUMnLSTXkYETIP

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/shape_bottom_left.png b/android/app/src/main/res/drawable-xxxhdpi/shape_bottom_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..15ffb91c28f53ec5a3249c8b154c93b5e72f295c
GIT binary patch
literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$>^XU`+9JaSX|DemnbM;9&<5=cRlv
zS}riIWVyq*^a5i5=Szm&!d5@doIfHdoHn8M_v@+ta@qXaFW372?mQ|i=+6+xAfq?m
zongI-{j}Fnb?JF_O79qI^m^`9c|CTYbYFM&*}do6_Wv`qu9oq%Gs(A5n#Z_jt%=cu
zn)sdDo*20unN?PPxk#!{H*|uHd~=w*blBOQiBkg%?|Q6u>e=G8Vn*JQP(`;W)es-^
zOREHw*9vJZlg<q7m>9+>dbxLt))9}@EnP3&qC}IHggPB9QC`bscu8wv(yobNtrD4}
z8Z&#M-nRO!bM3$H{hn9B_oV9nZt=sJe`@aURzI9s_2TS@8?zHjGA;fme1G+SpK$G|
zw(UHXTi#XAI9^eeQK?iJ!Iw3+tmhlc14H(+b-pWNKAa2Ovv<x*lUa*fu1Btx*O|dQ
VeQ~eQ9AL0Bc)I$ztaD0e0st_xvb6vJ

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/shape_bottom_right.png b/android/app/src/main/res/drawable-xxxhdpi/shape_bottom_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..edfd5142def10e0e5ec41ec91c0e0c4fcd9bcb7c
GIT binary patch
literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0003|Nkl<ZXhZFr
z-EqP|41`x5q!XZnq>?}fltKqUB}oUtozQ`pOYAX!LoCfOv)rwpPvc!l-`Nk6p`yp#
zKLM-(%zIl002?#g4>qj^zwZ79;OorjwXI_O!_1Dg82))+b})Z1v&G9BcK0QK?Zi%9
z)nIr^b;l}C%na=@clU_68Y(Qqk1DPTM|fa3D~A86f?ArPO(PoA(rW3;42a<fKMZHZ
zuoxD@3?$|?h+#1-hV%R|M2cZCEQT3K%xe(CVpt64`C*6@!(vzrGmx0qAcn=T7|!#<
z5GjVmuoz|_F|R=ki(xT5X5h}eaUL$x$lnQo3G>FJ^5e1w!;y*9_*;k~EI4mWBt0jk
z7;dJzB}K(>X#6&pSDvUQ4VR6N8BYzKs-$b}()wHSaQ7Cf+?m<@{Kw<F;@0i}yx%Np
o_21;O%2o^0#b{Z@+YL9v3A~v5$Z8-#0RR9107*qoM6N<$f~fDZKmY&$

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/shape_top_left.png b/android/app/src/main/res/drawable-xxxhdpi/shape_top_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2552af98652ff29961631a2a655cf20582ee552
GIT binary patch
literal 419
zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$>^XV9fG#aSX|DemnbMAhV$WOS-Xw
zun(I6rv<Z<BC~?f35IyJlnqzn6qOg8D*p9$-m&%C?`=&k=T4WKwD9+i-?k0z4DJ7Z
zA3Cqj;Gg#GmQjSwj^CmU+htk*p4Mo(Kl5ff_n(cAH|YL3c_#17U3mr@@oQx%FOPHB
zFyECw_3oXrXlT7Thju|}m-w~)XWT0OUY_Op^5_}9%`9;Ych*Vw&lT=luyJdRWxlRE
z^X!|utXKb%R9kc4Xh63Cv)a-~=abKZW-(5@v}R#SvF6zZkIZWUn|4k~b68@Mt#LEP
z%UB_3mg$rny`_=@nrEfF%%)%B>6ntnt2)~|lg-6zbK9h|OHG)Sh&9G;>7~NQkE@hB
zzPh|RRvx_1tm@?B8}e6tW_IYTihX?3X{XKI7mN0<_*&=q_H*Uqu8`lR|E;+G)V6D`
ld$jfbm;IlQU1hFkoV$^Edf`OD+rYqQ@O1TaS?83{1OR;&x~u>I

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable-xxxhdpi/shape_top_right.png b/android/app/src/main/res/drawable-xxxhdpi/shape_top_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..e392c7f05b935f6c2a9d561ee3cc01fc82f052a5
GIT binary patch
literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0003<Nkl<ZXhZFr
z(G9{d3`EZxunDjMOak42QP=>O1U8`Egbj?02($=+^XDYjuc-3JUCuAbM<N(~s=5KN
z1F#tXFL>Mo*o(+1c@P_@>I}fSBBP%fnenxV+>+sI#b%TFUPP9ns#^eug4;GndS`}P
zNcWwxs%p*@m0oKJH)q&ZuzBgpdG)upXd!J&&7?d&cwAa&?T6v?J@;fgT2{;S#IP6q
zNOifp3=Kz0&!dG2|CuGWw5N?C)v%@6($g6r!;$#(Xd%O7m<)SJiCaU4$uJp?%cn;f
z879MI*h5O(8Zu0V$#7ggJ<7;1879LXQsUN-VKPjH<MQcIMuy2S8TOD8w}uRpVKN+-
zPmeM(+yKKlH-U#5?s()pQt65}Y#pqso|Fd>S=3_K9-95S?>zumy&h_LR>Kl%zTEdV
fqxKZ<nDpNPysZ1k(^Bo{00000NkvXXu0mjf$Rw{e

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/drawable/button_blue.xml b/android/app/src/main/res/drawable/button_blue.xml
new file mode 100644
index 0000000..b32220f
--- /dev/null
+++ b/android/app/src/main/res/drawable/button_blue.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true"><shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+        <corners android:radius="4dp"/>
+        <solid android:color="#3078c0"/>
+    </shape>
+    </item>
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+        <corners android:radius="4dp"/>
+        <solid android:color="#4272e7"/>
+    </shape>
+    </item>
+</selector>
+
diff --git a/android/app/src/main/res/drawable/shadow_bottom.xml b/android/app/src/main/res/drawable/shadow_bottom.xml
new file mode 100644
index 0000000..e53dff9
--- /dev/null
+++ b/android/app/src/main/res/drawable/shadow_bottom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient android:type="linear"
+              android:angle="90"
+              android:startColor="#00000000"
+              android:endColor="#36000000"/>
+</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/a_scanner.xml b/android/app/src/main/res/layout/a_scanner.xml
index 41ae4bf..5adb5da 100644
--- a/android/app/src/main/res/layout/a_scanner.xml
+++ b/android/app/src/main/res/layout/a_scanner.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:app="http://schemas.android.com/apk/res-auto"
              android:id="@+id/rootLayout"
-             android:background="@android:color/white"
+             android:background="#404040"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
@@ -10,5 +10,89 @@
                  android:layout_width="match_parent"
                  android:layout_height="match_parent"/>
 
+    <View android:layout_height="178dp"
+          android:layout_width="match_parent"
+          android:background="#404040"/>
+
+    <!--<View android:layout_width="match_parent"-->
+          <!--android:layout_height="6dp"-->
+          <!--android:layout_marginTop="178dp"-->
+          <!--android:background="#c0000000"/>-->
+
+    <!--<View android:layout_width="24dp"-->
+          <!--android:layout_height="232dp"-->
+          <!--android:layout_marginTop="184dp"-->
+          <!--android:layout_gravity="left"-->
+          <!--android:background="#c0000000"/>-->
+
+    <!--<View android:layout_width="24dp"-->
+          <!--android:layout_height="232dp"-->
+          <!--android:layout_marginTop="184dp"-->
+          <!--android:layout_gravity="right"-->
+          <!--android:background="#c0000000"/>-->
+
+    <!--<View android:layout_width="match_parent"-->
+          <!--android:layout_height="18dp"-->
+          <!--android:layout_marginTop="416dp"-->
+          <!--android:background="#c0000000"/>-->
+
+    <View android:layout_height="match_parent"
+          android:layout_width="match_parent"
+          android:layout_marginTop="434dp"
+          android:background="#404040"/>
+
+    <!--<FrameLayout android:id="@+id/scanner_contour"-->
+                 <!--android:layout_width="match_parent"-->
+                 <!--android:layout_height="200dp"-->
+                 <!--android:layout_marginTop="196dp"-->
+                 <!--android:layout_marginLeft="36dp"-->
+                 <!--android:layout_marginRight="36dp">-->
+
+        <!--<View android:layout_width="20dp"-->
+              <!--android:layout_height="20dp"-->
+              <!--android:layout_gravity="top|left"-->
+              <!--android:background="@drawable/shape_top_left"/>-->
+
+        <!--<View android:layout_width="20dp"-->
+              <!--android:layout_height="20dp"-->
+              <!--android:layout_gravity="top|right"-->
+              <!--android:background="@drawable/shape_top_right"/>-->
+
+        <!--<View android:layout_width="20dp"-->
+              <!--android:layout_height="20dp"-->
+              <!--android:layout_gravity="bottom|left"-->
+              <!--android:background="@drawable/shape_bottom_left"/>-->
+
+
+        <!--<View android:layout_width="20dp"-->
+              <!--android:layout_height="20dp"-->
+              <!--android:layout_gravity="bottom|right"-->
+              <!--android:background="@drawable/shape_bottom_right"/>-->
+
+    <!--</FrameLayout>-->
+
+    <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="#4272e7"
+            app:titleTextColor="@android:color/white"/>
+
+    <View android:id="@+id/toolbarShadow"
+          android:layout_width="match_parent"
+          android:layout_height="4dp"
+          android:layout_marginTop="?attr/actionBarSize"
+          android:background="@drawable/shadow_bottom"/>
+
+    <Button android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:paddingLeft="60dp"
+            android:paddingRight="60dp"
+            android:text="@string/scan"
+            android:textAllCaps="true"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="46dp"
+            android:background="@drawable/button_blue"/>
 
 </FrameLayout>
diff --git a/android/app/src/main/res/menu/menu.xml b/android/app/src/main/res/menu/menu.xml
new file mode 100644
index 0000000..564d0c3
--- /dev/null
+++ b/android/app/src/main/res/menu/menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/faq"
+            android:orderInCategory="0"
+            android:title="@string/faq"
+            android:icon="@drawable/help_outline"
+            app:showAsAction="ifRoom"/>
+
+    <item android:id="@+id/logout"
+            android:orderInCategory="1"
+            android:title="@string/logout"
+            android:icon="@drawable/logout"
+            app:showAsAction="ifRoom"/>
+
+</menu>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 544
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc
zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs
zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U<k`UN+s5qQ#T?KrmN7v*f2L%`GO4-^
z(#_kX+jhyc?*UrsvLED<w+p3gfi4y<3GxeO5CDRJfCLa|I1d8%B?X@R0!qL1ba4!c
zIQ;g^b-pGC0f)elH+vJ_clF3>|N3vA*22N<t#oc3|FNCx%`Ll}Jbl*Q`}yg~1ZO@=
zF!6p)NTYsh!6(JdtLiRuwi@`&XeqAXe9fY|=kfFy_3t|md##(iHE+K4ydxH3>aGQG
zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#i<K@6w~yiZZH!59hqLTYF-H
zp0%uz(2~z(X$>qdw@AL`7MR}m`rwr|mZgU`8P7SB<Kba6`>kL78fFf!WnuYWm$5Z0
zNXhDbCv&49sM544K|?c)WrFfiZ<W8RzO1)p=v7f>vCi9h0O)B3Pgg&ebxsLQ05GG~
AQ2+n{

diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_app.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_app.png
new file mode 100644
index 0000000000000000000000000000000000000000..b00aa5d74ac49514dab62aefa172cf0566e79f6a
GIT binary patch
literal 2453
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
K=z2r<_<sSlWQ_v=

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB
zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q0<?|W-^A&VhjhO+044$%!YxiPI;`p4Q#=k
za-F;6dk-j1J*_nBlG2>3KywUtLX8Ua?`H+NMzkczFPK3<KtaL4z@UHr{Pp|KpFjT|
z1oAia3j-A_^>lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l
zyt<ns@%x_-ezPmiS-=02Ut8`WUGa5ad?jb?UB<rkVmAJ)*Xy}nR&U>Q?X=U+MF$@3
zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+
yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@U<OZDKbLh*2~7avPrJzg

diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_app.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_app.png
new file mode 100644
index 0000000000000000000000000000000000000000..b44fb4c8b6790bc1067d569fafcecd26e06624b6
GIT binary patch
literal 1763
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
FV1nZkMP~p2

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 09d4391482be68e9e4a07fab769b5de337d16eb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 721
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!iOI#yLg7ec#$`gxH85~pclTsBt
za}(23gHjVyDhp4h+5i=O3-AeX1=1l$e`s#|#^}+&7(N@w0CIr{$Oe+Uk^K-ZP~83C
zcc@hG6rikF&NPT(23>y!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs
z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM
zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R`
zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM
zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg
z<JnHTOuK%sGbNji)8cv6*ZNtnbwxJZ-?eY1e-ZPG#r<}_kct2Ie>oq1^2_p9@|WEo
z*X_Uko@K)qYYv~<poG`LOv(2(Hhkk{Dz;b6_#4<(=XBwh@>>43eQGMdbiGbo>E~Q&
zr<n4_y=h^-h|%}kO&jwCioQ5EzF6K8^VdP)H>YBH{QP^@Sti!`2)uG{irBBq@y*$B
zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N
zdG@vOZB4v_lF7Plrx+hxo7(fCV&}f<lyK#S=nvDw%*y%vwN3psIS+1s7G}QfbZGd|
zV;VoMy*YI2-%hU{-w$hl9!*Y_m~60h&vVVs6)lfgu09v4QWIt25UBGxaN`?mVmn*e
U?z!!Jz`$qlboFyt=akR{0C)T?>Hq)$

diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_app.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_app.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5fb7793d773afba4ed22c2b197257413a1cbda1
GIT binary patch
literal 3290
zcmcIn<yR97+}*~6!GzKA5DpMQ2^rEux?_Zdk|H4z0@5*@QVOF+$Ri>3fH27+ATbc>
z?hqM*#85g%zrO#%d(Qje-h1vj_uSvt-+gO>(xIpOhYkP$(Cg`Hn*G(s{|gB9UtY=#
zlK(5<r)oxO06=vT^xW|p0B}7;PgBi27`SOeo6I`Nb=er^8W_uFV#1*CZe<S>y+X|d
zLBw%bm%?A@V^cCY<8{R%nd#EgT$;;XyOm;Gu;%6_9d0JOORQ;HTW2_fw?CTh5yo{c
zuLg%kTJ90LCHrm4Nci`g)0GR83&*6FE%uut;SA=u7>tCMvrLt$Dib_}Uj)Po#4#l+
zHGc=j0eT_2eD<3FEsQhxCaf|LBcLh;!o^x4|0cPBz2ES>d5~l*W_fXv!33<Ut-814
zP9p-kDF_b<{!I0Ms!2A)81GSJxRvE-w5KaZnt~!pg%Dze9j0G`Dv>YxWIl9ep(5I@
znPDo1URB<VKopvs`n{pz#;JH9T8RbD<Ao1$@8>xLus!Cq|5#w!wtbxOh<(E-3(UXz
z-up?1C+T`-M!h|61O6V^?ZnHGafG_ulX{L!;)PJRFs5g;-;rR)Sl50p_a;UYp2BMD
zCNkzE^(O3V%dLjzWO-sfKj-yy|Ay>bu4@Ve;;vM5>44U${ZHWc9=3$ij?`)=G-F2l
zTus{_BSzGlJ!e5P_8kX_ypO#X7QOnL*5X8;I7=c7-8q=8lq)*|P`P5;t>N#gAjsgJ
zIV<snNkyP_<S7CkI`UiWHy?{oxpjy`f1RWEd?@?I=gz9BN}4|1W^>#@dj*6jcO&0X
z?!lQ?`b3eA0+2I0`iaDo*xl#rGl<dzG{pz&sTPjqT%)`#3Z1?4(E@Z{s4cLz@(#Bw
z8&7XPDW=^)CtUp+H}+3!>J*u|ddy3pUjbdbx*6g-QXm<MOI);TFRJxi-;8C~3El|K
zgp&3%o~{oy2@@usHFJxrIAFFn=3>bnl`Q1i0=EEUcVag_dp!NDI-|0u0k$^r?4d)r
zP{b~(w%CZdpkHOz-tC<&t`@TtK=3V}<jo6kOKLtWl7{iBKZ_lrJt?nur#(BPn$3J^
zc{XBGhe7|$BR}x?0SO5UY^RMj8LI<8q6vzY%>?Ut;80>tmE|YQXsZe~UnTOemzlDC
zbw4}}mcW-~wgGlky48X6qd;m=yo-Ovx!GqaaMQf%LF0_%{ckXzp=>7h1m8Iyd6i2M
zOYy$G$LKGtL>upzlPz_(!S{3qah*Js&gFK>hTq?o;vz!)mWeX3lxO3eO6VXg<7)Zg
zu$()6c&?5%7@V68Ec_@k8Fn-M*$UmXN+32E;W7JShFh)}{DIrUdE7(Xy6xq3u;#+Q
zu(Og6aIu@9cR^{z&j7C~Q$UHt11S*fN77DI)1vhA>n(Y_SdUXd#W0C;Cmjvpy`6D{
z{KYBAIYUt=v28$bUpkuTxMFiO;8zv2$-e#bhA}h>7cmF`t6b_X<4>K$9TIESjm<3v
z_mu>h%)O^&$?qJt)<5=T>1ukqtabG2<4?E#5%vrVqe{`lTY8U0@rbY}Zc>L0+rw2+
z9FKH9^&CEr2LFb&w>t_A@YNWFc5zC9SKE&}c|uAg5e%E~#g6K`)yw<(Yi&~&Ef)Qv
z<*C2(323A~U06|QTAi362&+cLbiPAn%_jpD(&EdEBKKDo=NQ_BB<~MA*jYGkdT$il
zygd>i*Jk~tOnXyG0HXsjykr55m%OU4(9oY!FpqG7cJC@0Sns>;EL?avUW=w?C>;e8
z%w~;o8Gtf!$A24Hft;ca>|rj$$~ua|Y32!N?t}r0gfv-)!_`5i5VE7@(;@vb8w<5A
zFh<jNt99*bQ2!tap=*iU7~oNY#5U{KVFnZ``5P!2W^sci))Ua9jB=7}1+p;c?lMtX
z&Xk#W1<Xf+9`MDy{K1)7+b+Nop@H;a@;56>DaoZi<7V3ovQMyHL-m}@v9wz;(uGb=
zzcCDDJgVD#dnxJ~UJujR%JMcbspMQlYJZh`E_TRErO40_II5NFx_W*MlEk%r8^2|w
zt^d#;6|eMSxJA-ZOz2O+{Om3W=;rmkEzdz|_jk}6##?PVebt_Q6O_Utyl=lz0s8!v
zH>LbFAh5B)0llrftBd)1OwX-e5)oaK6t8IwR^+1nvQL7SqeP?qA>HX%{z#^Ce}q0X
ze(Y2r0+h}22OHYC00;?LQl7sNHYXb;OnSHFo4z8$vc%TthssrdV@ca%Ss}I?H;N2k
zwm2``y6KV`@o*vGo96vLt?`|c4U4CJjqJnv6<gZu1BB{8ywxwmZ(Td{niq@|&zcNY
ze@(X?lU>`U1GB32_jjs4N=NwS1Us9Mi|*{0n!VoX8FfxiFZx|!?XsTo(bA6@&n?HV
z{-mH$&*QuFE{<)E>}4I#DE%&L1x$9v)mY$0L|5>(@s&q(r?*HYJ6z;0QtiLzQH88W
zdE~Xy2TRpepO)C{tg7XgE*ksBT|!o@xFYqZ8=B9vX@5o(T)mGai>^%3d%eu4zx{Ib
zp-%$(wRtaRphkiG+R04ZDu~3kk?A|uWJ`Z_KPXaTBzp#;n=XGa(97vB4uYXT$0agu
z@V=$tj)Xr+N&Z;f_0{1OXOv&uP&jZE3Dvx`y>zaK5>3>f((vi+9<iy9X-T!E<TR1{
zT63y;1?z&g*-@4xl3hFB-Cl24Z1&9{I^vZC_D=+=`ro@uIfnx4@d))^8;>ct(sR(>
zR0UIw5~(XcwQB77{U{}vk}Ulz72_B!0TF38k=ht~#`8Tw6gj>gv0(FNC#M(M1}_n(
zbmAV)6#ZhG$n`fkJ8F*|q5G~TDv}p=IyzZg6-++mCcJ1%{lc8sYI?3eWa>Qe5NsvE
zl22no$$ui%OOR1Hv;E{2cvwiV-!n(3oUl%fxm4eHBzAPU?Ku9HJ(fTF;>>icMCF{N
z3+gg-yo&c@?wdG0xR;i4uj>{<c*^)cGz}!_JDjNt!Ryi4SBuXO7egH_C8Z$OEGXLN
z`ai7Bzd6Djcb(V$#lw(!;l*7e{16FiPJ;5Cq1^39uBk6-^)%CtxHHSTPVPci1-x%;
zj+`E{>>DW1T0_E*9-}`?ulzEkBNR~mpdw^B98s<ZrN|At@(Z<a^L}zLdfF^wRJ|(W
zW$_HH@<<C5USXl!YEIwBcj00AmE+rFU%t{S*6b_UANn$rP^~LOs!~tu8y%if|G;fM
z3vpBSV1GKS2TePv3K+UJ1i4yF^548!fZuSE*SVr8geioc9hIc*zfF|rV@a`ybuvhM
zeFF_}+JUDSAOCgj%Z66`-}W}v0moq7KA(nJ6<6un_`Av;>Ro@53GA7tkZ{3m)#a4Z
z_Dz_XNM=yt7a!AR%dyGh{y8S%iY)o!taB(h<TLIe;4n5jJ9FMRpYeXH_)4k5px|xO
zkfC4WS{*Wme#?0Rk=r~fiDbgCumuOPquR-Nz2)C?F{sdI4S+G0L9(E70EN_&g@wqR
z^^8h!T+pQS!rrE5)dBCnxxC<79(b>JsDdFl(Y(kFWgb=V`%1iqj0{iw^q}Xv{jr_<
z&KEy{|2CpIoC<Ea(;39a57v{kXUCr!IY=OH-2S8A(3pCZ#Pcfq3*lPkBGWQ&ziut}
zUY#c^f8q$n!*SGi{RA}z0iaiIiNWGNS9uNH68NxP6JBXKA@!iB$6--25`jUj>mKar
z@pk*^HysYtcKf*tCjs8qeLxZ9t=E;Ud{7@^E)Lz*V&Ks{c)ybY6TGqSM<TjMZk>aw
zMJ@+dO%yRc_cB?oXK^GNuW>Wu%s~|N$&L+~O7ZlU#ck!h7g?`aiB(f$-H&RK9Sr<5
z<u#ReD20{anIAXM&}Du~2ki{&SmJRvLLgZpIlYL*WVf?3)^>}{z+vc%mDqIsI?|ZL
zE1Oyq0!3HN32F0Dk@6!;49?nsGb>9*j6Dl)ifa;;%7+$=as=V)lfR_0jEva@FHXCN
zlX_*GqCf9$fJc0D)RoojPyrt>apaVhzptfnD~@<kWDHdxQ!8fHi--+5*z9y$a+o#l
zKpK)q%DZd{e9*G4%(6HrPzwXS&h<zObA7_j=?=*DaZk@3kaOPFKM$CGf;6-(nc!3b
z)0uGq4o<0>H~`njrY>`ELtAo+1-M6bUZz-}?OF`>lYlDq?+OGPP(sq#nGGmq5|mI1
p@p;8Bh=(M<YV<Jt|2c8;vNI;>XEXem=I>Ym=xL!eE7Tvq{vU-SOLhPN

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1031
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xj&#3c(B0U1_%
zz5^97Xt*<I`!eYGGw1~|=m#_ChcFm~F&M`%SZ6TU=QA3HGn&RTnk6urCox*3Gg@ad
z+GI1@<S^O-Q7)rh9;1CBqhm3nV+o^EDWh`*qe~T|Yc-==4WnBvqgx%LdmW=k1EWVH
zqbCqGF?u#LdbTinH8Xm(F#5DJ`gAb*0#PTUUpJ#)52HU2^)d$ZF$VTC22NlMoX8kB
zi7{v*V-S#>%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3
zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc
z$|q_opQ^2TrnVZ0o~wh<3t%W&f<tNc(Fvx&VC63f@(X4V5O7Fnm=6N`&!0cPZsO%v
z3=B;Ao-U3d6}R4ANDmGU6lr~^!Nn0K;_9?HfJbVIkW)*G%Yg&F)*BmaZ)6Dl_&?vn
za8gV0`@6<5-|YBa|J|21FVarliS1gU$698&iU*DCL=pdt&mR>lvYGe#$xqda2bR_R
zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2<a5l9V~;L&ZJD?F
zD6?3<TgqciA=l+!=Lp=a%2;%{dX@{HT-OP1|K<}HAM1TO7OY<MaYyH#Pk)4WR?Ts}
zSNX4tLr#6-^m$z!Pd18IzSivQkh7k6T`o7OKThT4#m*F4b=OPt(kAX%9+=X!JT9f}
zc|=Oray6sl!J;#tXm&@~>^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2
z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b
z<q`EIyVgP^b`|@{uDX5oB6GTR%^Or)?eBf<KkJg@eR6BbGYJ*-U;nQCudos6R9mG`
zc=6fn-^`2s)0Hm%cpbX>pQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE
z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o
zo~|9<SN`RwE}r7KC~Q%?|CMD5O&m%cKw{Bn6{qJbmFIooO_;g=+H+v4V(@hJb6Mw<
G&;$S>I;xof

diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_app.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_app.png
new file mode 100644
index 0000000000000000000000000000000000000000..79b33225a1a1cca75ed4849228e53b8d740a4d9a
GIT binary patch
literal 6013
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
A2mk;8

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 4d6372eebdb28e45604e46eeda8dd24651419bc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1443
zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`Y<EGuRA6NX2Md
zPqmGQbJPjRLrI#9?bL25ZHra>V6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY
zB_M<hJUv`}aj#i9>sH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv
za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8<s&Q-yp4r*9
z(t|8L&`vhm$wAg!MByQdFQW1h)eqSS&@P++v^xmx2}OHF$WDZ4QHUN37S3Sd0#=@|
zD*$YR!8QbJ55gWH>=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~<G>Lo9vl;Zfs+W#BydUw
zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3
z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w!
zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u
zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%<BT_6>4Q8~Mad
z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt*
zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW
zu72MW`|?8h<N~B$l%}NU6KvLZj~&>t^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w
z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf<
zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$
zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v
zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq
z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek
zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+
zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q
zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl
z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f
z<NEXJGYh+`9LE^Z1#g~OZ)yl?O>%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H
zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP
z(1P?z<YzdcoCZ;A^sD<`wcO1=DLw>~7YxD~Rf<<Lt&2H?f`^~9TW?0O(WnyXeZvF-
hHxv6WEXUT@T$j&O|7sZ6iSVC<kf$5l^{TT-@h=>(a@_y`

diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_app.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_app.png
new file mode 100644
index 0000000000000000000000000000000000000000..d37e5d409c7f60a0f3ecb99aa1186a499ad19178
GIT binary patch
literal 8267
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

literal 0
HcmV?d00001

diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..0889d13
--- /dev/null
+++ b/android/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <dimen name="scanner_contour_left">24dp</dimen>
+    <dimen name="scanner_contour_top">178dp</dimen>
+    <dimen name="scanner_contour_height">232dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..2cb1f1b
--- /dev/null
+++ b/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<resources>
+    <string name="app_name">Checker</string>
+    <string name="scanner_title">Сканнер карты</string>
+    <string name="scan">Сканировать</string>
+    <string name="faq">FAQ</string>
+    <string name="logout">Выход</string>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..e36e3aa
--- /dev/null
+++ b/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,6 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar"/>
+
+</resources>
diff --git a/lib/activate_token.dart b/lib/activate_token.dart
index 87bcebd..b357a61 100644
--- a/lib/activate_token.dart
+++ b/lib/activate_token.dart
@@ -15,7 +15,7 @@ class _RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
 
   AppBar _getAppBar() {
     return new AppBar(title: new Text("Регистрация магазина"),
-        backgroundColor: const Color(0xff4272e7),  actions: <Widget>[
+        backgroundColor: const Color(primaryColor),  actions: <Widget>[
           new IconButton(
             icon: new Icon(Icons.help_outline),
             tooltip: 'Air it',
diff --git a/lib/main.dart b/lib/main.dart
index 2953d10..625d9ef 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -21,6 +21,9 @@ const String splash_png = 'assets/splash.png';
 const String logout_png = 'assets/logout.png';
 const String activate_token_bg_png = 'assets/activate_token_message_background.png';
 
+
+// Colors
+const int primaryColor = 0xffeb0004;
 final httpClient = createHttpClient();
 
 void main() {
@@ -64,7 +67,7 @@ startScanner() async{
 /// Навигация по приложению.
 /// widget - следующий экран приложения.
 pushRoute(BuildContext context, Widget widget) {
-  Navigator.of(context).push(new MaterialPageRoute<Null>(
+  Navigator.of(context).pushReplacement(new MaterialPageRoute<Null>(
       builder: (BuildContext context) {
         return widget;
       }));
diff --git a/lib/registration.dart b/lib/registration.dart
index 144e12b..054c4c1 100644
--- a/lib/registration.dart
+++ b/lib/registration.dart
@@ -19,17 +19,12 @@ class _RegistrationScreenState extends BaseState<RegistrationScreen> {
   }
 
   AppBar _getAppBar() {
-    return new AppBar(title: new Text("Регистрация магазина"),
-        backgroundColor: const Color(0xff4272e7),  actions: <Widget>[
+    return new AppBar(title: new Text("Регистрация"),
+        backgroundColor: const Color(primaryColor),  actions: <Widget>[
           new IconButton(
             icon: new Icon(Icons.help_outline),
             tooltip: 'Air it',
             onPressed: faq,
-          ),
-          new IconButton(
-            icon: new Image(height: 24.0, width: 24.0, image: new AssetImage('assets/logout.png')),
-            tooltip: 'Restitch it',
-            onPressed: logout,
           )
         ]);
   }
diff --git a/lib/splash.dart b/lib/splash.dart
index 07a9411..fa6796f 100644
--- a/lib/splash.dart
+++ b/lib/splash.dart
@@ -16,7 +16,7 @@ class SplashScreen extends StatelessWidget {
       _showNextScreen(context);
     });
 
-    return new Image.asset(logo_png, fit: BoxFit.cover);
+    return new Image.asset(splash_png, fit: BoxFit.cover);
   }
 
   /// Запуск следующего экрана приложения.