From 3359c0abb4db83b86f3a60e8cfe22a8573aabdec Mon Sep 17 00:00:00 2001 From: Ivan Murashov Date: Tue, 13 Feb 2018 22:37:17 +0300 Subject: [PATCH] Fixes in localization. Fix splash screen background. --- .../java/com/dinect/checker/MainActivity.java | 1 - assets/dinect_splash.png | Bin 273 -> 217 bytes assets/pip_splash.png | Bin 273 -> 217 bytes assets/values-en/strings.xml | 4 ++-- assets/values-es/strings.xml | 6 +++--- assets/values-ru/strings.xml | 2 +- assets/values-ua/strings.xml | 2 +- lib/resources.dart | 6 +++++- lib/screens/faq.dart | 6 +----- lib/strings.dart | 1 - 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/android/app/src/main/java/com/dinect/checker/MainActivity.java b/android/app/src/main/java/com/dinect/checker/MainActivity.java index 6ce89fb..3788dd6 100644 --- a/android/app/src/main/java/com/dinect/checker/MainActivity.java +++ b/android/app/src/main/java/com/dinect/checker/MainActivity.java @@ -130,7 +130,6 @@ public class MainActivity extends FlutterActivity { Intent cameraIntent = new Intent(MainActivity.this, SCANNER_BACKEND[idx]); for (Object key : mScannerArgs.keySet()) { - Log.d("kifio", "k: " + key + "; v: " + mScannerArgs.get(key).toString()); if (key.equals("color")) { cameraIntent.putExtra((String) key, Long.parseLong((String) mScannerArgs.get(key))); } else { diff --git a/assets/dinect_splash.png b/assets/dinect_splash.png index 3839a8e8c82c5487d8294315dba52cb2a28f7c02..d51abf428747d0a324a03fa22832eb85f0acc72d 100644 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^DIm~)y~xPRz`%3J;LmI} z>GPL8BZB8@i7^NYC@?X(I5co@2r$x<&8P&m_r!O$AKGiK{mB=}0lJmJ)78&qol`;+ E0G%@_wg3PC literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^DIm-UBp4!QuJ{S0SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+uenM@oty!5+IMg z#M9T6{UIkiyM;{qt#friAxTdc#}JFt$v^s8>FcQzVz z0~M*3xJHzuB$lLFB^RXvDF!10LvvjNOI-u=5JLkiQ!^_g3vB~qD+7al%J&zbXvob^ Z$xN%nt>JuKx(rYQgQu&X%Q~loCIDpzN;Uuh diff --git a/assets/pip_splash.png b/assets/pip_splash.png index 3839a8e8c82c5487d8294315dba52cb2a28f7c02..d51abf428747d0a324a03fa22832eb85f0acc72d 100644 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^DIm~)y~xPRz`%3J;LmI} z>GPL8BZB8@i7^NYC@?X(I5co@2r$x<&8P&m_r!O$AKGiK{mB=}0lJmJ)78&qol`;+ E0G%@_wg3PC literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^DIm-UBp4!QuJ{S0SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+uenM@oty!5+IMg z#M9T6{UIkiyM;{qt#friAxTdc#}JFt$v^s8>FcQzVz z0~M*3xJHzuB$lLFB^RXvDF!10LvvjNOI-u=5JLkiQ!^_g3vB~qD+7al%J&zbXvob^ Z$xN%nt>JuKx(rYQgQu&X%Q~loCIDpzN;Uuh diff --git a/assets/values-en/strings.xml b/assets/values-en/strings.xml index a9a63ba..5a8da49 100644 --- a/assets/values-en/strings.xml +++ b/assets/values-en/strings.xml @@ -5,10 +5,10 @@ Help Exit Settings - "Identifier %s is not found" + Identifier %s is not found Enter the card number Phone 79XXXXXXXXX - You can use manual input or call the number:%s + You can use manual input or call the nufluttember:%s Store ID Identifier %s is not found The application is activated diff --git a/assets/values-es/strings.xml b/assets/values-es/strings.xml index 689269b..af000e8 100644 --- a/assets/values-es/strings.xml +++ b/assets/values-es/strings.xml @@ -2,14 +2,14 @@ ID del negocio ID %s no está encontrado Aplicación está activada - Os realmente quiereis acabarse una sesión y dar otro DIN del negocio + ¿Os realmente quiereis acabarse una sesión y dar otro DIN del negocio? El comprador Tarjeta El escaneo de tarjeta Realizar la compra Terminar el registro Terminar la compra - Confirmais la compra por %s %s + ¿Confirmais la compra por %s %s? Confirmacón No La compra por %s %s está realizada @@ -23,7 +23,7 @@ El monto del descuento Puntos de bonificación El bono fue cobrado - Cuántas puntuaciones se cancelan + ¿Cuántas puntuaciones se cancelan? Los cupones fueron canjeados Si no especifica cuántos puntos cancelar, se agregarán puntos Escanear diff --git a/assets/values-ru/strings.xml b/assets/values-ru/strings.xml index 055e639..eb0492c 100644 --- a/assets/values-ru/strings.xml +++ b/assets/values-ru/strings.xml @@ -5,7 +5,7 @@ Справка Закрыть приложение Настройки - "Идентификатор %s не найден" + Идентификатор %s не найден Введите номер карты Телефон 79XXXXXXXXX Можете воспользоваться ручным вводом или позвонить на номер:%s diff --git a/assets/values-ua/strings.xml b/assets/values-ua/strings.xml index ecd0935..590f470 100644 --- a/assets/values-ua/strings.xml +++ b/assets/values-ua/strings.xml @@ -5,7 +5,7 @@ Допомога Закрыть приложение Налаштування - "Ідентифікатор %s не знайден + Ідентифікатор %s не знайден Введіть штрихкод вручну Телефон 79XXXXXXXXX Можете скористатися ручним введенням або зателефонувати на номер:%s diff --git a/lib/resources.dart b/lib/resources.dart index eeb64a0..45bf646 100644 --- a/lib/resources.dart +++ b/lib/resources.dart @@ -7,7 +7,11 @@ class Resources { } static String getSplash(String app) { - return 'assets/${'pip'}_splash.png'; + if (app == 'autobonus') { + return 'assets/${app}_splash.png'; + } else { + return 'assets/dinect_splash.png'; + } } static Color getPrimaryColor(String app) { diff --git a/lib/screens/faq.dart b/lib/screens/faq.dart index 408f736..ede3a0f 100644 --- a/lib/screens/faq.dart +++ b/lib/screens/faq.dart @@ -127,11 +127,7 @@ class FAQScreenState extends BaseState { /// Метод возвращает ListView с блоками faq. @override Widget getScreenContent() { if (data == null) { - return new Container( - decoration: new BoxDecoration( - image: new DecorationImage( - image: new ExactAssetImage(Resources.getSplash(app)), - fit: BoxFit.cover))); + return getBackground(); } else { return new WillPopScope(onWillPop: onWillPop, child: new ListView.builder( itemBuilder: (BuildContext context, int index) => diff --git a/lib/strings.dart b/lib/strings.dart index 3a0fa47..45c9caf 100644 --- a/lib/strings.dart +++ b/lib/strings.dart @@ -13,7 +13,6 @@ class StringsLocalization { var document = xml.parse(await loadStrings(l)); strings.clear(); document.findAllElements('string').forEach((node) { - print("${node.attributes} : ${node.text.toString()}"); strings[node.attributes[0].value] = node.text.toString(); }); return strings;