tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes to default branch

Browse Source 
Hg: changed android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
This commit is contained in:
Ivan Murashov
2018-02-12 08:06:50 +03:00
parent c14b39a04a 90bf053c7e
commit 36c2270f3e
83 changed files with 1035 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/autobonus/res/values-ru/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">AutoBonus</string>
</resources>

3
android/app/src/autobonus/res/values-ua/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">AutoBonus</string>
</resources>

3
android/app/src/crypto/res/values-ru/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect Crypto</string>
</resources>

3
android/app/src/crypto/res/values-ua/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect Crypto</string>
</resources>

3
android/app/src/dinect_INT/res/values-ru/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (INT)</string>
</resources>

3
android/app/src/dinect_INT/res/values-ua/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (INT)</string>
</resources>

3
android/app/src/dinect_OTE/res/values-ru/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (OTE)</string>
</resources>

3
android/app/src/dinect_OTE/res/values-ua/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (OTE)</string>
</resources>

3
android/app/src/dinect_STAGING/res/values-ru/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (STAGING)</string>
</resources>

3
android/app/src/dinect_STAGING/res/values-ua/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (STAGING)</string>
</resources>

3
android/app/src/dinect_TESTING/res/values-ru/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (TESTING)</string>
</resources>

3
android/app/src/dinect_TESTING/res/values-ua/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Dinect (TESTING)</string>
</resources>

4
android/app/src/main/AndroidManifest.xml
View File

@@ -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="3"
android:versionName="1.1.5">
android:versionCode="5"
android:versionName="1.1.7">
<uses-sdk
android:minSdkVersion="16"

24
android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
View File

@@ -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);
}

30
android/app/src/main/java/com/dinect/checker/MainActivity.java
View File

@@ -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,11 +128,17 @@ 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"));
setLocale((String) mScannerArgs.get("locale"));
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("localeCode"));
startActivityForResult(cameraIntent, START_SCANNER_REQUEST_CODE);
}
@@ -206,4 +212,8 @@ public class MainActivity extends FlutterActivity {
public void getAppToken() {
}
public void setStrings() {
}
}

14
android/app/src/main/java/com/kifio/checker/checker/MainActivity.java Normal file
View File

@@ -0,0 +1,14 @@
package com.kifio.checker.checker;
import android.os.Bundle;
import io.flutter.app.FlutterActivity;
import io.flutter.plugins.GeneratedPluginRegistrant;
public class MainActivity extends FlutterActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
GeneratedPluginRegistrant.registerWith(this);
}
}

12
android/app/src/main/res/drawable/launch_background.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" />
<!-- You can insert your own image assets here -->
<!-- <item>
<bitmap
android:gravity="center"
android:src="@mipmap/launch_image" />
</item> -->
</layer-list>

60
android/app/src/main/res/layout/f_logout_dialog.xml
View File

@@ -1,60 +0,0 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="16dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|left"
android:text="@string/logout_title"
android:textColor="@android:color/black"
android:textSize="18sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="16dp"
android:fontFamily="sans-serif-light"
android:scaleType="center"
android:text="@string/logout_text"
android:textColor="@android:color/black"
android:textSize="18sp" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp">
<TextView
android:id="@+id/positiveButton"
android:layout_width="56dp"
android:layout_height="42dp"
android:layout_gravity="right|end"
android:fontFamily="sans-serif-medium"
android:scaleType="center"
android:text="@string/logout_yes"
android:textColor="#eb0004"
android:textSize="14sp" />
<TextView
android:id="@+id/negativeButton"
android:layout_width="56dp"
android:layout_height="42dp"
android:layout_gravity="right|end"
android:layout_marginRight="64dp"
android:fontFamily="sans-serif-medium"
android:text="@string/logout_no"
android:textColor="#eb0004"
android:textSize="14sp" />
</FrameLayout>
</LinearLayout>

6
android/app/src/main/res/layout/v_custom_toolbar.xml
View File

@@ -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>

6
android/app/src/main/res/menu/menu.xml
View File

@@ -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>

12
android/app/src/main/res/values-ru/strings.xml
View File

@@ -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>

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

@@ -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>

9
android/app/src/main/res/values/strings.xml
View File

@@ -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>

3
android/app/src/pip/res/values-ru/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">PIP</string>
</resources>

3
android/app/src/pip/res/values-ua/strings.xml
View File

@@ -1,3 +0,0 @@
<resources>
<string name="app_name">PIP</string>
</resources>