From 5da130e11be09b4babdc0f6c248dc7402e6cd62b Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Thu, 23 Feb 2017 20:02:50 +0300
Subject: [PATCH] fix order

---
 app/build.gradle                       |  8 ++++----
 app/src/main/AndroidManifest.xml       |  2 +-
 app/src/main/res/menu/menu_main.xml    | 10 +++++-----
 app/src/main/res/values-ru/strings.xml |  1 -
 app/src/main/res/values/strings.xml    |  1 -
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a5a8383..d644e64 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,12 +43,12 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.android.support:support-v4:25.1.1'
-    compile 'com.android.support:design:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:support-v4:25.2.0'
+    compile 'com.android.support:design:25.2.0'
     compile 'com.google.android.gms:play-services-appindexing:9.8.0'
     compile 'org.apache.commons:commons-math3:3.6.1'
-    compile 'com.github.axet:android-library:1.9.7' //compile project(':android-library')
+    compile 'com.github.axet:android-library:1.9.9' //compile project(':android-library')
     compile 'com.github.axet:jebml:0.0.2' // compile project(':jebml')
     compile 'com.github.axet:vorbis:1.0.0' // compile project(':vorbis')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0af67e5..50bf023 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
         <activity
             android:name=".activities.MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/title_activity_main"
+            android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:theme="@style/AppThemeLight.NoActionBar">
             <intent-filter>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index e4cb74b..78cc22b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,14 +2,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".activities.MainActivity">
-    <item
-        android:id="@+id/action_show_folder"
-        android:orderInCategory="100"
-        android:title="@string/open_recording_folder"
-        app:showAsAction="never" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_show_folder"
+        android:orderInCategory="100"
+        android:title="@string/open_recording_folder"
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ca3a019..379a7d2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -25,7 +25,6 @@
         <item>Стерео</item>
     </string-array>
 
-    <string name="title_activity_main">Аудио Рекордер</string>
     <string name="action_settings">Настройки</string>
     <string name="not_permitted">Доступ запрещен</string>
     <string name="no_folder_app">Программа для просмотра папок не установлена</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd7f48f..eb7e5e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,7 +49,6 @@
         <item>2</item>
     </string-array>
 
-    <string name="title_activity_main">Audio Recorder</string>
     <string name="action_settings">Settings</string>
     <string name="not_permitted">Not permitted</string>
     <string name="no_folder_app">No folder view application installed</string>