Finish most migrating to androidx. Dependency issues remain

app/build.gradle

@@ -74,11 +74,11 @@ dependencies {
     implementation project(path: ':routerjars', configuration: 'routerjars')
     // Android Support Repository dependencies
     def supportVersion = '28.0.0'
-    implementation "com.android.support:support-v4:$supportVersion"
+    /*implementation "com.android.support:support-v4:$supportVersion"
     implementation "com.android.support:appcompat-v7:$supportVersion"
     implementation "com.android.support:preference-v7:$supportVersion"
     implementation "com.android.support:preference-v14:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
+    implementation "com.android.support:recyclerview-v7:$supportVersion"*/
     implementation 'com.google.android.material:material:1.5.0'
     // Remote dependencies
     implementation 'com.androidplot:androidplot-core:1.5.11'

app/src/main/java/android/support/v4/view/CustomViewPager.java

@@ -1,151 +0,0 @@
-package android.support.v4.view;
-
-import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-//import android.support.v4.os.ParcelableCompat;
-import androidx.core.os.ParcelableCompat;
-//import android.support.v4.os.ParcelableCompatCreatorCallbacks;
-import androidx.core.os.ParcelableCompatCreatorCallbacks;
-
-import androidx.viewpager.widget.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.widget.Toast;
-
-import net.i2p.android.router.R;
-import net.i2p.android.router.util.Util;
-
-public class CustomViewPager extends ViewPager {
-    private boolean mEnabled;
-    private int mFixedPage;
-    private int mFixedPageString;
-
-    public CustomViewPager(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mEnabled = false;
-        mFixedPage = -1;
-        mFixedPageString = 0;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        return mEnabled && mFixedPage < 0 && super.onTouchEvent(event);
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent event) {
-        // See Nov. 20, 2013 comment at:
-        // https://github.com/JakeWharton/ViewPagerIndicator/pull/257
-        // Our ticket #2488
-
-        // prevent NPE if fake dragging and touching ViewPager
-        if(isFakeDragging()) return false;
-
-        return mEnabled && mFixedPage < 0 && super.onInterceptTouchEvent(event);
-    }
-
-    @Override
-    public void setCurrentItem(int item) {
-        if ((mEnabled && (mFixedPage < 0 || item == mFixedPage))
-                || (!mEnabled && item == 0))
-            super.setCurrentItem(item);
-        else if (!mEnabled)
-            Toast.makeText(getContext(), Util.getRouterContext() == null ?
-                    R.string.router_not_running : R.string.router_shutting_down,
-                    Toast.LENGTH_SHORT).show();
-        else if (mFixedPageString > 0)
-            Toast.makeText(getContext(), getContext().getString(mFixedPageString),
-                    Toast.LENGTH_SHORT).show();
-    }
-
-    public void setPagingEnabled(boolean enabled) {
-        mEnabled = enabled;
-        updatePagingState();
-    }
-
-    public void setFixedPage(int page, int res) {
-        mFixedPage = page;
-        mFixedPageString = res;
-        updatePagingState();
-    }
-
-    public void updatePagingState() {
-        if (mEnabled) {
-            if (mFixedPage >= 0 && getCurrentItem() != mFixedPage)
-                setCurrentItem(mFixedPage);
-
-        } else if (getCurrentItem() != 0)
-            setCurrentItem(0);
-    }
-
-    public static class SavedState extends ViewPager.SavedState {
-        boolean enabled;
-        int fixedPage;
-        int fixedPageString;
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        @Override
-        public void writeToParcel(Parcel out, int flags) {
-            super.writeToParcel(out, flags);
-            out.writeInt(enabled ? 1 : 0);
-            out.writeInt(fixedPage);
-            out.writeInt(fixedPageString);
-        }
-
-        @Override
-        public String toString() {
-            return "CustomViewPager.SavedState{"
-                    + Integer.toHexString(System.identityHashCode(this))
-                    + " enabled=" + enabled + " fixedPage=" + fixedPage + "}";
-        }
-
-        public static final Parcelable.Creator<SavedState> CREATOR
-                = ParcelableCompat.newCreator(new ParcelableCompatCreatorCallbacks<SavedState>() {
-            @Override
-            public SavedState createFromParcel(Parcel in, ClassLoader loader) {
-                return new SavedState(in, loader);
-            }
-
-            @Override
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        });
-
-        SavedState(Parcel in, ClassLoader loader) {
-            super(in, loader);
-            enabled = in.readInt() != 0;
-            fixedPage = in.readInt();
-            fixedPageString = in.readInt();
-        }
-    }
-
-    @Override
-    public Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        SavedState ss = new SavedState(superState);
-        ss.enabled = mEnabled;
-        ss.fixedPage = mFixedPage;
-        ss.fixedPageString = mFixedPageString;
-        return ss;
-    }
-
-    @Override
-    public void onRestoreInstanceState(Parcelable state) {
-        if (!(state instanceof SavedState)) {
-            super.onRestoreInstanceState(state);
-            return;
-        }
-
-        SavedState ss = (SavedState)state;
-        super.onRestoreInstanceState(ss.getSuperState());
-
-        mEnabled = ss.enabled;
-        mFixedPage = ss.fixedPage;
-        mFixedPageString = ss.fixedPageString;
-    }
-}

app/src/main/java/net/i2p/android/I2PActivity.java

