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/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java    | 2 +-
 main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java | 4 +---
 main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java        | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'main/src/ui/java/de/blinkt/openvpn/views')

diff --git a/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java b/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
index ab8598c6..3232edc6 100644
--- a/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
@@ -28,7 +28,7 @@ import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.support.v4n.view.ViewPager;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java b/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
index 38bb54b5..481e4c16 100644
--- a/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
@@ -10,13 +10,11 @@ import android.app.FragmentManager;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.support.v4n.app.FragmentStatePagerAdapter;
 
 import java.util.Vector;
 
-import de.blinkt.openvpn.activities.MainActivity;
-
 /**
 * Created by arne on 18.11.14.
 */
diff --git a/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java
index ea3b1c26..51ad6933 100644
--- a/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java
@@ -34,7 +34,7 @@ import android.widget.TextView;
  * the user's scroll progress.
  * <p>
  * To use the component, simply add it to your view hierarchy. Then in your
- * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call
+ * {@link android.app.Activity} or {@link androidx.core.app.Fragment} call
  * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for.
  * <p>
  * The colors can be customized in two ways. The first and simplest is to provide an array of colors
-- 
cgit v1.2.3