update crypto joys version

2018-03-14 18:09:40 +07:00
parent 3aa06122dc
commit a27ee31f1c
13 changed files with 82 additions and 41 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -144,7 +144,7 @@ android {
            buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
            buildConfigField "String", "endpoint", "\"https://pos-api-crypto-int.dinect.com/20130701/\""
            buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
-            buildConfigField "String", "appTitle", "\"Crypto Joys\""
+            buildConfigField "String", "appTitle", "\"Joys\""
            buildConfigField "boolean", "showBonus", "true"
        }

--- a/android/app/src/crypto/res/values/strings.xml
+++ b/android/app/src/crypto/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Crypto</string>
+    <string name="app_name">Joys</string>
 </resources>
--- a/assets/crypto_logo.png
+++ b/assets/crypto_logo.png
--- a/assets/crypto_splash.png
+++ b/assets/crypto_splash.png
--- a/assets/values-en/strings.xml
+++ b/assets/values-en/strings.xml
@@ -110,7 +110,7 @@ Our website:
  <string name="common_guide">
 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.
  </string>
-  <string name="Joys">Joys on account</string>
-  <string name="Joys_minus">Joys was charged</string>
-  <string name="Joys_hint">Joys to charge</string>
+  <string name="joys">Joys on account</string>
+  <string name="joys_minus">Joys was charged</string>
+  <string name="joys_hint">Joys to charge</string>
 </resources>
--- a/assets/values-es/strings.xml
+++ b/assets/values-es/strings.xml
@@ -7,19 +7,19 @@
  <string name="settings">Configuraciones</string>
  <string name="identifier_not_found">Identificador %s no está encontrado</string>
  <string name="enter_manual">Ingrese el número de tarjeta</string>
-  <string name="enter_phone">Teléfono 79XXXXXXXXX</string>
+  <string name="enter_phone">Teléfono móvil 79XXXXXXXXX</string>
  <string name="error_contact_support">Puede entrar el identificador por la mano o puede llamar por teléfono %s</string>
  <string name="ID_Store">ID del negocio</string>
  <string name="ID_not_found">ID %s no está encontrado</string>
  <string name="app_activ">Aplicación está activada</string>
-  <string name="ask_change_store">¿Os realmente quiereis acabarse una sesión y dar otro ID del negocio?</string>
+  <string name="ask_change_store">¿Realmente quiere acabarse la sesión y dar otro ID del negocio?</string>
  <string name="buyer">Comprador</string>
  <string name="card">Tarjeta</string>
  <string name="card_scaner">Escaneo de tarjeta</string>
  <string name="carry_purchase">Realizar la compra</string>
  <string name="complite_activ">Terminar el registro</string>
  <string name="complite_purchase">Terminar la compra</string>
-  <string name="confirm_purchase">¿Confirmais la compra por %s %s?</string>
+  <string name="confirm_purchase">¿Confirma la compra por %s %s?</string>
  <string name="confirmation">Confirmacón</string>
  <string name="no">No</string>
  <string name="purchase_complite">Compra por %s %s está realizada</string>
@@ -27,17 +27,17 @@
  <string name="usage">Explotación</string>
  <string name="support">Contactos del soporte técnico</string>
  <string name="common">Información básica</string>
-  <string name="request_sent_wait_activ">Requieremento de activación de aplicación está mandado, esperad la activación por el administrador</string>
+  <string name="request_sent_wait_activ">Requieremento de activación de aplicación está mandado, espere la activación por el administrador</string>
  <string name="reward">Gratificación</string>
-  <string name="bonus">Bonificación a cuenta</string>
-  <string name="discount_rate">Tasa de descuento</string>
+  <string name="bonus">Bonuses a cuenta  </string>
+  <string name="discount_rate">Tasa del descuento</string>
  <string name="discount_sum">Monto del descuento</string>
