diff --git a/android/app/build.gradle b/android/app/build.gradle index 63be40d..e3ec5da 100644 --- 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" } diff --git a/android/app/src/crypto/res/values/strings.xml b/android/app/src/crypto/res/values/strings.xml index 7cf01ce..ae616ab 100644 --- a/android/app/src/crypto/res/values/strings.xml +++ b/android/app/src/crypto/res/values/strings.xml @@ -1,3 +1,3 @@ - Crypto + Joys diff --git a/assets/crypto_logo.png b/assets/crypto_logo.png index a09666a..54e5619 100644 Binary files a/assets/crypto_logo.png and b/assets/crypto_logo.png differ diff --git a/assets/crypto_splash.png b/assets/crypto_splash.png new file mode 100644 index 0000000..d51abf4 Binary files /dev/null and b/assets/crypto_splash.png differ diff --git a/assets/values-en/strings.xml b/assets/values-en/strings.xml index a891e06..276b505 100644 --- a/assets/values-en/strings.xml +++ b/assets/values-en/strings.xml @@ -110,7 +110,7 @@ Our website: 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. - Joys on account - Joys was charged - Joys to charge + Joys on account + Joys was charged + Joys to charge diff --git a/assets/values-es/strings.xml b/assets/values-es/strings.xml index a5cfd21..a4a9ce5 100644 --- a/assets/values-es/strings.xml +++ b/assets/values-es/strings.xml @@ -7,19 +7,19 @@ Configuraciones Identificador %s no está encontrado Ingrese el número de tarjeta - Teléfono 79XXXXXXXXX + Teléfono móvil 79XXXXXXXXX Puede entrar el identificador por la mano o puede llamar por teléfono %s ID del negocio ID %s no está encontrado Aplicación está activada - ¿Os realmente quiereis acabarse una sesión y dar otro ID del negocio? + ¿Realmente quiere acabarse la sesión y dar otro ID del negocio? Comprador Tarjeta Escaneo de tarjeta Realizar la compra Terminar el registro Terminar la compra - ¿Confirmais la compra por %s %s? + ¿Confirma la compra por %s %s? Confirmacón No Compra por %s %s está realizada @@ -27,17 +27,17 @@ Explotación Contactos del soporte técnico Información básica - Requieremento de activación de aplicación está mandado, esperad la activación por el administrador + Requieremento de activación de aplicación está mandado, espere la activación por el administrador Gratificación - Bonificación a cuenta - Tasa de descuento + Bonuses a cuenta + Tasa del descuento Monto del descuento - Puntos de bonificación - Bono fue cobrado - ¿Cuántas puntuaciones se cancelan? + Bonuses fueron cobrado + Bonuses fueron insumido + ¿Cuántas bonuses hay que insumir? Cupones fueron canjeados Seleccione cupones para comprar - Si no especifica cuántos puntos cancelar, se agregarán puntos + Si no especifica cuántos bonuses hay que insumir, los seran añadido Registrarse Hay que dar ID del negocio Suma @@ -106,5 +106,7 @@ Nuestro sitio: Hay que poner el dibujo del codigo de tarjeta en cámara del escanear totalmente para leerlo efectivamente. - + Joys a cuenta + Joys fueron insumido + ¿Cuántas Joys hay que insumir? diff --git a/assets/values-ru/strings.xml b/assets/values-ru/strings.xml index 051c571..b49e2f0 100644 --- a/assets/values-ru/strings.xml +++ b/assets/values-ru/strings.xml @@ -109,7 +109,7 @@ Для эффективного считывания штрих-кода карты участника системы лояльности необходимо камеру сканера поднести так, чтобы в неё не попадали вертикальные полосы рамки (если они есть). Они расцениваются сканером как часть штрих-кода. - Joys на счету - Joys было списано - Joys списать + Joys на счету + Joys было списано + Joys списать diff --git a/assets/values-ua/strings.xml b/assets/values-ua/strings.xml index 11c0465..13b47c0 100644 --- a/assets/values-ua/strings.xml +++ b/assets/values-ua/strings.xml @@ -111,7 +111,7 @@ Для ефективного зчитування штрих-коду карти учасника системи лояльності необхідно камеру сканера піднести так, щоб в неї не потрапляли вертикальні смуги рамки. Вони розцінюються сканером як частина штрих-коду. - Joys на рахунку - Joys списано - Скільки Joys списати? + Joys на рахунку + Joys списано + Скільки Joys списати? diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m index 51fa019..b62bd2f 100644 --- 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]; diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart index 3c40b6c..efac1f4 100644 --- a/lib/screens/purchase.dart +++ b/lib/screens/purchase.dart @@ -78,7 +78,11 @@ class PurchaseScreenState extends BaseState { } if (bonus.length > 0) { - widgetList.add(getValueWithDescription(StringsLocalization.bonus(), bonus)); + if (app = 'crypto') { + widgetList.add(getValueWithDescription(StringsLocalization.joys(), bonus)); + } else { + widgetList.add(getValueWithDescription(StringsLocalization.bonus(), bonus)); + } } widgetList.add(getHintLabel()); @@ -126,6 +130,43 @@ class PurchaseScreenState extends BaseState { 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 extends BaseState { 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), diff --git a/lib/screens/purchase_success.dart b/lib/screens/purchase_success.dart index 96e0701..caa8220 100644 --- a/lib/screens/purchase_success.dart +++ b/lib/screens/purchase_success.dart @@ -89,10 +89,16 @@ class PurchaseSuccessScreenState extends BaseState { widgetList.add(getValueWithDescription(StringsLocalization.buyer(), username)); widgetList.add(getSuccessMessage()); - if (bonusPlus > 0) { + 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())); } diff --git a/lib/strings.dart b/lib/strings.dart index 45c9caf..c5fa81d 100644 --- 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']; + } diff --git a/pubspec.lock b/pubspec.lock index c8590db..be9f694 100644 --- 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