From 3fd0b74ed72442f24f0a1be6d2061d379383ee11 Mon Sep 17 00:00:00 2001
From: vtretyakov <devnull@localhost>
Date: Mon, 6 Aug 2018 16:18:34 +0700
Subject: [PATCH] Added Azerbaijan Manat and Uzbekistan Sum

---
 android/app/src/main/AndroidManifest.xml |  4 ++--
 assets/values-en/strings.xml             | 18 +++++++++++++-----
 assets/values-es/strings.xml             |  8 ++++++++
 assets/values-ru/strings.xml             | 14 +++++++++++---
 assets/values-ua/strings.xml             |  8 ++++++++
 build-all-apks                           |  9 ---------
 build-all-apks.bat                       |  8 ++++++++
 lib/screens/currencies.dart              |  6 ++++--
 lib/strings.dart                         | 20 +++++++++++++++++++-
 9 files changed, 73 insertions(+), 22 deletions(-)
 delete mode 100755 build-all-apks
 create mode 100644 build-all-apks.bat

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f281cda..8a64f21 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.dinect.checker"
-          android:versionCode="14"
-          android:versionName="1.1.19">
+          android:versionCode="15"
+          android:versionName="1.1.20">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
diff --git a/assets/values-en/strings.xml b/assets/values-en/strings.xml
index 6c2c373..0c42734 100644
--- a/assets/values-en/strings.xml
+++ b/assets/values-en/strings.xml
@@ -47,11 +47,13 @@
   <string name="logout">Log Out</string>
   <string name="currency">Currency</string>
   <string name="locale">Language</string>
-  <string name="rf_ruble">Russian ruble</string>
-  <string name="usa_dollas">USA dollar</string>
-  <string name="uk_hryvnia">Ukraine hryvna</string>
-  <string name="kz_tenge">Kazakhstan tenge</string>
-  <string name="be_ruble">Belarusian ruble</string>
+  <string name="rf_ruble">Russian Ruble</string>
+  <string name="usa_dollas">USA Dollar</string>
+  <string name="uk_hryvnia">Ukraine Hryvna</string>
+  <string name="kz_tenge">Kazakhstan Tenge</string>
+  <string name="be_ruble">Belarusian Ruble</string>
+  <string name="uz_sum">Uzbekistan Sum</string>
+  <string name="az_manat">Azerbaijan Manat</string>  
   <string name="euro">Euro</string>
   <string name="nominative_ruble">ruble</string>
   <string name="singular_ruble">rubles</string>
@@ -68,6 +70,12 @@
   <string name="nominative_euro">euro</string>
   <string name="singular_euro">euros</string>
   <string name="plural_euro">euros</string>
+  <string name="nominative_sum">sum</string>
+  <string name="singular_sum">sums</string>
+  <string name="plural_sum">sums</string>
+  <string name="nominative_manat">manat</string>
+  <string name="singular_manat">manats</string>
+  <string name="plural_manat">manats</string>
   <string name="user_card_not_found">User with card number %@ not found</string>
   <string name="user_phone_not_found">User with phone number %@ not found</string>
   <string name="error">Error</string>
diff --git a/assets/values-es/strings.xml b/assets/values-es/strings.xml
index 3d702fb..66d4734 100644
--- a/assets/values-es/strings.xml
+++ b/assets/values-es/strings.xml
@@ -52,6 +52,8 @@
   <string name="uk_hryvnia">Ucrania hryvnia</string>
   <string name="kz_tenge">Tenge Kazajstán</string>
   <string name="be_ruble">Rublo bielorruso</string>
+  <string name="uz_sum">Som uzbeko</string>
+  <string name="az_manat">Manat azerbaiyano</string>  
   <string name="euro">Euro</string>
   <string name="nominative_ruble">rublos</string>
   <string name="singular_ruble">rublos</string>
@@ -68,6 +70,12 @@
   <string name="nominative_euro">euro</string>
   <string name="singular_euro">euro</string>
   <string name="plural_euro">euro</string>
