Merge branch 'schwabe_master' into ssh_new_masternew_master

14 files changed, 244 insertions, 178 deletions

diff --git a/main/src/ui/res/layout/about.xml b/main/src/ui/res/layout/about.xml
index cd482996..f73768c7 100644
--- a/main/src/ui/res/layout/about.xml
+++ b/main/src/ui/res/layout/about.xml
@@ -9,6 +9,7 @@
         android:layout_height="match_parent"
         android:paddingLeft="@dimen/stdpadding"
         android:paddingRight="@dimen/stdpadding"
+        android:clipToPadding="false"
         android:scrollbarStyle="outsideOverlay">
 
     <LinearLayout
diff --git a/main/src/ui/res/layout/basic_settings.xml b/main/src/ui/res/layout/basic_settings.xml
index 8aa4c811..47f84e5f 100644
--- a/main/src/ui/res/layout/basic_settings.xml
+++ b/main/src/ui/res/layout/basic_settings.xml
@@ -21,6 +21,7 @@
             style="@style/item"
             android:text="@string/profilename"
             android:textAppearance="?android:attr/textAppearanceSmall"
+            android:labelFor="@id/profilename"
             />
 
         <EditText
diff --git a/main/src/ui/res/layout/config_converter.xml b/main/src/ui/res/layout/config_converter.xml
index 591de858..311e7557 100644
--- a/main/src/ui/res/layout/config_converter.xml
+++ b/main/src/ui/res/layout/config_converter.xml
@@ -2,114 +2,124 @@
   ~ Copyright (c) 2012-2016 Arne Schwabe
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <ScrollView
+    <RelativeLayout xmlns:tools="http://schemas.android.com/tools"
+            android:id="@+id/root_layout_config_converter"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="@dimen/stdpadding"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
 
-
-        <LinearLayout
-                android:id="@+id/config_convert_root"
+        <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/stdpadding"
                 android:orientation="vertical">
 
-            <TextView
-                    android:id="@+id/profilename_label"
-                    style="@style/item"
-                    android:labelFor="@id/profilename"
-                    android:text="@string/profilename"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:visibility="gone" />
-
-            <EditText
-                    android:id="@+id/profilename"
-                    style="@style/item"
-                    android:inputType="text"
-                    android:visibility="gone" />
-
-            <TextView
-                    android:layout_marginTop="@dimen/stdpadding"
-                    android:id="@+id/compatmode_label"
-                    style="@style/item"
-                    android:text="@string/compat_mode_label"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-            <Spinner
-                    android:id="@+id/compatmode"
-                    style="@style/item"
-                    android:entries="@array/compat_mode"
-                    android:prompt="@string/compatmode"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-            <TextView
-                    android:layout_marginTop="@dimen/stdpadding"
-                    android:id="@+id/tls_profile_label"
-                    style="@style/item"
-                    android:text="@string/tls_profile"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-            <Spinner
-                    android:id="@+id/tls_profile"
-                    style="@style/item"
-                    android:entries="@array/tls_profile_entries"
-                    android:prompt="@string/compatmode"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-            <TextView
-                    android:id="@+id/files_missing_hint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/files_missing_hint"
-                    android:visibility="gone"
-                    tools:visibilty="visible" />
 