-  <string name="bonus_plus">Puntos de bonificación</string>
-  <string name="bonus_minus">Bono fue cobrado</string>
-  <string name="bonus_hint">¿Cuántas puntuaciones se cancelan?</string>
+  <string name="bonus_plus">Bonuses fueron cobrado</string>
+  <string name="bonus_minus">Bonuses fueron insumido</string>
+  <string name="bonus_hint">¿Cuántas bonuses hay que insumir?</string>
  <string name="coupons_used">Cupones fueron canjeados</string>
  <string name="select_coupons">Seleccione cupones para comprar</string>
-  <string name="bonus_explanation">Si no especifica cuántos puntos cancelar, se agregarán puntos</string>
+  <string name="bonus_explanation">Si no especifica cuántos bonuses hay que insumir, los seran añadido</string>
  <string name="sign_up">Registrarse</string>
  <string name="specify_din_store">Hay que dar ID del negocio</string>
  <string name="sum">Suma</string>
@@ -106,5 +106,7 @@ Nuestro sitio:

  <string name="common_guide">
 Hay que poner el dibujo del codigo de tarjeta en cámara del escanear totalmente para leerlo efectivamente.</string>
-
+  <string name="joys">Joys a cuenta</string>
+  <string name="joys_minus">Joys fueron insumido</string>
+  <string name="joys_hint">¿Cuántas Joys hay que insumir?</string>
 </resources>
--- a/assets/values-ru/strings.xml
+++ b/assets/values-ru/strings.xml
@@ -109,7 +109,7 @@
  <string name="common_guide">
 Для эффективного считывания штрих-кода карты участника системы лояльности необходимо камеру сканера поднести так, чтобы в неё не попадали вертикальные полосы рамки (если они есть). Они расцениваются сканером как часть штрих-кода.
 </string>
-  <string name="Joys">Joys на счету</string>
-  <string name="Joys_minus">Joys было списано</string>
-  <string name="Joys_hint">Joys списать</string>
+  <string name="joys">Joys на счету</string>
+  <string name="joys_minus">Joys было списано</string>
+  <string name="joys_hint">Joys списать</string>
 </resources>
--- a/assets/values-ua/strings.xml
+++ b/assets/values-ua/strings.xml
@@ -111,7 +111,7 @@
  <string name="common_guide">
 Для ефективного зчитування штрих-коду карти учасника системи лояльності необхідно камеру сканера піднести так, щоб в неї не потрапляли вертикальні смуги рамки. Вони розцінюються сканером як частина штрих-коду.
 </string>
-  <string name="Joys">Joys на рахунку</string>
-  <string name="Joys_minus">Joys списано</string>
-  <string name="Joys_hint">Скільки Joys списати?</string>
+  <string name="joys">Joys на рахунку</string>
+  <string name="joys_minus">Joys списано</string>
+  <string name="joys_hint">Скільки Joys списати?</string>
 </resources>
--- a/ios/Runner/AppDelegate.m
+++ b/ios/Runner/AppDelegate.m
@@ -52,15 +52,15 @@
               @"appTitle" : @"Autobonus",
               @"showBonus" : @NO,
       },
-	   @"com.dinect.checker.dinect" : @{
+	   @"com.dinect.checker.crypto" : @{
               @"locale" : @"ru",
               @"flavor" : @"crypto",
               @"currency" : @643,
               @"supportPhone" : @"support@dinect.com",
               @"supportUrl" : @"http://www.dinect.com",
-               @"endPoint" : @"https://pos-api.dinect.com/20130701/",
+               @"endPoint" : @"https://pos-api-crypto-int.dinect.com/20130701/",
               @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
-               @"appTitle" : @"Crypto",
+               @"appTitle" : @"Joys",
               @"showBonus" : @YES,
       },
       @"com.dinect.checker.pip" : @{
@@ -74,17 +74,6 @@
               @"appTitle" : @"PIP",
               @"showBonus" : @YES,
       },
-       @"com.dinect.checker.crypto" : @{
-               @"locale" : @"ru",
-               @"flavor" : @"crypto",
-               @"currency" : @643,
-               @"supportPhone" : @"8-800-77-55-032",
-               @"supportUrl" : @"http://www.dinect.com",
-               @"endPoint" : @"https://pos-api-int.dinect.com/20130701/",
-               @"appToken" : @"9fec83cdca38c357e6b65dbb17514cdd36bf2a08",
-               @"appTitle" : @"Dinect Crypto",
-               @"showBonus" : @NO,
-               },
   };

    NSDictionary *buildSettings = settings[bundleIdentifier];
