Convert most fragments/activities to androidx

6 files changed, 21 insertions, 30 deletions

diff --git a/main/src/ui/res/layout-v21/tabs.xml b/main/src/ui/res/layout-v21/tabs.xml
index af349a4f..a4283190 100644
--- a/main/src/ui/res/layout-v21/tabs.xml
+++ b/main/src/ui/res/layout-v21/tabs.xml
@@ -4,11 +4,12 @@
   -->
 <merge xmlns:blinkt="http://schemas.android.com/apk/res-auto">
 
-    <de.blinkt.openvpn.views.PagerSlidingTabStrip xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.viewpager.widget.PagerTabStrip xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/sliding_tabs"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
         android:background="@drawable/bg_tabs"
+        android:layout_gravity="top"
         blinkt:pstsIndicatorColor="@color/accent"
         blinkt:pstsIndicatorHeight="3dp"
         android:elevation="8dp" />
diff --git a/main/src/ui/res/layout/main_activity.xml b/main/src/ui/res/layout/main_activity.xml
index 7b6caf00..d47bacc5 100644
--- a/main/src/ui/res/layout/main_activity.xml
+++ b/main/src/ui/res/layout/main_activity.xml
@@ -4,15 +4,26 @@
   -->
 
 <LinearLayout 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">
 
-    <include layout="@layout/tabs" />
 
-    <android.support.v4n.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent">
+
+        <com.google.android.material.tabs.TabLayout
+            style="@style/AppTabLayout"
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+
+            />
+
+    </androidx.viewpager.widget.ViewPager>
 
 </LinearLayout>
diff --git a/main/src/ui/res/layout/padersliding_tab.xml b/main/src/ui/res/layout/sliding_tab.xml
index 07c8daa9..07c8daa9 100644
--- a/main/src/ui/res/layout/padersliding_tab.xml
+++ b/main/src/ui/res/layout/sliding_tab.xml
diff --git a/main/src/ui/res/layout/tabs.xml b/main/src/ui/res/layout/tabs.xml
deleted file mode 100644
index a68c4e42..00000000
--- a/main/src/ui/res/layout/tabs.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
-  -->
-<merge>
-
-    <de.blinkt.openvpn.views.SlidingTabLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/sliding_tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</merge>
\ No newline at end of file
diff --git a/main/src/ui/res/layout/tlsremote.xml b/main/src/ui/res/layout/tlsremote.xml
index 5ebeb051..1e393d6b 100644
--- a/main/src/ui/res/layout/tlsremote.xml
+++ b/main/src/ui/res/layout/tlsremote.xml
@@ -1,18 +1,18 @@
-<?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
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:padding="@dimen/stdpadding"
-    android:layout_height="match_parent" >
+    android:theme="@style/Theme.AppCompat.Dialog.Alert">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/dialogHeader"
@@ -40,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:ems="10"
-            android:inputType="text" >
+            android:inputType="text">
 
             <requestFocus />
         </EditText>
diff --git a/main/src/ui/res/values-v21/colours.xml b/main/src/ui/res/values-v21/colours.xml
deleted file mode 100644
index 024e47eb..00000000
--- a/main/src/ui/res/values-v21/colours.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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>
-    <color name="switchbar">#5C6BC0</color>    <!-- 400-->
-</resources>
\ No newline at end of file