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

android/app/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Black.NoTitleBar"
+            android:theme="@android:style/Theme.Light.NoTitleBar"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

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

@@ -27,7 +27,6 @@ import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
@@ -38,6 +37,7 @@ import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 import android.widget.TextView;
+import android.support.v7.widget.Toolbar;
 
 import com.dinect.checker.net.ApiClient;
 
@@ -45,6 +45,8 @@ import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static android.app.Activity.RESULT_OK;
+
 
 /**
  * Created by anonymous
@@ -297,9 +299,23 @@ public abstract class AbstractScannerActivity extends AppCompatActivity {
         return true;
     }
 
+    @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.logout).setIcon(getResources().getDrawable(R.drawable.logout));
+        return super.onPrepareOptionsMenu(menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.logout) {
+        if (item.getItemId() == R.id.settings) {
+            final Intent intent = new Intent();
+            intent.putExtra("item", "settings");
+            setResult(RESULT_OK, intent);
+            finish();
+            return true;
+        } else if (item.getItemId() == R.id.logout) {
             logoutDialog = LogoutDialogFragment.newInstance(mColor);
             logoutDialog.show(getFragmentManager(), "logout");
             return true;

android/app/src/main/res/menu/menu.xml

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

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

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

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

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

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

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

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

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