Remove i18n package. Add xml files with strings to flutter assets. Create method for passing localized strings to channel.

2018-02-07 00:28:47 +03:00
parent 8c4287a21b
commit c15108fda9
40 changed files with 600 additions and 930 deletions
--- a/android/app/src/autobonus/res/values-ru/strings.xml
+++ b/android/app/src/autobonus/res/values-ru/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">AutoBonus</string>
-</resources>
--- a/android/app/src/autobonus/res/values-ua/strings.xml
+++ b/android/app/src/autobonus/res/values-ua/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">AutoBonus</string>
-</resources>
--- a/android/app/src/crypto/res/values-ru/strings.xml
+++ b/android/app/src/crypto/res/values-ru/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect Crypto</string>
-</resources>
--- a/android/app/src/crypto/res/values-ua/strings.xml
+++ b/android/app/src/crypto/res/values-ua/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect Crypto</string>
-</resources>
--- a/android/app/src/dinect_INT/res/values-ru/strings.xml
+++ b/android/app/src/dinect_INT/res/values-ru/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (INT)</string>
-</resources>
--- a/android/app/src/dinect_INT/res/values-ua/strings.xml
+++ b/android/app/src/dinect_INT/res/values-ua/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (INT)</string>
-</resources>
--- a/android/app/src/dinect_OTE/res/values-ru/strings.xml
+++ b/android/app/src/dinect_OTE/res/values-ru/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (OTE)</string>
-</resources>
--- a/android/app/src/dinect_OTE/res/values-ua/strings.xml
+++ b/android/app/src/dinect_OTE/res/values-ua/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (OTE)</string>
-</resources>
--- a/android/app/src/dinect_STAGING/res/values-ru/strings.xml
+++ b/android/app/src/dinect_STAGING/res/values-ru/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (STAGING)</string>
-</resources>
--- a/android/app/src/dinect_STAGING/res/values-ua/strings.xml
+++ b/android/app/src/dinect_STAGING/res/values-ua/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (STAGING)</string>
-</resources>
--- a/android/app/src/dinect_TESTING/res/values-ru/strings.xml
+++ b/android/app/src/dinect_TESTING/res/values-ru/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (TESTING)</string>
-</resources>
--- a/android/app/src/dinect_TESTING/res/values-ua/strings.xml
+++ b/android/app/src/dinect_TESTING/res/values-ua/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Dinect (TESTING)</string>
-</resources>
--- a/android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
@@ -154,10 +154,10 @@ public abstract class AbstractScannerActivity extends AppCompatActivity  impleme
    EditText manualInput = (EditText) findViewById(R.id.manual_input);
    switch (searchType) {
      case CARD:
-        manualInput.setHint(getResources().getString(R.string.enter_manual));
+        manualInput.setHint(getIntent().getStringExtra("enter_manual"));
        break;
      case PHONE_NUMBER:
-        manualInput.setHint(getResources().getString(R.string.enter_phone));
+        manualInput.setHint(getIntent().getStringExtra("enter_phone"));
        break;
    }
  }
@@ -268,9 +268,9 @@ public abstract class AbstractScannerActivity extends AppCompatActivity  impleme
    runOnUiThread(new Runnable() {
      @Override
      public void run() {
-        String message = String.format(getString(R.string.identifier_not_found), searchString)
+        String message = String.format(getIntent().getStringExtra("identifier_not_found"), searchString)
          + ".\n"
-          + String.format(getString(R.string.error_contact_support), BuildConfig.supportPhone);
+          + String.format(getIntent().getStringExtra("error_contact_support"), BuildConfig.supportPhone);
        Toast.makeText(AbstractScannerActivity.this, message, Toast.LENGTH_SHORT).show();
      }
    });
@@ -284,9 +284,19 @@ public abstract class AbstractScannerActivity extends AppCompatActivity  impleme

  @Override
  public boolean onPrepareOptionsMenu(Menu menu) {
-    menu.findItem(R.id.settings).setIcon(getResources().getDrawable(R.drawable.settings));
-    menu.findItem(R.id.faq).setIcon(getResources().getDrawable(R.drawable.help));
-    menu.findItem(R.id.exit).setIcon(getResources().getDrawable(R.drawable.exit));
+
+    MenuItem settings = menu.findItem(R.id.settings);
+    settings.setIcon(getResources().getDrawable(R.drawable.settings));
+    settings.setTitle(getIntent().getStringExtra("settings"));
+
+    MenuItem faq = menu.findItem(R.id.faq);
+    faq.setIcon(getResources().getDrawable(R.drawable.help));
+    faq.setTitle(getIntent().getStringExtra("faq"));
+
+    MenuItem exit = menu.findItem(R.id.exit);
+    exit.setIcon(getResources().getDrawable(R.drawable.exit));
+    exit.setTitle(getIntent().getStringExtra("exit"));
+
    return super.onPrepareOptionsMenu(menu);
  }

