Migrate to AndroidX

10 files changed, 20 insertions, 32 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java b/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
index c66f383f..476bbad0 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
@@ -4,9 +4,8 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.ImageButton;
 
-public class AutoRepeatButton extends android.support.v7.widget.AppCompatImageButton {
+public class AutoRepeatButton extends androidx.appcompat.widget.AppCompatImageButton {
 
 	private static final long initialRepeatDelay = 1000;
 	private static final long repeatIntervalInMilliseconds = 300;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java b/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
index 002f0245..06960368 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
@@ -17,9 +17,8 @@ package github.daneren2005.dsub.view;
 import android.content.Context;
 import android.os.Build;
 import android.os.Environment;
-import android.preference.DialogPreference;
 import android.preference.EditTextPreference;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -28,12 +27,10 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import java.io.File;
 
 import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.util.FileUtil;
 
 public class CacheLocationPreference extends EditTextPreference {
 	private static final String TAG = CacheLocationPreference.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/ChangeLog.java b/app/src/main/java/github/daneren2005/dsub/view/ChangeLog.java
index e3d24485..840bb218 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/ChangeLog.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/ChangeLog.java
@@ -33,16 +33,14 @@
 package github.daneren2005.dsub.view;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
 
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/ErrorDialog.java b/app/src/main/java/github/daneren2005/dsub/view/ErrorDialog.java
index 3d6eaa52..ccdbb2b3 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/ErrorDialog.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/ErrorDialog.java
@@ -19,7 +19,7 @@
 package github.daneren2005.dsub.view;
 
 import android.app.Activity;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/view/FastScroller.java b/app/src/main/java/github/daneren2005/dsub/view/FastScroller.java
index d3eacefc..a8f2635a 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/FastScroller.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/FastScroller.java
@@ -17,14 +17,12 @@ package github.daneren2005.dsub.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.AdapterDataObserver;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
@@ -36,7 +34,7 @@ import android.widget.TextView;
 
 import github.daneren2005.dsub.R;
 
-import static android.support.v7.widget.RecyclerView.OnScrollListener;
+import static androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 
 public class FastScroller extends LinearLayout {
 	private static final String TAG = FastScroller.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java b/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java
index 45b34b9f..de32a644 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java
@@ -16,17 +16,15 @@
 package github.daneren2005.dsub.view;
 
 import android.graphics.Rect;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import static android.widget.LinearLayout.*;
-
 public class GridSpacingDecoration extends RecyclerView.ItemDecoration {
 	private static final String TAG = GridSpacingDecoration.class.getSimpleName();
 	public static final int SPACING = 10;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java b/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
index 0041eac5..a4727643 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
@@ -22,7 +22,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteChooserDialogFragment.java b/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteChooserDialogFragment.java
index a2c898b9..35c9b292 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteChooserDialogFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteChooserDialogFragment.java
@@ -2,11 +2,10 @@ package github.daneren2005.dsub.view.compat;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.MediaRouteChooserDialog;
-import android.support.v7.app.MediaRouteChooserDialogFragment;
+import androidx.mediarouter.app.MediaRouteChooserDialog;
+import androidx.mediarouter.app.MediaRouteChooserDialogFragment;
 
 import github.daneren2005.dsub.util.ThemeUtil;
-import github.daneren2005.dsub.util.Util;
 
 public class CustomMediaRouteChooserDialogFragment extends MediaRouteChooserDialogFragment {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteControllerDialogFragment.java b/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteControllerDialogFragment.java
index ea890b9f..c85e7c62 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteControllerDialogFragment.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteControllerDialogFragment.java
@@ -2,11 +2,10 @@ package github.daneren2005.dsub.view.compat;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.MediaRouteControllerDialog;
-import android.support.v7.app.MediaRouteControllerDialogFragment;
+import androidx.mediarouter.app.MediaRouteControllerDialog;
+import androidx.mediarouter.app.MediaRouteControllerDialogFragment;
 
 import github.daneren2005.dsub.util.ThemeUtil;
-import github.daneren2005.dsub.util.Util;
 
 public class CustomMediaRouteControllerDialogFragment extends MediaRouteControllerDialogFragment {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteDialogFactory.java b/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteDialogFactory.java
index 8bc890cb..a39b1044 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteDialogFactory.java
+++ b/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteDialogFactory.java
@@ -1,8 +1,8 @@
 package github.daneren2005.dsub.view.compat;
 
-import android.support.v7.app.MediaRouteChooserDialogFragment;
-import android.support.v7.app.MediaRouteControllerDialogFragment;
-import android.support.v7.app.MediaRouteDialogFactory;
+import androidx.mediarouter.app.MediaRouteChooserDialogFragment;
+import androidx.mediarouter.app.MediaRouteControllerDialogFragment;
+import androidx.mediarouter.app.MediaRouteDialogFactory;
 
 public class CustomMediaRouteDialogFactory extends MediaRouteDialogFactory {
 	@Override