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

RG-3445 Добавлен ручной ввод кода с карты

Browse Source
This commit is contained in:
Ivan Murashov
2017-09-20 15:35:58 +03:00
parent 8936fd1c01
commit e89b7f4005
12 changed files with 165 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/app/src/main/res/layout/activity_zbar_scanner.xml → android/app/src/main/res/layout/a_zbar.xml
View File

@@ -41,11 +41,7 @@
android:layout_marginTop="56dp"
android:background="#00ff00" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextColor="@android:color/white" />
<include layout="@layout/v_custom_toolbar" />
<View
android:id="@+id/toolbarShadow"

6
android/app/src/main/res/layout/activity_zxing_scanner.xml → android/app/src/main/res/layout/a_zxing.xml
View File

@@ -6,11 +6,7 @@
android:layout_height="match_parent"
android:background="@android:color/white">
<android.support.v7.widget.Toolbar
android:id="@+id/zxingToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextColor="@android:color/white" />
<include layout="@layout/v_custom_toolbar" />
<View
android:id="@+id/zxingToolbarShadow"

21
android/app/src/main/res/layout/v_custom_toolbar.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextColor="@android:color/white">
<EditText
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:id="@+id/manual_input"
android:hint="@string/enter_manual"
android:maxLines="1"
android:inputType="text"
android:imeOptions="actionDone"
android:layout_marginLeft="72dp"
android:textColor="@android:color/white"
android:textColorHint="@android:color/white"/>
</android.support.v7.widget.Toolbar>

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

@@ -1,4 +1,4 @@
<resources>
<resources>
<string name="app_name">AutoBonus</string>
<string name="scanner_title">Сканер карты</string>
<string name="scan">Сканировать</string>
@@ -10,4 +10,5 @@
<string name="logout_yes">Да</string>
<string name="logout_no">Нет</string>
<string name="identifier_not_found">"Идентификатор %s не найден"</string>
<string name="enter_manual">Введите штрихкод вручную</string>
</resources>