From 49a22239376ded088ff1fe113df42e24daaea00d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 22 Nov 2019 14:39:47 +0100
Subject: Fix building skeleton variant, fix lint issues and release beta
 0.7.11

---
 main/src/ui/res/menu/configmenu.xml          |  5 +++--
 main/src/ui/res/menu/connections.xml         |  5 +++--
 main/src/ui/res/menu/import_menu.xml         |  7 ++++---
 main/src/ui/res/menu/logmenu.xml             | 13 +++++++------
 main/src/ui/res/menu/main_menu.xml           |  5 +++--
 main/src/ui/res/menu/vpnpreferences_menu.xml |  7 ++++---
 6 files changed, 24 insertions(+), 18 deletions(-)

(limited to 'main/src/ui/res/menu')

diff --git a/main/src/ui/res/menu/configmenu.xml b/main/src/ui/res/menu/configmenu.xml
index 96515c24..8c2442e6 100644
--- a/main/src/ui/res/menu/configmenu.xml
+++ b/main/src/ui/res/menu/configmenu.xml
@@ -4,12 +4,13 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/sendConfig"
         android:icon="@drawable/ic_menu_share"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/send_config"
         android:titleCondensed="@string/send"/>
 
diff --git a/main/src/ui/res/menu/connections.xml b/main/src/ui/res/menu/connections.xml
index 64ca4a2c..631e01a8 100644
--- a/main/src/ui/res/menu/connections.xml
+++ b/main/src/ui/res/menu/connections.xml
@@ -4,12 +4,13 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:icon="@drawable/ic_menu_add"
         android:title="@string/add_remote"
         android:id="@+id/add_new_remote"
         android:titleCondensed="@string/add"
-        android:showAsAction="always"
+        app:showAsAction="always"
     />
 </menu>
\ No newline at end of file
diff --git a/main/src/ui/res/menu/import_menu.xml b/main/src/ui/res/menu/import_menu.xml
index 52c96516..f1be023b 100644
--- a/main/src/ui/res/menu/import_menu.xml
+++ b/main/src/ui/res/menu/import_menu.xml
@@ -4,18 +4,19 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/cancel"
         android:icon="@drawable/ic_menu_close_clear_cancel"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@android:string/cancel"
         android:titleCondensed="@string/cancel"/>
 
     <item
         android:id="@+id/ok"
         android:icon="@drawable/ic_menu_save"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/add_profile"
         android:titleCondensed="@string/import_vpn"/>
 
diff --git a/main/src/ui/res/menu/logmenu.xml b/main/src/ui/res/menu/logmenu.xml
index cb9a86f0..d0cb588f 100644
--- a/main/src/ui/res/menu/logmenu.xml
+++ b/main/src/ui/res/menu/logmenu.xml
@@ -4,39 +4,40 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
     <item
             android:id="@+id/toggle_time"
             android:alphabeticShortcut="t"
             android:icon="@drawable/ic_menu_view"
-            android:showAsAction="ifRoom"
+            app:showAsAction="ifRoom"
             android:title="@string/logview_options" />
 
     <item
             android:id="@+id/clearlog"
             android:icon="@drawable/ic_menu_delete"
-            android:showAsAction="ifRoom"
+            app:showAsAction="ifRoom"
             android:title="@string/clear_log"
             android:titleCondensed="@string/clear"/>
     <item
             android:id="@+id/send"
             android:icon="@drawable/ic_menu_share"
-            android:showAsAction="ifRoom"
+            app:showAsAction="ifRoom"
             android:title="@string/send_logfile"
             android:titleCondensed="@string/send"/>
 
     <item
             android:id="@+id/cancel"
             android:icon="@drawable/ic_menu_close_clear_cancel"
-            android:showAsAction="ifRoom"
+            app:showAsAction="ifRoom"
             android:title="@string/cancel_connection_long"
             android:titleCondensed="@string/cancel_connection"/>
     <item
             android:id="@+id/edit_vpn"
             android:alphabeticShortcut="e"
             android:icon="@drawable/ic_menu_edit"
-            android:showAsAction="ifRoom"
+            app:showAsAction="ifRoom"
             android:title="@string/edit_vpn"/>
 </menu>
\ No newline at end of file
diff --git a/main/src/ui/res/menu/main_menu.xml b/main/src/ui/res/menu/main_menu.xml
index f5e0bf08..e2e22eb4 100644
--- a/main/src/ui/res/menu/main_menu.xml
+++ b/main/src/ui/res/menu/main_menu.xml
@@ -4,11 +4,12 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/show_log"
         android:icon="@drawable/ic_receipt"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/show_log_window"
         android:titleCondensed="@string/show_log"/>
 </menu>
\ No newline at end of file
diff --git a/main/src/ui/res/menu/vpnpreferences_menu.xml b/main/src/ui/res/menu/vpnpreferences_menu.xml
index e31d6ddf..bbeb3096 100644
--- a/main/src/ui/res/menu/vpnpreferences_menu.xml
+++ b/main/src/ui/res/menu/vpnpreferences_menu.xml
@@ -4,19 +4,20 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/remove_vpn"
         android:alphabeticShortcut="d"
         android:icon="@drawable/ic_menu_delete"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/remove_vpn"/>
 
     <item
         android:id="@+id/duplicate_vpn"
         android:alphabeticShortcut="c"
         android:icon="@drawable/ic_menu_copy"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="Duplicate VPN" />
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3