-            <TextView
-                    android:id="@+id/permssion_hint"
+            <LinearLayout
+                    android:id="@+id/config_convert_root"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="@string/query_permissions_sdcard"
-                    android:textStyle="bold"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-            <CheckBox
-                    android:layout_marginTop="@dimen/stdpadding"
-                    android:id="@+id/importpkcs12"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:checked="true"
-                    android:text="@string/importpkcs12fromconfig"
-                    android:visibility="gone"
-                    tools:visibilty="visible" />
-
-            <TextView
-                    android:id="@+id/textView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
-                    android:text="@string/import_log"
-                    android:textAppearance="?android:attr/textAppearanceMedium" />
+                    android:orientation="vertical">
+
+                <TextView
+                        android:id="@+id/profilename_label"
+                        style="@style/item"
+                        android:labelFor="@id/profilename"
+                        android:text="@string/profilename"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:visibility="gone" />
+
+                <EditText
+                        android:id="@+id/profilename"
+                        style="@style/item"
+                        android:inputType="text"
+                        android:visibility="gone" />
+
+                <TextView
+                        android:id="@+id/compatmode_label"
+                        style="@style/item"
+                        android:layout_marginTop="@dimen/stdpadding"
+                        android:text="@string/compat_mode_label"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                <Spinner
+                        android:id="@+id/compatmode"
+                        style="@style/item"
+                        android:entries="@array/compat_mode"
+                        android:prompt="@string/compatmode"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                <TextView
+                        android:id="@+id/tls_profile_label"
+                        style="@style/item"
+                        android:layout_marginTop="@dimen/stdpadding"
+                        android:text="@string/tls_profile"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                <Spinner
+                        android:id="@+id/tls_profile"
+                        style="@style/item"
+                        android:entries="@array/tls_profile_entries"
+                        android:prompt="@string/compatmode"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                <TextView
+                        android:id="@+id/files_missing_hint"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/files_missing_hint"
+                        android:visibility="gone"
+                        tools:visibilty="visible" />
+
+                <TextView
+                        android:id="@+id/permssion_hint"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="5dp"
+                        android:text="@string/query_permissions_sdcard"
+                        android:textStyle="bold"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                <CheckBox
+                        android:id="@+id/importpkcs12"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/stdpadding"
+                        android:checked="true"
+                        android:text="@string/importpkcs12fromconfig"
+                        android:visibility="gone"
+                        tools:visibilty="visible" />
+
+                <TextView
+                        android:id="@+id/textView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="10dp"
+                        android:text="@string/import_log"
+                        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+                <Space
+                        android:id="@+id/fab_footerspace"
+                        android:layout_width="40dp"
+                        android:layout_height="@dimen/round_button_diameter"
+                        android:visibility="gone" />
+            </LinearLayout>
+
+        </ScrollView>
 
-            <Space
-                    android:id="@+id/fab_footerspace"
-                    android:layout_width="40dp"
-                    android:layout_height="@dimen/round_button_diameter"
-                    android:visibility="gone" />
-        </LinearLayout>
+        <include layout="@layout/save_fab" />
 
-    </ScrollView>
+    </RelativeLayout>
 
-    <include layout="@layout/save_fab" />
-</RelativeLayout>
+    <include layout="@layout/status_bg" />
+</FrameLayout>
diff --git a/main/src/ui/res/layout/faq.xml b/main/src/ui/res/layout/faq.xml
index 8cb79649..46b56e58 100644
--- a/main/src/ui/res/layout/faq.xml
+++ b/main/src/ui/res/layout/faq.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?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
   -->
 
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/faq_recycler_view"
-    android:paddingLeft="@dimen/stdpadding"
-    android:paddingRight="@dimen/stdpadding"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:verticalSpacing="@dimen/stdpadding"
-    android:horizontalSpacing="@dimen/stdpadding"
-    />
\ No newline at end of file
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/faq_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:horizontalSpacing="@dimen/stdpadding"
+        android:paddingLeft="@dimen/stdpadding"
+        android:paddingRight="@dimen/stdpadding"
+        android:verticalSpacing="@dimen/stdpadding" />
\ No newline at end of file
diff --git a/main/src/ui/res/layout/log_fragment.xml b/main/src/ui/res/layout/log_fragment.xml
index df87d1c1..bac1fe94 100644
--- a/main/src/ui/res/layout/log_fragment.xml
+++ b/main/src/ui/res/layout/log_fragment.xml
@@ -35,6 +35,7 @@
             />
 
     <ListView
+            android:clipToPadding="false"
             android:id="@android:id/list"
             android:transcriptMode="normal"
             android:layout_width="fill_parent"
