diff --git a/android/app/src/pip/AndroidManifest.xml b/android/app/src/pip/AndroidManifest.xml
deleted file mode 100644
index cda80be..0000000
--- a/android/app/src/pip/AndroidManifest.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android/app/src/pip/ic_launcher-web.png b/android/app/src/pip/ic_launcher-web.png
deleted file mode 100644
index fd2adeb..0000000
Binary files a/android/app/src/pip/ic_launcher-web.png and /dev/null differ
diff --git a/lib/consts.dart b/lib/consts.dart
index 79f3f2e..7f3203e 100644
--- a/lib/consts.dart
+++ b/lib/consts.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
// Serious constants
-const String appName = "AutoBonus";
+const String appName = "PIP";
const String url = 'https://pos-api-int.dinect.com/20130701/';
const String appToken = '9fec83cdca38c357e6b65dbb17514cdd36bf2a08';
diff --git a/lib/i18n/messages_ru.dart b/lib/i18n/messages_ru.dart
index e3bb563..30bde3e 100644
--- a/lib/i18n/messages_ru.dart
+++ b/lib/i18n/messages_ru.dart
@@ -47,9 +47,9 @@ class MessageLookup extends MessageLookupByLibrary {
"nominative_ruble": MessageLookupByLibrary.simpleMessage("Рубль"),
"singular_ruble": MessageLookupByLibrary.simpleMessage("Рубля"),
"plural_ruble": MessageLookupByLibrary.simpleMessage("Рублей"),
- "nominative_dollar": MessageLookupByLibrary.simpleMessage("Доллар"),
- "singular_dollar": MessageLookupByLibrary.simpleMessage("Доллара"),
- "plural_dollar": MessageLookupByLibrary.simpleMessage("Долларов"),
+ "nominative_dollar": MessageLookupByLibrary.simpleMessage("Доллар США"),
+ "singular_dollar": MessageLookupByLibrary.simpleMessage("Доллара США"),
+ "plural_dollar": MessageLookupByLibrary.simpleMessage("Долларов США"),
"nominative_hryvna": MessageLookupByLibrary.simpleMessage("Гривна"),
"singular_hryvna": MessageLookupByLibrary.simpleMessage("Гривны"),
"plural_hryvna": MessageLookupByLibrary.simpleMessage("Гривен"),
diff --git a/lib/i18n/messages_ua.dart b/lib/i18n/messages_ua.dart
index ad367c1..53ccfa3 100644
--- a/lib/i18n/messages_ua.dart
+++ b/lib/i18n/messages_ua.dart
@@ -25,10 +25,10 @@ class MessageLookup extends MessageLookupByLibrary {
"carry_purchase" : MessageLookupByLibrary.simpleMessage("Проведення покупки"),
"complite_activ" : MessageLookupByLibrary.simpleMessage("Завершити реєстрацію"),
"complite_purchase" : MessageLookupByLibrary.simpleMessage("Завершити купівлю"),
- "confirm_purchase" : MessageLookupByLibrary.simpleMessage("Ви підтверджуєте покупку на %s гривень"),
+ "confirm_purchase" : MessageLookupByLibrary.simpleMessage("Ви підтверджуєте покупку на %s %s"),
"confirmation" : MessageLookupByLibrary.simpleMessage("Підтвердження"),
"no" : MessageLookupByLibrary.simpleMessage("Ні"),
- "purchase_complite" : MessageLookupByLibrary.simpleMessage("Купівля на суму %s гривень проведена"),
+ "purchase_complite" : MessageLookupByLibrary.simpleMessage("Купівля на суму %s %s проведена"),
"registration" : MessageLookupByLibrary.simpleMessage("Реєстрація"),
"request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("Запит на активацію додатку відправлений, дочекайтеся підтвердження активації адміністратором"),
"reward" : MessageLookupByLibrary.simpleMessage("Винагорода"),
@@ -44,8 +44,20 @@ class MessageLookup extends MessageLookupByLibrary {
"logout" : MessageLookupByLibrary.simpleMessage("Вихід"),
"currency" : MessageLookupByLibrary.simpleMessage("Валюта"),
"locale" : MessageLookupByLibrary.simpleMessage("Мова"),
- "ruble" : MessageLookupByLibrary.simpleMessage("Ruble"),
- "dollar" : MessageLookupByLibrary.simpleMessage("Dollar"),
- "hryvna" : MessageLookupByLibrary.simpleMessage("Hryvna")
+ "nominative_ruble": MessageLookupByLibrary.simpleMessage("Рубль"),
+ "singular_ruble": MessageLookupByLibrary.simpleMessage("Рубль"),
+ "plural_ruble": MessageLookupByLibrary.simpleMessage("Рубль"),
+ "nominative_dollar": MessageLookupByLibrary.simpleMessage("Доллар США"),
+ "singular_dollar": MessageLookupByLibrary.simpleMessage("Доллар США"),
+ "plural_dollar": MessageLookupByLibrary.simpleMessage("Доллар США"),
+ "nominative_hryvna": MessageLookupByLibrary.simpleMessage("Гривня"),
+ "singular_hryvna": MessageLookupByLibrary.simpleMessage("Гривня"),
+ "plural_hryvna": MessageLookupByLibrary.simpleMessage("Гривня"),
+ "nominative_tenge": MessageLookupByLibrary.simpleMessage("Тенге"),
+ "singular_tenge": MessageLookupByLibrary.simpleMessage("Тенге"),
+ "plural_tenge": MessageLookupByLibrary.simpleMessage("Тенге"),
+ "nominative_euro": MessageLookupByLibrary.simpleMessage("Євро"),
+ "singular_euro": MessageLookupByLibrary.simpleMessage("Євро"),
+ "plural_euro": MessageLookupByLibrary.simpleMessage("Євро")
};
}
diff --git a/lib/main.dart b/lib/main.dart
index 8c81152..53fbbca 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -7,6 +7,7 @@ void main() {
runApp(new Checker());
}
+// TODO: Запрашивать appName у платформы
class Checker extends StatelessWidget {
@override Widget build(BuildContext context) {
return new MaterialApp(
diff --git a/lib/screens/currencies.dart b/lib/screens/currencies.dart
index 83b5b9a..16c4986 100644
--- a/lib/screens/currencies.dart
+++ b/lib/screens/currencies.dart
@@ -48,6 +48,7 @@ class _CurrenciesState extends SettingsBaseState {
@override
saveOption() async {
+ print(currencies[selectedItem]);
await helper.saveCurrency(currencies[selectedItem]);
}
}
\ No newline at end of file
diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart
index df7d04d..5f00967 100644
--- a/lib/screens/purchase.dart
+++ b/lib/screens/purchase.dart
@@ -192,6 +192,7 @@ class PurchaseScreenState extends BaseState {
onPurchaseClick() {
String val = _parseSum(controller.text);
helper.getCurrency().then((currency) {
+ print(currency.toString());
showDialog(context: context, child: new AlertDialog(
title: new Text(StringsLocalization.confirmation()),
content: new Text(StringsLocalization.confirmPurchase(val, currency)),
diff --git a/lib/strings.dart b/lib/strings.dart
index 464968e..23df707 100644
--- a/lib/strings.dart
+++ b/lib/strings.dart
@@ -51,9 +51,9 @@ class StringsLocalization {
plural = pluralHryvna();
break;
case 978:
- nominative = nominativeHryvna();
- singular = singularHryvna();
- plural = pluralHryvna();
+ nominative = nominativeEuro();
+ singular = singularEuro();
+ plural = pluralEuro();
break;
case 398:
nominative = nominativeTenge();