@@ -29,7 +29,7 @@ import net.i2p.android.router.service.State;
 import net.i2p.android.router.util.Connectivity;
 import net.i2p.android.router.util.Util;
 import net.i2p.android.util.MemoryFragmentPagerAdapter;
-import android.support.v4.view.CustomViewPager;
+import androidx.viewpager.widget.CustomViewPager;
 import net.i2p.android.widget.SlidingTabLayout;
 import net.i2p.router.RouterContext;
 

app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailActivity.java

@@ -2,8 +2,10 @@ package net.i2p.android.i2ptunnel;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
+//import android.support.v4.app.ActivityCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import net.i2p.android.I2PActivityBase;

app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java

@@ -11,11 +11,16 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+//import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v4.view.ViewCompat;
+//import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java

@@ -2,9 +2,12 @@ package net.i2p.android.i2ptunnel;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.util.Pair;
+//import android.support.v4.util.Pair;
-import android.support.v4.view.ViewCompat;
+import androidx.core.util.Pair;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryLoader.java

@@ -2,7 +2,8 @@ package net.i2p.android.i2ptunnel;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.android.router.util.Util;
 import net.i2p.i2ptunnel.TunnelController;

app/src/main/java/net/i2p/android/i2ptunnel/TunnelListFragment.java

@@ -6,13 +6,20 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
+import androidx.fragment.app.Fragment;
-import android.support.v4.content.Loader;
+//import android.support.v4.app.LoaderManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.loader.app.LoaderManager;
-import android.support.v4.util.Pair;
+//import android.support.v4.content.Loader;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.loader.content.Loader;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
+//import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/i2ptunnel/TunnelWizardActivity.java

@@ -7,8 +7,10 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+//import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import net.i2p.android.router.R;
 import net.i2p.android.wizard.model.AbstractWizardModel;

app/src/main/java/net/i2p/android/i2ptunnel/TunnelsContainer.java

@@ -3,13 +3,20 @@ package net.i2p.android.i2ptunnel;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
+//import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.FragmentManager;
+import androidx.core.app.ActivityOptionsCompat;
-import android.support.v4.app.FragmentPagerAdapter;
+//import android.support.v4.app.Fragment;
-import android.support.v4.util.Pair;
+import androidx.fragment.app.Fragment;
-import android.support.v4.view.ViewPager;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
+//import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
+//import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/AdvancedTunnelPreferenceFragment.java

@@ -3,11 +3,16 @@ package net.i2p.android.i2ptunnel.preferences;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+//import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.CheckBoxPreference;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.preference.Preference;
+//import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 
 import net.i2p.android.i2ptunnel.util.TunnelLogic;
 import net.i2p.android.i2ptunnel.util.TunnelUtil;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/BaseTunnelPreferenceFragment.java

@@ -2,9 +2,12 @@ package net.i2p.android.i2ptunnel.preferences;
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
+//import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.PreferenceGroup;
+import androidx.preference.PreferenceGroup;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 import android.widget.Toast;
 
 import net.i2p.android.i2ptunnel.util.SaveTunnelTask;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/EditTunnelActivity.java

@@ -2,10 +2,14 @@ package net.i2p.android.i2ptunnel.preferences;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+//import android.support.v4.app.FragmentManager;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.i2ptunnel.TunnelDetailActivity;
 import net.i2p.android.i2ptunnel.TunnelDetailFragment;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/EditTunnelContainerFragment.java

@@ -1,9 +1,12 @@
 package net.i2p.android.i2ptunnel.preferences;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/i2ptunnel/preferences/GeneralTunnelPreferenceFragment.java

@@ -5,13 +5,20 @@ import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.Fragment;
-import android.support.v7.preference.CheckBoxPreference;
+//import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.ListPreference;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.preference.Preference;
+//import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.ListPreference;
+import androidx.preference.ListPreference;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
+//import android.support.v7.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 
 import net.i2p.android.i2ptunnel.util.TunnelLogic;
 import net.i2p.android.i2ptunnel.util.TunnelUtil;

app/src/main/java/net/i2p/android/preferences/GraphsPreferenceFragment.java

@@ -3,13 +3,13 @@ package net.i2p.android.preferences;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 //import android.support.v7.preference.CheckBoxPreference;
-import android.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
 //import android.support.v7.preference.PreferenceCategory;
-import android.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
 //import android.support.v7.preference.PreferenceManager;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 //import android.support.v7.preference.PreferenceScreen;
-import android.preference.PreferenceScreen;
+import androidx.preference.PreferenceScreen;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;

app/src/main/java/net/i2p/android/preferences/TransportsPreferenceFragment.java

@@ -4,11 +4,14 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-/*import android.support.v7.preference.CheckBoxPreference;
+//import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
+//import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
+//import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;*/
+//import android.support.v7.preference.PreferenceScreen;
 import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
 
 import android.widget.Toast;
 

app/src/main/java/net/i2p/android/preferences/util/ConnectionLimitPreference.java

@@ -3,7 +3,7 @@ package net.i2p.android.preferences.util;
 import android.content.Context;
 import android.content.res.TypedArray;
 //import android.support.v7.preference.EditTextPreference;
-import android.preference.EditTextPreference;
+import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/widget/DividerItemDecoration.java

@@ -21,8 +21,10 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.LinearLayoutManager;
+//import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class DividerItemDecoration extends RecyclerView.ItemDecoration {

app/src/main/java/net/i2p/android/widget/DrawShadowFrameLayout.java

@@ -23,7 +23,8 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
-import android.support.v4.view.ViewCompat;
+//import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;