diff --git a/main/src/ui/res/layout/log_silders.xml b/main/src/ui/res/layout/log_silders.xml
index 4196e243..de6155fc 100644
--- a/main/src/ui/res/layout/log_silders.xml
+++ b/main/src/ui/res/layout/log_silders.xml
@@ -19,7 +19,8 @@
     <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/log_verbosity_level"/>
+            android:text="@string/log_verbosity_level"
+            android:labelFor="@id/LogLevelSlider"/>
 
 
     <de.blinkt.openvpn.views.SeekBarTicks
diff --git a/main/src/ui/res/layout/log_window.xml b/main/src/ui/res/layout/log_window.xml
index 7c25dcfa..ffebc474 100644
--- a/main/src/ui/res/layout/log_window.xml
+++ b/main/src/ui/res/layout/log_window.xml
@@ -4,9 +4,18 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:id="@+id/container"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context=".LogWindow"
-             tools:ignore="MergeRootFrame" />
\ No newline at end of file
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:ignore="MergeRootFrame">
+
+
+    <FrameLayout
+            android:id="@+id/container"
+            tools:context=".LogWindow"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+
+    <include layout="@layout/status_bg" />
+</FrameLayout>
\ No newline at end of file
diff --git a/main/src/ui/res/layout/main_activity.xml b/main/src/ui/res/layout/main_activity.xml
index b2fe2251..6e0a3de9 100644
--- a/main/src/ui/res/layout/main_activity.xml
+++ b/main/src/ui/res/layout/main_activity.xml
@@ -2,30 +2,40 @@
   ~ Copyright (c) 2012-2016 Arne Schwabe
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
+        android:layout_height="match_parent">
 
-    <androidx.viewpager.widget.ViewPager
-            android:id="@+id/pager"
+    <LinearLayout
+            android:id="@+id/root_linear_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
 
         <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tab_layout"
                 style="@style/blinkt.tabLayout"
-                app:tabMaxWidth="0dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                app:tabMode="scrollable"
+                app:tabMaxWidth="0dp"
+                app:tabMode="scrollable" />
 
-                />
+        <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/pager"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="3" />
+
+    </LinearLayout>
 
-    </androidx.viewpager.widget.ViewPager>
 
-</LinearLayout>
+    <View
+            android:id="@+id/statusbar_background"
+            android:background="@color/primary_dark"
+            android:layout_width="match_parent"
+            android:layout_height="0dp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/main/src/ui/res/layout/openssl_speed.xml b/main/src/ui/res/layout/openssl_speed.xml
index c23d3567..d19b88d2 100644
--- a/main/src/ui/res/layout/openssl_speed.xml
+++ b/main/src/ui/res/layout/openssl_speed.xml
@@ -2,39 +2,47 @@
   ~ Copyright (c) 2012-2017 Arne Schwabe
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
 
-    <LinearLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-
-
-        <EditText
-            android:id="@+id/ciphername"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:text="@string/default_cipherlist_test"
-            android:hint="@string/openssl_cipher_name"
-            android:inputType="textPersonName" />
-
-        <Button
-            android:id="@+id/testSpecific"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/test_algoirhtms" />
-    </LinearLayout>
+        android:layout_height="match_parent">
 
-    <ListView
-        android:id="@+id/results"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/speed_root"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+
+            <EditText
+                    android:id="@+id/ciphername"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:hint="@string/openssl_cipher_name"
+                    android:inputType="textPersonName"
+                    android:text="@string/default_cipherlist_test" />
+
+            <Button
+                    android:id="@+id/testSpecific"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/test_algoirhtms" />
+        </LinearLayout>
+
+        <ListView
+                android:id="@+id/results"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+    </LinearLayout>
 