+  <string name="nominative_sum">sum</string>
+  <string name="singular_sum">sums</string>
+  <string name="plural_sum">sums</string>
+  <string name="nominative_manat">manat</string>
+  <string name="singular_manat">manat</string>
+  <string name="plural_manat">manat</string>
   <string name="user_card_not_found">Usuario con número de tarjeta %@ no está encontrado</string>
   <string name="user_phone_not_found">Usuario con número de teiéfono  %@ no está encontrado</string>
   <string name="error">Error</string>
diff --git a/assets/values-ru/strings.xml b/assets/values-ru/strings.xml
index 107d951..1c588a5 100644
--- a/assets/values-ru/strings.xml
+++ b/assets/values-ru/strings.xml
@@ -48,10 +48,12 @@
   <string name="currency">Валюта</string>
   <string name="locale">Язык</string>
   <string name="rf_ruble">Российский рубль</string>
-  <string name="usa_dollas">Доллар США</string>
+  <string name="usa_dollas">США доллар</string>
   <string name="uk_hryvnia">Украинская гривна</string>
-  <string name="kz_tenge">Казахский тенге</string>
+  <string name="kz_tenge">Казахстанский тенге</string>
   <string name="be_ruble">Белорусский рубль</string>
+  <string name="uz_sum">Узбекский сум</string>
+  <string name="az_manat">Азербайджанский манат</string>  
   <string name="euro">Евро</string>
   <string name="nominative_ruble">рубль</string>
   <string name="singular_ruble">рубля</string>
@@ -68,6 +70,12 @@
   <string name="nominative_euro">евро</string>
   <string name="singular_euro">евро</string>
   <string name="plural_euro">евро</string>
+  <string name="nominative_sum">сум</string>
+  <string name="singular_sum">сумы</string>
+  <string name="plural_sum">сумм</string>
+  <string name="nominative_manat">манат</string>
+  <string name="singular_manat">маната</string>
+  <string name="plural_manat">манатов</string>
   <string name="user_card_not_found">Пользователь с номером карты %@ не найден</string>
   <string name="user_phone_not_found">Пользователь с номером телефона %@ не найден</string>
   <string name="error">Ошибка</string>
@@ -126,6 +134,6 @@
 На странице приложения выберите Разрешения.
 Включите камеру
 Вернитесь к приложению %s.
-</string>
+  </string>
   <string name="open_settings">Открыть настройки</string>
 </resources>
diff --git a/assets/values-ua/strings.xml b/assets/values-ua/strings.xml
index c19ae44..298b888 100644
--- a/assets/values-ua/strings.xml
+++ b/assets/values-ua/strings.xml
@@ -52,6 +52,8 @@
   <string name="uk_hryvnia">Українська гривня</string>
   <string name="kz_tenge">Казахстанський тенге</string>
   <string name="be_ruble">Білоруський рубль</string>
+  <string name="uz_sum">Узбецький сом</string>
+  <string name="az_manat">Азербайджанський манат</string>  
   <string name="euro">Євро</string>
   <string name="nominative_ruble">рубль</string>
   <string name="singular_ruble">рубля</string>
@@ -68,6 +70,12 @@
   <string name="nominative_euro">євро</string>
   <string name="singular_euro">євро</string>
   <string name="plural_euro">євро</string>
+  <string name="nominative_sum">сума</string>
+  <string name="singular_sum">сума</string>
+  <string name="plural_sum">суми</string>
+  <string name="nominative_manat">манат</string>
+  <string name="singular_manat">манат</string>
+  <string name="plural_manat">манат</string>
   <string name="user_card_not_found">Користувач з номером карти %@ не знайдено</string>
   <string name="user_phone_not_found">Користувач з номером телефону %@ не знайдено</string>
   <string name="error">Помылка</string>
