Fixed problem with showing menu button (issue #693)

meefik · Aug 8, 2017 · 867e7b5 · 867e7b5
1 parent 8390855
commit 867e7b5
Show file tree

Hide file tree

Showing 39 changed files with 77 additions and 52 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,6 +7,7 @@ Fixed Arch Linux bootstrap (+libnghttp2, -xorg-utils)
 Fixed issue of launching Xfce and Mate (issue #807)
 Added file system check (issue #785)
 Added custom target type
+Fixed problem with showing menu button (issue #693)
 
 2.0.1
 Added Fedora 25 (issue #683)
@@ -376,6 +377,7 @@ Updated list packages of base system installation
 Исправлена проблема запуска Xfce и Mate (тикет #807)
 Добавлена проверка файловой системы (тикет #785)
 Добавлен пользовательский тип установки
+Исправлена проблема с отображением кнопки меню (тикет #693)
 
 2.0.1
 Добавлена поддержка Fedora 25 (тикет #683)

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         applicationId 'ru.meefik.linuxdeploy'
         minSdkVersion 10
         targetSdkVersion 25
-        versionCode 223
+        versionCode 224
         versionName "2.0.2"
     }
     buildTypes {

diff --git a/app/src/main/res/drawable-hdpi/ic_action_more_dark.png b/app/src/main/res/drawable-hdpi/ic_action_more_dark.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_more_light.png b/app/src/main/res/drawable-hdpi/ic_action_more_light.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_properties_dark.png b/app/src/main/res/drawable-hdpi/ic_action_properties_dark.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_properties_light.png b/app/src/main/res/drawable-hdpi/ic_action_properties_light.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_start_dark.png b/app/src/main/res/drawable-hdpi/ic_action_start_dark.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_start_light.png b/app/src/main/res/drawable-hdpi/ic_action_start_light.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_stop_dark.png b/app/src/main/res/drawable-hdpi/ic_action_stop_dark.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_stop_light.png b/app/src/main/res/drawable-hdpi/ic_action_stop_light.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_more_dark.png b/app/src/main/res/drawable-mdpi/ic_action_more_dark.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_more_light.png b/app/src/main/res/drawable-mdpi/ic_action_more_light.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_properties_dark.png b/app/src/main/res/drawable-mdpi/ic_action_properties_dark.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_properties_light.png b/app/src/main/res/drawable-mdpi/ic_action_properties_light.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_start_dark.png b/app/src/main/res/drawable-mdpi/ic_action_start_dark.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_start_light.png b/app/src/main/res/drawable-mdpi/ic_action_start_light.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_stop_dark.png b/app/src/main/res/drawable-mdpi/ic_action_stop_dark.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_stop_light.png b/app/src/main/res/drawable-mdpi/ic_action_stop_light.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_more_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_more_dark.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_more_light.png b/app/src/main/res/drawable-xhdpi/ic_action_more_light.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_properties_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_properties_dark.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_properties_light.png b/app/src/main/res/drawable-xhdpi/ic_action_properties_light.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_start_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_start_dark.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_start_light.png b/app/src/main/res/drawable-xhdpi/ic_action_start_light.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_stop_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_stop_dark.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_stop_light.png b/app/src/main/res/drawable-xhdpi/ic_action_stop_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_more_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_more_dark.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_more_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_more_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_properties_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_properties_dark.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_properties_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_properties_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_start_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_start_dark.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_start_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_start_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_stop_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_stop_dark.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_stop_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_stop_light.png
diff --git a/app/src/main/res/menu/activity_main_landscape.xml b/app/src/main/res/menu/activity_main_landscape.xml
@@ -6,43 +6,52 @@
         android:orderInCategory="100"
         android:title="@string/menu_start"
         android:icon="?attr/ic_action_start"
-        app:showAsAction="ifRoom|withText"/>
+        app:showAsAction="always|withText"/>
     <item
         android:id="@+id/menu_stop"
         android:orderInCategory="100"
         android:title="@string/menu_stop"
         android:icon="?attr/ic_action_stop"
-        app:showAsAction="ifRoom|withText"/>
+        app:showAsAction="always|withText"/>
     <item
         android:id="@+id/menu_properties"
         android:orderInCategory="100"
         android:title="@string/menu_properties"
         android:icon="?attr/ic_action_properties"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/menu_install"
-        android:orderInCategory="100"
-        android:title="@string/menu_install"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_configure"
-        android:orderInCategory="100"
-        android:title="@string/menu_configure"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_export"
-        android:orderInCategory="100"
-        android:title="@string/menu_export"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_status"
-        android:orderInCategory="100"
-        android:title="@string/menu_status"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_clear"
-        android:orderInCategory="100"
-        android:title="@string/menu_clear"
-        app:showAsAction="never"/>
+        app:showAsAction="always"/>
+    <item
+        android:id="@+id/menu_more"
+        android:orderInCategory="100"
+        android:title="@string/menu_more"
+        android:icon="?attr/ic_action_more"
+        app:showAsAction="always">
+        <menu>
+            <item
+                android:id="@+id/menu_install"
+                android:orderInCategory="100"
+                android:title="@string/menu_install"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_configure"
+                android:orderInCategory="100"
+                android:title="@string/menu_configure"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_export"
+                android:orderInCategory="100"
+                android:title="@string/menu_export"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_status"
+                android:orderInCategory="100"
+                android:title="@string/menu_status"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_clear"
+                android:orderInCategory="100"
+                android:title="@string/menu_clear"
+                app:showAsAction="never"/>
+        </menu>
+    </item>
 
 </menu>
diff --git a/app/src/main/res/menu/activity_main_portrait.xml b/app/src/main/res/menu/activity_main_portrait.xml
@@ -2,29 +2,38 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/menu_install"
+        android:id="@+id/menu_more"
         android:orderInCategory="100"
-        android:title="@string/menu_install"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_configure"
-        android:orderInCategory="100"
-        android:title="@string/menu_configure"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_export"
-        android:orderInCategory="100"
-        android:title="@string/menu_export"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_status"
-        android:orderInCategory="100"
-        android:title="@string/menu_status"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_clear"
-        android:orderInCategory="100"
-        android:title="@string/menu_clear"
-        app:showAsAction="never"/>
+        android:title="@string/menu_more"
+        android:icon="?attr/ic_action_more"
+        app:showAsAction="always">
+        <menu>
+            <item
+                android:id="@+id/menu_install"
+                android:orderInCategory="100"
+                android:title="@string/menu_install"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_configure"
+                android:orderInCategory="100"
+                android:title="@string/menu_configure"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_export"
+                android:orderInCategory="100"
+                android:title="@string/menu_export"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_status"
+                android:orderInCategory="100"
+                android:title="@string/menu_status"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/menu_clear"
+                android:orderInCategory="100"
+                android:title="@string/menu_clear"
+                app:showAsAction="never"/>
+        </menu>
+    </item>
 
 </menu>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -240,5 +240,6 @@
     <string name="updating_env_message">Обновление рабочего окружения...</string>
     <string name="repository_purchase_button">Купить</string>
     <string name="write_permissions_disallow">Приложению была запрещена запись в память устройства</string>
+    <string name="menu_more">Меню</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
     <string name="menu_delete">Delete</string>
     <string name="menu_change_url">Change URL</string>
     <string name="menu_refresh">Refresh</string>
+    <string name="menu_more">Menu</string>
     <string name="loading_message">Loading data...</string>
     <string name="updating_env_message">Updating operating environment...</string>
     <string name="removing_env_message">Removing operating environment...</string>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -2,17 +2,20 @@
     <attr name="ic_action_start" format="reference"/>
     <attr name="ic_action_stop" format="reference"/>
     <attr name="ic_action_properties" format="reference"/>
+    <attr name="ic_action_more" format="reference"/>
     <attr name="color_toolbar_border" format="reference"/>
     <style name="DarkTheme" parent="Theme.AppCompat">
         <item name="ic_action_start">@drawable/ic_action_start_dark</item>
         <item name="ic_action_stop">@drawable/ic_action_stop_dark</item>
         <item name="ic_action_properties">@drawable/ic_action_properties_dark</item>
+        <item name="ic_action_more">@drawable/ic_action_more_dark</item>
         <item name="color_toolbar_border">@color/toolbarDark</item>
     </style>
     <style name="LightTheme" parent="Theme.AppCompat.Light">
         <item name="ic_action_start">@drawable/ic_action_start_light</item>
         <item name="ic_action_stop">@drawable/ic_action_stop_light</item>
         <item name="ic_action_properties">@drawable/ic_action_properties_light</item>
+        <item name="ic_action_more">@drawable/ic_action_more_light</item>
         <item name="color_toolbar_border">@color/toolbarLight</item>
     </style>
     <style name="NavigationViewTheme" parent="Widget.Design.NavigationView">