From 10d7110c352072a98edaa827800939aa16e85f6d Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 3 Sep 2019 19:17:51 +0300
Subject: Move to androidx and new chart library version

---
 main/src/ui/res/layout/connections.xml | 2 +-
 main/src/ui/res/layout/faq.xml         | 2 +-
 main/src/ui/res/layout/faqcard.xml     | 4 ++--
 main/src/ui/res/layout/server_card.xml | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/main/src/ui/res/layout/connections.xml b/main/src/ui/res/layout/connections.xml
index 598ddd92..f22bfd1c 100644
--- a/main/src/ui/res/layout/connections.xml
+++ b/main/src/ui/res/layout/connections.xml
@@ -42,7 +42,7 @@
 
 
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:layout_margin="@dimen/vpn_setting_padding"
         android:id="@+id/connection_recycler_view"
         android:layout_below="@id/switchBar"
diff --git a/main/src/ui/res/layout/faq.xml b/main/src/ui/res/layout/faq.xml
index aa3febd0..8cb79649 100644
--- a/main/src/ui/res/layout/faq.xml
+++ b/main/src/ui/res/layout/faq.xml
@@ -4,7 +4,7 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
diff --git a/main/src/ui/res/layout/faqcard.xml b/main/src/ui/res/layout/faqcard.xml
index 360f3752..b0182540 100644
--- a/main/src/ui/res/layout/faqcard.xml
+++ b/main/src/ui/res/layout/faqcard.xml
@@ -4,7 +4,7 @@
   ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
   -->
 
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -38,4 +38,4 @@
         tools:ignore="SelectableText" />
 
     </LinearLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/main/src/ui/res/layout/server_card.xml b/main/src/ui/res/layout/server_card.xml
index 3b214bbb..dab975d6 100644
--- a/main/src/ui/res/layout/server_card.xml
+++ b/main/src/ui/res/layout/server_card.xml
@@ -10,7 +10,7 @@
              android:layout_height="wrap_content"
              android:layout_margin="@dimen/stdpadding">
     <!-- A CardView that contains a TextView -->
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
             android:id="@+id/card_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -227,7 +227,7 @@
                     android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
                     tools:ignore="HardcodedText"/>
 
-            <android.support.constraint.ConstraintLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                     android:visibility="gone"
                     tools:visibility="visible"
                     android:id="@+id/proxyauthlayout"
@@ -308,7 +308,7 @@
                         card_view:layout_constraintStart_toEndOf="@+id/proxyuser" android:layout_marginLeft="16dp"
                         android:layout_marginStart="8dp"/>
 
-            </android.support.constraint.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView
                     android:id="@+id/connect_timeout_label"
@@ -399,5 +399,5 @@
 
         </RelativeLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3