--- a/android/app/src/main/java/com/dinect/checker/MainActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/MainActivity.java
@@ -22,10 +22,11 @@ public class MainActivity extends FlutterActivity {
    private static final int START_SCANNER_REQUEST_CODE = 2017;
    private static final String FLUTTER_CHANNEL_NAME = "com.dinect.checker/instance_id";

-    static final String PREF_API_URL = "prefs_api_token";
-    static final String PREF_APP_TOKEN = "pres_app_token";
-    static final String PREF_POS_TOKEN = "pref_pos_token";
-    static final String PREF_APP_BAR_COLOR = "pref_app_bar_color";
+    static final String PREF_API_URL = "url";
+    static final String PREF_APP_TOKEN = "appToken";
+    static final String PREF_POS_TOKEN = "token";
+    static final String PREF_APP_BAR_COLOR = "color";
+
    static final String SCANNER_BACKEND_KEY = "scanner_backend_idx";

    static final int ZXING = 0;
@@ -66,7 +67,6 @@ public class MainActivity extends FlutterActivity {
                break;
            case "startScanner":
                mScannerArgs = call.arguments();
-                System.out.println(mScannerArgs.toString());
                startScannerActivity();
                break;
            case "isOnline":
@@ -128,10 +128,16 @@ public class MainActivity extends FlutterActivity {
    private void startScannerActivity() {
        final int idx = getSharedPreferences("scanner", Context.MODE_PRIVATE).getInt(SCANNER_BACKEND_KEY, 0);
        Intent cameraIntent = new Intent(MainActivity.this, SCANNER_BACKEND[idx]);
-        cameraIntent.putExtra(PREF_API_URL, (String) mScannerArgs.get("url"));
-        cameraIntent.putExtra(PREF_APP_TOKEN, (String) mScannerArgs.get("appToken"));
-        cameraIntent.putExtra(PREF_POS_TOKEN, (String) mScannerArgs.get("token"));
-        cameraIntent.putExtra(PREF_APP_BAR_COLOR, (Long) mScannerArgs.get("color"));
+
+        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 {
+            cameraIntent.putExtra((String) key, (String) mScannerArgs.get(key));
+          }
+        }
+
        setLocale((String) mScannerArgs.get("locale"));
        startActivityForResult(cameraIntent, START_SCANNER_REQUEST_CODE);
    }
@@ -206,4 +212,8 @@ public class MainActivity extends FlutterActivity {
    public void getAppToken() {

    }
+
+    public void setStrings() {
+
+    }
 }
--- a/android/app/src/main/res/layout/v_custom_toolbar.xml
+++ b/android/app/src/main/res/layout/v_custom_toolbar.xml
@@ -14,18 +14,16 @@
    android:id="@+id/cardPhoneButton"
    android:layout_width="wrap_content"
    android:layout_marginRight="12dp"
-    android:layout_height="wrap_content"
-  />
+    android:layout_height="wrap_content" />

  <EditText
    android:id="@+id/manual_input"
    android:layout_width="match_parent"
    android:layout_height="?attr/actionBarSize"
-    android:hint="@string/enter_manual"
    android:imeOptions="actionDone"
    android:inputType="text"
    android:maxLines="1"
    android:textColor="@android:color/white"
-    android:textColorHint="@android:color/white"/>
+    android:textColorHint="@android:color/white" />

 </android.support.v7.widget.Toolbar>
--- a/android/app/src/main/res/menu/menu.xml
+++ b/android/app/src/main/res/menu/menu.xml
@@ -12,15 +12,15 @@
            <group android:id="@+id/items"/>

            <item android:id="@+id/settings"
-                  android:title="@string/settings"
+                  android:title="@null"
                  android:icon="@drawable/settings"/>

            <item android:id="@+id/faq"
-                  android:title="@string/faq"
+                  android:title="@null"
                  android:icon="@drawable/help"/>

            <item android:id="@+id/exit"
-                  android:title="@string/exit"
+                  android:title="@null"
                  android:icon="@drawable/exit"/>

        </menu>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -1,12 +0,0 @@
-<resources>
-    <string name="app_name">Dinect</string>
-    <string name="scanner_title">Сканер карты</string>
-    <string name="scan">Сканировать</string>
-    <string name="faq">Справка</string>
-    <string name="exit">Закрыть приложение</string>
-    <string name="settings">Настройки</string>
-    <string name="identifier_not_found">"Идентификатор %s не найден"</string>
-    <string name="enter_manual">Введите номер карты</string>
-    <string name="enter_phone">Телефон 79XXXXXXXXX</string>
-    <string name="error_contact_support">Можете воспользоваться ручным вводом или позвонить на номер:%s</string>
-</resources>
--- a/android/app/src/main/res/values-ua/strings.xml
+++ b/android/app/src/main/res/values-ua/strings.xml
@@ -1,12 +0,0 @@
-<resources>
-    <string name="app_name">Dinect</string>
-    <string name="scanner_title">Сканер карти</string>
-    <string name="scan">Сканувати</string>
-    <string name="faq">Допомога</string>
-    <string name="exit">Закрыть приложение</string>
-    <string name="settings">Налаштування</string>
-    <string name="identifier_not_found">"Ідентифікатор %s не знайден"</string>
-    <string name="enter_manual">Введіть штрихкод вручну</string>
-    <string name="enter_phone">Телефон 79XXXXXXXXX</string>
-    <string name="error_contact_support">Можете скористатися ручним введенням або зателефонувати на номер:\n%s</string>
-</resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,12 +1,3 @@
 <resources>
    <string name="app_name">Dinect</string>
-    <string name="scanner_title">Card Scanner</string>
-    <string name="scan">Scan</string>
-    <string name="faq">Help</string>
-    <string name="exit">Exit</string>
-    <string name="settings">Settings</string>
-    <string name="identifier_not_found">"Identifier %s is not found"</string>
-    <string name="enter_manual">Enter the card number</string>
-    <string name="enter_phone">Phone 79XXXXXXXXX</string>
-    <string name="error_contact_support">You can use manual input or call the number:\n%s</string>
 </resources>
--- a/android/app/src/pip/res/values-ru/strings.xml
+++ b/android/app/src/pip/res/values-ru/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">PIP</string>
-</resources>
--- a/android/app/src/pip/res/values-ua/strings.xml
+++ b/android/app/src/pip/res/values-ua/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">PIP</string>
-</resources>