Fixes in localization. Fix splash screen background.

This commit is contained in:
Ivan Murashov
2018-02-13 22:37:17 +03:00
parent db75d2b35f
commit 3359c0abb4
10 changed files with 13 additions and 15 deletions

View File

@@ -130,7 +130,6 @@ public class MainActivity extends FlutterActivity {
Intent cameraIntent = new Intent(MainActivity.this, SCANNER_BACKEND[idx]); Intent cameraIntent = new Intent(MainActivity.this, SCANNER_BACKEND[idx]);
for (Object key : mScannerArgs.keySet()) { for (Object key : mScannerArgs.keySet()) {
Log.d("kifio", "k: " + key + "; v: " + mScannerArgs.get(key).toString());
if (key.equals("color")) { if (key.equals("color")) {
cameraIntent.putExtra((String) key, Long.parseLong((String) mScannerArgs.get(key))); cameraIntent.putExtra((String) key, Long.parseLong((String) mScannerArgs.get(key)));
} else { } else {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 217 B

View File

@@ -5,10 +5,10 @@
<string name="faq">Help</string> <string name="faq">Help</string>
<string name="exit">Exit</string> <string name="exit">Exit</string>
<string name="settings">Settings</string> <string name="settings">Settings</string>
<string name="identifier_not_found">"Identifier %s is not found"</string> <string name="identifier_not_found">Identifier %s is not found</string>
<string name="enter_manual">Enter the card number</string> <string name="enter_manual">Enter the card number</string>
<string name="enter_phone">Phone 79XXXXXXXXX</string> <string name="enter_phone">Phone 79XXXXXXXXX</string>
<string name="error_contact_support">You can use manual input or call the number:%s</string> <string name="error_contact_support">You can use manual input or call the nufluttember:%s</string>
<string name="ID_Store">Store ID</string> <string name="ID_Store">Store ID</string>
<string name="ID_not_found">Identifier %s is not found</string> <string name="ID_not_found">Identifier %s is not found</string>
<string name="app_activ">The application is activated</string> <string name="app_activ">The application is activated</string>

View File

@@ -2,14 +2,14 @@
<string name="ID_Store">ID del negocio</string> <string name="ID_Store">ID del negocio</string>
<string name="ID_not_found">ID %s no está encontrado</string> <string name="ID_not_found">ID %s no está encontrado</string>
<string name="app_activ">Aplicación está activada</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 DIN del negocio</string> <string name="ask_change_store">¿Os realmente quiereis acabarse una sesión y dar otro DIN del negocio?</string>
<string name="buyer">El comprador</string> <string name="buyer">El comprador</string>
<string name="card">Tarjeta</string> <string name="card">Tarjeta</string>
<string name="card_scaner">El escaneo de tarjeta</string> <string name="card_scaner">El escaneo de tarjeta</string>
<string name="carry_purchase">Realizar la compra</string> <string name="carry_purchase">Realizar la compra</string>
<string name="complite_activ">Terminar el registro</string> <string name="complite_activ">Terminar el registro</string>
<string name="complite_purchase">Terminar la compra</string> <string name="complite_purchase">Terminar la compra</string>
<string name="confirm_purchase">Confirmais la compra por %s %s</string> <string name="confirm_purchase">¿Confirmais la compra por %s %s?</string>
<string name="confirmation">Confirmacón</string> <string name="confirmation">Confirmacón</string>
<string name="no">No</string> <string name="no">No</string>
<string name="purchase_complite">La compra por %s %s está realizada</string> <string name="purchase_complite">La compra por %s %s está realizada</string>
@@ -23,7 +23,7 @@
<string name="discount_sum">El monto del descuento</string> <string name="discount_sum">El monto del descuento</string>
<string name="bonus_plus">Puntos de bonificación</string> <string name="bonus_plus">Puntos de bonificación</string>
<string name="bonus_minus">El bono fue cobrado</string> <string name="bonus_minus">El bono fue cobrado</string>
<string name="bonus_hint">Cuántas puntuaciones se cancelan</string> <string name="bonus_hint">¿Cuántas puntuaciones se cancelan?</string>
<string name="coupons_used">Los cupones fueron canjeados</string> <string name="coupons_used">Los cupones fueron canjeados</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 puntos cancelar, se agregarán puntos</string>
<string name="scan">Escanear</string> <string name="scan">Escanear</string>

View File

@@ -5,7 +5,7 @@
<string name="faq">Справка</string> <string name="faq">Справка</string>
<string name="exit">Закрыть приложение</string> <string name="exit">Закрыть приложение</string>
<string name="settings">Настройки</string> <string name="settings">Настройки</string>
<string name="identifier_not_found">"Идентификатор %s не найден"</string> <string name="identifier_not_found">Идентификатор %s не найден</string>
<string name="enter_manual">Введите номер карты</string> <string name="enter_manual">Введите номер карты</string>
<string name="enter_phone">Телефон 79XXXXXXXXX</string> <string name="enter_phone">Телефон 79XXXXXXXXX</string>
<string name="error_contact_support">Можете воспользоваться ручным вводом или позвонить на номер:%s</string> <string name="error_contact_support">Можете воспользоваться ручным вводом или позвонить на номер:%s</string>

View File

@@ -5,7 +5,7 @@
<string name="faq">Допомога</string> <string name="faq">Допомога</string>
<string name="exit">Закрыть приложение</string> <string name="exit">Закрыть приложение</string>
<string name="settings">Налаштування</string> <string name="settings">Налаштування</string>
<string name="identifier_not_found">"Ідентифікатор %s не знайден</string> <string name="identifier_not_found">Ідентифікатор %s не знайден</string>
<string name="enter_manual">Введіть штрихкод вручну</string> <string name="enter_manual">Введіть штрихкод вручну</string>
<string name="enter_phone">Телефон 79XXXXXXXXX</string> <string name="enter_phone">Телефон 79XXXXXXXXX</string>
<string name="error_contact_support">Можете скористатися ручним введенням або зателефонувати на номер:%s</string> <string name="error_contact_support">Можете скористатися ручним введенням або зателефонувати на номер:%s</string>

View File

@@ -7,7 +7,11 @@ class Resources {
} }
static String getSplash(String app) { 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) { static Color getPrimaryColor(String app) {

View File

@@ -127,11 +127,7 @@ class FAQScreenState<T> extends BaseState<FAQScreen> {
/// Метод возвращает ListView с блоками faq. /// Метод возвращает ListView с блоками faq.
@override Widget getScreenContent() { @override Widget getScreenContent() {
if (data == null) { if (data == null) {
return new Container( return getBackground();
decoration: new BoxDecoration(
image: new DecorationImage(
image: new ExactAssetImage(Resources.getSplash(app)),
fit: BoxFit.cover)));
} else { } else {
return new WillPopScope(onWillPop: onWillPop, child: new ListView.builder( return new WillPopScope(onWillPop: onWillPop, child: new ListView.builder(
itemBuilder: (BuildContext context, int index) => itemBuilder: (BuildContext context, int index) =>

View File

@@ -13,7 +13,6 @@ class StringsLocalization {
var document = xml.parse(await loadStrings(l)); var document = xml.parse(await loadStrings(l));
strings.clear(); strings.clear();
document.findAllElements('string').forEach((node) { document.findAllElements('string').forEach((node) {
print("${node.attributes} : ${node.text.toString()}");
strings[node.attributes[0].value] = node.text.toString(); strings[node.attributes[0].value] = node.text.toString();
}); });
return strings; return strings;