Fix building skeleton variant, fix lint issues and release beta 0.7.11

12 files changed, 74 insertions, 24 deletions

diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index 42650454..2175ca09 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -45,8 +45,8 @@ android {
     defaultConfig {
         minSdkVersion(14)
         targetSdkVersion(29)  //'Q'.toInt()
-        versionCode = 163
-        versionName = "0.7.10"
+        versionCode = 164
+        versionName = "0.7.11"
 
         externalNativeBuild {
             cmake {
diff --git a/main/src/skeleton/res/values/refs.xml b/main/src/skeleton/res/values/refs.xml
new file mode 100644
index 00000000..a5105456
--- /dev/null
+++ b/main/src/skeleton/res/values/refs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+
+<resources>
+    <drawable name="ic_menu_close_clear_cancel">@android:drawable/ic_menu_close_clear_cancel</drawable>
+    <drawable name="ic_menu_play">@android:drawable/ic_media_play</drawable>
+    <drawable name="ic_menu_pause">@android:drawable/ic_media_pause</drawable>
+    <drawable name="ic_menu_share">@android:drawable/ic_menu_share</drawable>
+    <drawable name="ic_menu_save">@android:drawable/ic_menu_save</drawable>
+    <drawable name="ic_menu_view">@android:drawable/ic_menu_view</drawable>
+    <drawable name="ic_menu_delete">@android:drawable/ic_menu_delete</drawable>
+    <drawable name="ic_menu_edit">@android:drawable/ic_menu_edit</drawable>
+    <drawable name="ic_menu_import">@drawable/ic_menu_archive</drawable>
+    <drawable name="vpn_item_edit">@drawable/vpn_item_settings</drawable>
+    <drawable name="ic_menu_add">@android:drawable/ic_menu_add</drawable>
+    <drawable name="ic_dialog_alert">@android:drawable/ic_dialog_alert</drawable>
+    <drawable name="ic_menu_add_grey">@android:drawable/ic_menu_add</drawable>
+    <drawable name="ic_menu_import_grey">@drawable/ic_menu_archive</drawable>
+    <drawable name="ic_menu_delete_grey">@android:drawable/ic_menu_delete</drawable>
+    <drawable name="ic_menu_copy">@drawable/ic_menu_copy_holo_light</drawable>
+    <drawable name="ic_receipt">@drawable/ic_menu_log</drawable>
+    <drawable name="ic_sort">@android:drawable/ic_menu_sort_by_size</drawable>
+
+</resources>
\ No newline at end of file
diff --git a/main/src/skeleton/res/values/styles.xml b/main/src/skeleton/res/values/styles.xml
new file mode 100644
index 00000000..dbe2d1e4
--- /dev/null
+++ b/main/src/skeleton/res/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<resources>
+
+    <style name="blinkt.baseTheme" parent="android:Theme.DeviceDefault.Light" />
+
+    <style name="blinkt.dialog" parent="android:Theme.DeviceDefault.Light.Dialog" />
+
+
+    <style name="Theme.CreateShortCut" parent="android:Theme.DeviceDefault.DialogWhenLarge" />
+
+    <style name="blinkt" parent="blinkt.baseTheme" />
+
+
+</resources>
\ No newline at end of file
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/SeekBarTicks.java b/main/src/ui/java/de/blinkt/openvpn/views/SeekBarTicks.java
index 347ce708..cdc683c0 100644
--- a/main/src/ui/java/de/blinkt/openvpn/views/SeekBarTicks.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/SeekBarTicks.java
@@ -9,13 +9,12 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.ViewConfiguration;
 import android.widget.SeekBar;
 
-public class SeekBarTicks extends SeekBar {
+import androidx.appcompat.widget.AppCompatSeekBar;
+
+public class SeekBarTicks extends AppCompatSeekBar {
     private Paint mTickPaint;
     private float mTickHeight;
 
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
diff --git a/main/src/main/res/values/refs.xml b/main/src/ui/res/values/refs.xml
index 5d2ea134..5d2ea134 100644
--- a/main/src/main/res/values/refs.xml
+++ b/main/src/ui/res/values/refs.xml
diff --git a/main/src/main/res/values/styles.xml b/main/src/ui/res/values/styles.xml
index f90da367..f90da367 100644
--- a/main/src/main/res/values/styles.xml
+++ b/main/src/ui/res/values/styles.xml