Правки по меню, по локали, добавлены Евро и Тенге

This commit is contained in:
Ivan Murashov
2017-09-12 14:07:10 +03:00
parent 8fb84947e5
commit ef7d903144
16 changed files with 130 additions and 63 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -2,16 +2,27 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/faq"
android:orderInCategory="0"
android:title="@string/faq"
android:icon="@drawable/help_outline"
app:showAsAction="ifRoom"/>
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_more_vert"
app:showAsAction="ifRoom">
<item android:id="@+id/logout"
android:orderInCategory="1"
android:title="@string/logout"
android:icon="@drawable/logout"
app:showAsAction="ifRoom"/>
<menu>
<group android:id="@+id/items"/>
<item android:id="@+id/settings"
android:title="@string/settings"
android:icon="@drawable/settings"/>
<item android:id="@+id/faq"
android:title="@string/faq"
android:icon="@drawable/help"/>
<item android:id="@+id/logout"
android:title="@string/logout"
android:icon="@drawable/logout"/>
</menu>
</item>
</menu>

View File

@@ -2,8 +2,9 @@
<string name="app_name">AutoBonus</string>
<string name="scanner_title">Сканер карты</string>
<string name="scan">Сканировать</string>
<string name="faq">FAQ</string>
<string name="faq">Справка</string>
<string name="logout">Выход</string>
<string name="settings">Настройки</string>
<string name="logout_title">Подтверждение</string>
<string name="logout_text">Вы действительно хотите выйти и ввести другой номер магазина?</string>
<string name="logout_yes">Да</string>

View File

@@ -2,8 +2,9 @@
<string name="app_name">AutoBonus</string>
<string name="scanner_title">Сканер карти</string>
<string name="scan">Сканувати</string>
<string name="faq">FAQ</string>
<string name="faq">Допомога</string>
<string name="logout">Вихід</string>
<string name="settings">Налаштування</string>
<string name="logout_title">Підтвердження</string>
<string name="logout_text">Ви дійсно хочете вийти і ввести інший номер магазину?</string>
<string name="logout_yes">Так</string>

View File

@@ -2,8 +2,9 @@
<string name="app_name">AutoBonus</string>
<string name="scanner_title">Card Scanner</string>
<string name="scan">Scan</string>
<string name="faq">FAQ</string>
<string name="faq">Help</string>
<string name="logout">Logout</string>
<string name="settings">Settings</string>
<string name="logout_title">Сonfirmation</string>
<string name="logout_text">Do you really want to log out and enter a different store number?</string>
<string name="logout_yes">Yes</string>

View File

@@ -1,6 +1,8 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar"/>
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:textColorSecondary">@android:color/white</item>
</style>
</resources>