-</LinearLayout>
+    <include layout="@layout/status_bg" />
+</FrameLayout>
diff --git a/main/src/ui/res/layout/server_card.xml b/main/src/ui/res/layout/server_card.xml
index 1395cd8b..8a19ae8f 100644
--- a/main/src/ui/res/layout/server_card.xml
+++ b/main/src/ui/res/layout/server_card.xml
@@ -327,6 +327,7 @@
                     android:layout_below="@+id/connect_timeout_label"
                     android:ems="3"
                     tools:text="232"
+                    android:labelFor="@id/connect_silder"
                     android:gravity="end"
                     android:inputType="numberDecimal"/>
 
@@ -364,6 +365,7 @@
                         android:id="@+id/warnung_custom"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:labelFor="@id/customoptions"
                         android:text="@string/custom_connection_options_warng"/>
 
                 <EditText
diff --git a/main/src/ui/res/layout/status_bg.xml b/main/src/ui/res/layout/status_bg.xml
new file mode 100644
index 00000000..3754664b
--- /dev/null
+++ b/main/src/ui/res/layout/status_bg.xml
@@ -0,0 +1,5 @@
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/statusbar_background"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/primary_dark" />
diff --git a/main/src/ui/res/layout/webview_internal.xml b/main/src/ui/res/layout/webview_internal.xml
index f1bf17c8..740589e1 100644
--- a/main/src/ui/res/layout/webview_internal.xml
+++ b/main/src/ui/res/layout/webview_internal.xml
@@ -2,23 +2,29 @@
   ~ Copyright (c) 2012-2020 Arne Schwabe
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
-
-<LinearLayout android:layout_height="match_parent"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:orientation="vertical"
-        xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-            android:id="@+id/url_textview"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:text="https://foo.bar.baz" />
+        android:layout_height="match_parent">
 
-    <WebView
-            android:id="@+id/internal_webview"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:id="@+id/webview_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            />
+            android:orientation="vertical">
+
+        <TextView
+                android:id="@+id/url_textview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="https://foo.bar.baz" />
+
+        <WebView
+                android:id="@+id/internal_webview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+    </LinearLayout>
 
-</LinearLayout>
+    <include layout="@layout/status_bg" />
+</FrameLayout>
diff --git a/main/src/ui/res/menu/connections.xml b/main/src/ui/res/menu/connections.xml
index 631e01a8..f4dc1820 100644
--- a/main/src/ui/res/menu/connections.xml
+++ b/main/src/ui/res/menu/connections.xml
@@ -11,6 +11,7 @@
         android:title="@string/add_remote"
         android:id="@+id/add_new_remote"
         android:titleCondensed="@string/add"
+            android:contentDescription="@string/add_remote"
         app:showAsAction="always"
     />
 </menu>
\ No newline at end of file
diff --git a/main/src/ui/res/values/styles.xml b/main/src/ui/res/values/styles.xml
index 9e8e92b7..374a650d 100644
--- a/main/src/ui/res/values/styles.xml
+++ b/main/src/ui/res/values/styles.xml
@@ -10,6 +10,21 @@
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
         <item name="alertDialogTheme">@style/blinkt.alertDialog</item>
+
+
+        <item name="android:navigationBarColor">
+            @android:color/transparent
+        </item>
+
+        <!-- Optional: set to transparent if your app is drawing behind the status bar. -->
+        <item name="android:statusBarColor">
+            @android:color/transparent
+        </item>
+
+        <!-- Optional: set for a light status bar with dark content. -->
+        <item name="android:windowLightStatusBar">
+            true
+        </item>
     </style>
 
     <style name="blinkt.dialog" parent="Theme.AppCompat.DayNight.Dialog">
@@ -89,10 +104,6 @@
         <item name="tabTextAppearance">@style/AppTabTextAppearance</item>
         <item name="tabSelectedTextColor">@android:color/white</item>
 
-        <!--        <item name="tabPaddingStart">10dp</item>-->
-        <!--        <item name="tabPaddingEnd">10dp</item>-->
-
-
         <item name="tabGravity">fill</item>
         <item name="tabMaxWidth">0dp</item>