--- a/lib/screens/purchase.dart
+++ b/lib/screens/purchase.dart
@@ -78,8 +78,12 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
    }

    if (bonus.length > 0) {
+      if (app = 'crypto') {
+        widgetList.add(getValueWithDescription(StringsLocalization.joys(), bonus));
+      } else {
        widgetList.add(getValueWithDescription(StringsLocalization.bonus(), bonus));
      }
+    }

    widgetList.add(getHintLabel());
    widgetList.add(getInputField()); // Нельзя добавить еще одно поле таким же способом
@@ -126,6 +130,43 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {

  getBonusInputField() {

+    if (app = 'crypto') {
+      var bonusTextField = new EnsureVisibleWhenFocused(
+        focusNode: _focusNodeBonus,
+        child: new TextField(
+          focusNode: _focusNodeBonus,
+          keyboardType: TextInputType.number,
+          decoration: new InputDecoration.collapsed(
+            hintText: StringsLocalization.joysHint(),
+            hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0)
+          ),
+          controller: bonusController,
+          onSubmitted: (String text) {
+            setState(() {
+              bonusController.text = text;
+            });
+          },
+          textAlign: TextAlign.center,
+        ));
+    } else {
+      var bonusTextField = new EnsureVisibleWhenFocused(
+        focusNode: _focusNodeBonus,
+        child: new TextField(
+          focusNode: _focusNodeBonus,
+          keyboardType: TextInputType.number,
+          decoration: new InputDecoration.collapsed(
+            hintText: StringsLocalization.bonusHint(),
+            hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0)
+          ),
+          controller: bonusController,
+          onSubmitted: (String text) {
+            setState(() {
+              bonusController.text = text;
+            });
+          },
+          textAlign: TextAlign.center,
+        ));
+    }
    var bonusTextField = new EnsureVisibleWhenFocused(
      focusNode: _focusNodeBonus,
      child: new TextField(
@@ -161,7 +202,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
            top: 5.0
          ),
          child: new Text(
-            StringsLocalization.bonusExplanation(),
+            (app = 'crypto')?" ":StringsLocalization.bonusExplanation(),
            textAlign: TextAlign.center,
            overflow: TextOverflow.ellipsis,
            style: new TextStyle(color: greyTextColor, fontSize: 11.0),
--- a/lib/screens/purchase_success.dart
+++ b/lib/screens/purchase_success.dart
@@ -89,10 +89,16 @@ class PurchaseSuccessScreenState<T> extends BaseState<PurchaseSuccessScreen> {
    widgetList.add(getValueWithDescription(StringsLocalization.buyer(), username));
    widgetList.add(getSuccessMessage());

+    if (app != 'crypto') {
      if (bonusPlus > 0) {
      widgetList.add(getValueWithDescription(StringsLocalization.bonusPlus(), bonusPlus.toString()));
    }
+    }
    if (bonusMinus > 0) {
+      if (app = 'crypto') {
+        widgetList.add(getValueWithDescription(StringsLocalization.joysMinus(), bonusMinus.toString()));
+      }
+    } else {
      widgetList.add(getValueWithDescription(StringsLocalization.bonusMinus(), bonusMinus.toString()));
    }

--- a/lib/strings.dart
+++ b/lib/strings.dart
@@ -145,4 +145,7 @@ class StringsLocalization {
  static String usageGuide() => strings['usage_guide'];
  static String commonGuide() => strings['common_guide'].replaceAll('\n', "\n");
  static String supportGuide(String phone, String url) => sprintf(strings['support_guide'], [phone, url]);
+  static String joys() => strings['joys'];
+  static String joysMinus() => strings['joys_minus'];
+  static String joysHint() => strings['joys_hint'];
  }
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -21,7 +21,7 @@ packages:
      name: collection
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.14.5"
+    version: "1.14.6"
  flutter:
    dependency: "direct main"
    description: flutter