diff --git a/build-all-apks b/build-all-apks
deleted file mode 100755
index 310b5f8..0000000
--- a/build-all-apks
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-
-flutter clean
-flutter build apk --flavor autobonus
-flutter build apk --flavor crypto
-flutter build apk --flavor dinect
-flutter build apk --flavor dinect_INT
-flutter build apk --flavor dinect_OTE
-flutter build apk --flavor biohacker
diff --git a/build-all-apks.bat b/build-all-apks.bat
new file mode 100644
index 0000000..89b72f9
--- /dev/null
+++ b/build-all-apks.bat
@@ -0,0 +1,8 @@
+echo on
+call flutter clean
+call flutter build apk --flavor autobonus
+call flutter build apk --flavor crypto
+call flutter build apk --flavor dinect
+call flutter build apk --flavor dinect_INT
+call flutter build apk --flavor dinect_OTE
+call flutter build apk --flavor biohacker
diff --git a/lib/screens/currencies.dart b/lib/screens/currencies.dart
index 2efe4db..53587ff 100644
--- a/lib/screens/currencies.dart
+++ b/lib/screens/currencies.dart
@@ -13,7 +13,7 @@ class CurrenciesScreen extends BaseScreen {
 
 class _CurrenciesState extends SettingsBaseState<CurrenciesScreen> {
 
-  List<int> currencies = const [643, 840, 980, 978, 398, 933];
+  List<int> currencies = const [643, 840, 980, 978, 398, 933, 860, 944];
 
   _CurrenciesState(SqliteHelper helper, String app) : super(helper, app);
 
@@ -28,8 +28,10 @@ class _CurrenciesState extends SettingsBaseState<CurrenciesScreen> {
     String euro = StringsLocalization.euro();
     String tenge = StringsLocalization.kztenge();
     String belrub = StringsLocalization.beruble();
+    String uzbsum = StringsLocalization.uzbsum();
+    String azbman = StringsLocalization.azbman();
 
-    return [ruble, dollar, hryvna, euro, tenge, belrub];
+    return [ruble, dollar, hryvna, euro, tenge, belrub, uzbsum, azbman];
   }
 
   @override
diff --git a/lib/strings.dart b/lib/strings.dart
index 5336a96..a533190 100644
--- a/lib/strings.dart
+++ b/lib/strings.dart
@@ -75,7 +75,17 @@ class StringsLocalization {
         nominative = nominativeRuble();
         singular = singularRuble();
         plural = pluralRuble();
-        break;	
+        break;
+      case 840:
+        nominative = nominativeSum();
+        singular = singularSum();
+        plural = pluralSum();
+        break;
+      case 944:
+        nominative = nominativeManat();
+        singular = singularManat();
+        plural = pluralManat();
+        break;		
     }
 
     return [nominative, singular, plural];
@@ -137,6 +147,8 @@ class StringsLocalization {
   static String euro() => strings['euro'];
   static String kztenge() => strings['kz_tenge'];
   static String beruble() => strings['be_ruble'];
+  static String uzbsum() => strings['uz_sum'];  
+  static String azbman() => strings['az_manat'];  
   static String nominativeRuble() => strings['nominative_ruble'];
   static String singularRuble() => strings['singular_ruble'];
   static String pluralRuble() => strings['plural_ruble'];
@@ -152,6 +164,12 @@ class StringsLocalization {
   static String nominativeTenge() => strings['nominative_tenge'];
   static String singularTenge() => strings['singular_tenge'];
   static String pluralTenge() => strings['plural_tenge'];
+  static String nominativeSum() => strings['nominative_sum'];
+  static String singularSum() => strings['singular_sum'];
+  static String pluralSum() => strings['plural_sum'];
+  static String nominativeManat() => strings['nominative_manat'];
+  static String singularManat() => strings['singular_manat'];
+  static String pluralManat() => strings['plural_manat'];
   static String registrationGuide() => strings['registration_guide'];
   static String usageGuide() => strings['usage_guide'];
   static String commonGuide() => strings['common_guide'].replaceAll('\n', "\n");