From c84c70b7ca1e4ef79af59d83e766647c9d0ac459 Mon Sep 17 00:00:00 2001
From: Ivan Murashov <ivan.murashov@u-s.su>
Date: Wed, 25 Apr 2018 23:43:05 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BB=D0=B0=D0=B2=D0=B8=D0=B0=D1=82=D1=83=D1=80?=
 =?UTF-8?q?=D1=83=20=D0=BD=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dinect/checker/ScannerActivity.java  |  3 ++-
 lib/screens/purchase.dart                         | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java
index 9c0b773..5958c4b 100644
--- a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java
@@ -154,6 +154,7 @@ public class ScannerActivity extends AppCompatActivity implements
 
   private void initSwitchButton() {
     mButton = findViewById(R.id.cardPhoneButton);
+    mButton.setOnClickListener(this);
     resetSearchType(SearchType.CARD, R.drawable.ic_card, "enter_manual");
   }
 
@@ -379,4 +380,4 @@ public class ScannerActivity extends AppCompatActivity implements
       return chain.proceed(request);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart
index 7552ec0..4785354 100644
--- a/lib/screens/purchase.dart
+++ b/lib/screens/purchase.dart
@@ -64,14 +64,17 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
   String bonus = '';
   List<Map> coupons = [];
   ListView listView;
+  TextField bonusTextField;
 
   @override
   Widget getScreenContent() {
     List<Widget> widgetList = [];
+
     widgetList.add(getValueWithDescription(
         StringsLocalization.buyer(),
         user['first_name'] == null ? '' : user['first_name']
     ));
+
     widgetList.add(getValueWithDescription(StringsLocalization.card(), card));
 
     if (app != 'crypto') {
@@ -123,12 +126,16 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
         )
     ));
 
+    if (this.coupons.length == 0) {
+      widgetList.add(new Container(height: 50.0,));
+    }
+
     listView = new ListView(children: widgetList, controller: scrollController);
     return listView;
   }
 
   getBonusInputField() {
-    var bonusTextField = new TextField(
+    bonusTextField = new TextField(
       keyboardType: TextInputType.number,
       decoration: new InputDecoration.collapsed(
         hintText: (app != 'crypto') ? StringsLocalization.bonusHint() : StringsLocalization.joysHint(),
@@ -448,6 +455,8 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
   // TODO: Удалить дублирующийся код.
   void buildFocusNode() {
 
+    var pos = this.coupons.length > 0 ? 150.0 : 100.0;
+
     sumFocusNode.addListener(() {
       setState(() {
 
@@ -456,7 +465,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
         }
 
         if (sumFocusNode.hasFocus) {
-          scrollController.animateTo(150.0, duration: new Duration(seconds: 1), curve: Curves.ease);
+          scrollController.animateTo(pos, duration: new Duration(seconds: 1), curve: Curves.ease);
         }
 
       });
@@ -470,7 +479,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
         }
 
         if (bonusFocusNode.hasFocus) {
-          scrollController.animateTo(150.0, duration: new Duration(seconds: 1), curve: Curves.ease);
+          scrollController.animateTo(pos, duration: new Duration(seconds: 1), curve: Curves.ease);
         }
 
       });