RG-3444

android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java

@@ -238,7 +238,7 @@ public abstract class AbstractScannerActivity extends AppCompatActivity {
             public void run() {
                 String message = String.format(getString(R.string.identifier_not_found), card)
                         + ".\n"
-                        + String.format(getString(R.string.error_contact_support), BuildConfig.support);
+                        + String.format(getString(R.string.error_contact_support), BuildConfig.supportPhone);
                 Toast.makeText(AbstractScannerActivity.this, message, Toast.LENGTH_SHORT).show();
             }
         });

android/app/src/main/java/com/dinect/checker/MainActivity.java

@@ -53,7 +53,6 @@ public class MainActivity extends FlutterActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         GeneratedPluginRegistrant.registerWith(this);
-        initLocale(this);
         mChannel = new MethodChannel(getFlutterView(), "com.dinect.checker/instance_id");
         mChannel.setMethodCallHandler(
                 new MethodCallHandler() {
@@ -67,7 +66,7 @@ public class MainActivity extends FlutterActivity {
     private void callMethod(MethodCall call, Result result) {
         switch (call.method) {
             case "getLocale":
-                result.success(BuildConfig.locale);
+                result.success(Locale.getDefault().getLanguage());
                 break;
             case "getFlavor":
                 result.success(BuildConfig.flavor);
@@ -82,6 +81,12 @@ public class MainActivity extends FlutterActivity {
             case "isOnline":
                 checkInternetConnection(result);
                 break;
+            case "getSupportPhone":
+                result.success(BuildConfig.supportPhone);
+                break;
+            case "getSupportUrl":
+                result.success(BuildConfig.supportUrl);
+                break;
             default:
                 result.notImplemented();
                 break;
@@ -133,28 +138,6 @@ public class MainActivity extends FlutterActivity {
         }
     }
 
-    public static void initLocale(Context context) {
-        Resources res = context.getResources();
-        Configuration configuration = new Configuration(res.getConfiguration());
-        switch (BuildConfig.locale) {
-            case "en":
-                configuration.locale = new Locale("en");
-                Locale.setDefault(configuration.locale);
-                res.updateConfiguration(configuration, res.getDisplayMetrics());
-                break;
-            case "ru":
-                configuration.locale = new Locale("ru");
-                Locale.setDefault(configuration.locale);
-                res.updateConfiguration(configuration, res.getDisplayMetrics());
-                break;
-            case "ua":
-                configuration.locale = new Locale("ua");
-                Locale.setDefault(configuration.locale);
-                res.updateConfiguration(configuration, res.getDisplayMetrics());
-                break;
-        }
-    }
-
     public void getFlavor() {
 
     }
@@ -175,4 +158,12 @@ public class MainActivity extends FlutterActivity {
 
     }
 
+    public void getSupportPhone() {
+
+    }
+
+    public void getSupportUrl() {
+
+    }
+
 }

android/app/src/main/res/values-ua/strings.xml

@@ -11,5 +11,5 @@
     <string name="logout_no">Ні</string>
     <string name="identifier_not_found">"Ідентифікатор %s не знайден"</string>
     <string name="enter_manual">Введіть штрихкод вручну</string>
-    <string name="error_contact_support">Можете воспользоваться ручным вводом или позвонить на номер:\n%s</string>
+    <string name="error_contact_support">Можете скористатися ручним введенням або зателефонувати на номер:\n%s</string>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -11,5 +11,5 @@
     <string name="logout_no">No</string>
     <string name="identifier_not_found">"Identifier %s is not found"</string>
     <string name="enter_manual">Enter the barcode manually</string>
-    <string name="error_contact_support">Можете воспользоваться ручным вводом или позвонить на номер:\n%s</string>
+    <string name="error_contact_support">You can use manual input or call the number:\n%s</string>
 </resources>