Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.android.base into i2p-android-2.8.0-androidx

app/build.gradle

@@ -7,6 +7,7 @@ repositories {
 }
 
 android {
+    namespace 'net.i2p.android.router'
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     defaultConfig {
         versionCode Integer.parseInt(project.I2P_ANDROID_VERSION_CODE as String)
@@ -65,21 +66,27 @@ android {
 }
 
 dependencies {
+    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "androidx.preference:preference:1.2.0"
+    implementation "androidx.annotation:annotation:1.5.0"
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     // Local dependencies
     implementation project(':lib:client')
     implementation project(':lib:helper')
     implementation project(path: ':routerjars', configuration: 'routerjars')
     // Android Support Repository dependencies
-    def supportVersion = '28.0.0'
+    /*def supportVersion = '28.0.0'
     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.9.0'
     // Remote dependencies
     implementation 'com.androidplot:androidplot-core:1.5.11'
     implementation 'com.eowise:recyclerview-stickyheaders:0.5.2@aar'
-    implementation 'com.inkapplications.viewpageindicator:library:2.4.3'
+    //implementation 'com.inkapplications.viewpageindicator:library:2.4.4'
+    implementation 'com.github.hackware1993:MagicIndicator:1.7.0' // for androidx
     implementation 'com.pnikosis:materialish-progress:1.7'
     implementation "net.i2p:router:$I2P_VERSION"
     implementation "net.i2p:i2p:$I2P_VERSION"
@@ -94,11 +101,30 @@ dependencies {
 }
 
 dependencies {
+    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "androidx.preference:preference:1.2.0"
+    implementation "androidx.annotation:annotation:1.5.0"
     implementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'androidx.test.ext:junit:1.2.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 
+dependencies {
+    // ...existing code...
+    
+    // Force consistent lifecycle versions
+    implementation('androidx.lifecycle:lifecycle-viewmodel:2.5.1')
+    implementation('androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1')
+    
+    // Exclude older versions
+    configurations.all {
+        resolutionStrategy {
+            force 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
+            force 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+        }
+    }
+}
+
 project.ext.i2pbase = "../i2p.i2p"
 def Properties props = new Properties()
 def propFile = new File(project(':routerjars').projectDir, 'local.properties')

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <!-- following two are for UPnP -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
@@ -29,7 +30,10 @@
             android:icon="@drawable/ic_launcher_itoopie"
             android:enabled="true"
             android:exported="true"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:foregroundServiceType="specialUse">
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="i2p_router_background_process_required_network_operation"/>
             <intent-filter>
                 <action android:name="net.i2p.android.router.service.IRouterState" />
             </intent-filter>

app/src/main/java/androidx/viewpager/widget/CustomViewPager.java

@@ -1,10 +1,15 @@
-package android.support.v4.view;
+//package android.support.v4.view;
+package androidx.viewpager.widget;
 
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
+//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;

app/src/main/java/com/pavelsikun/seekbarpreference/MaterialSeekBarController.java

@@ -2,9 +2,10 @@ package com.pavelsikun.seekbarpreference;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;

app/src/main/java/com/pavelsikun/seekbarpreference/SeekBarPreference.java

@@ -4,9 +4,11 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.annotation.NonNull;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 
 import net.i2p.android.router.R;

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

@@ -5,10 +5,14 @@ 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.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -25,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/I2PActivityBase.java

@@ -6,7 +6,8 @@ import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v7.app.AppCompatActivity;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import net.i2p.android.router.service.RouterBinder;
 import net.i2p.android.router.service.RouterService;

app/src/main/java/net/i2p/android/help/Browser.java

@@ -6,7 +6,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.HashSet;

app/src/main/java/net/i2p/android/help/BrowserAdapter.java

@@ -6,7 +6,8 @@ import android.content.Intent;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.net.Uri;
-import android.support.v7.widget.RecyclerView;
+//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/help/BrowserConfigActivity.java

@@ -1,8 +1,10 @@
 package net.i2p.android.help;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/help/BrowserListFragment.java

@@ -8,11 +8,16 @@ import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//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/help/HelpActivity.java

@@ -2,10 +2,14 @@ package net.i2p.android.help;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
-import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.NavUtils;
+import androidx.core.app.NavUtils;
+//import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 

app/src/main/java/net/i2p/android/help/HelpHtmlFragment.java

@@ -1,7 +1,8 @@
 package net.i2p.android.help;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/help/HelpListFragment.java

@@ -2,7 +2,8 @@ package net.i2p.android.help;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;

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.v7.widget.Toolbar;
+//import android.support.v4.app.ActivityCompat;
+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

@@ -10,12 +10,17 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//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.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
+//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.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.util.Pair;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//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

@@ -6,9 +6,11 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+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

@@ -1,15 +1,23 @@
 package net.i2p.android.i2ptunnel;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.util.Pair;
-import android.support.v4.view.ViewPager;
+//import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
+//import android.support.v4.app.ActivityOptionsCompat;
+import androidx.core.app.ActivityOptionsCompat;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//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;
@@ -19,7 +27,17 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.Toast;
 
-import com.viewpagerindicator.TitlePageIndicator;
+import com.google.android.material.tabs.TabLayout;
+import net.lucode.hackware.magicindicator.MagicIndicator;
+import net.lucode.hackware.magicindicator.ViewPagerHelper;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
+import androidx.core.content.ContextCompat;
 
 import net.i2p.android.i2ptunnel.preferences.EditTunnelContainerFragment;
 import net.i2p.android.i2ptunnel.util.TunnelUtil;
@@ -52,7 +70,7 @@ public class TunnelsContainer extends Fragment implements
     private boolean mTwoPane;
 
     ViewPager mViewPager;
-    TitlePageIndicator mPageIndicator;
+    MagicIndicator mPageIndicator;
     FragmentPagerAdapter mFragPagerAdapter;
 
     private static final String FRAGMENT_CLIENT = "client_fragment";
@@ -81,15 +99,17 @@ public class TunnelsContainer extends Fragment implements
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.container_tunnels, container, false);
 
-        mViewPager = (ViewPager) v.findViewById(R.id.pager);
-        mPageIndicator = (TitlePageIndicator) v.findViewById(R.id.page_indicator);
-        mNewTunnel = (ImageButton) v.findViewById(R.id.promoted_action);
+        mViewPager = v.findViewById(R.id.pager);
+        mPageIndicator = v.findViewById(R.id.magic_indicator);
+        
+        mNewTunnel = v.findViewById(R.id.promoted_action);
         mNewTunnel.setVisibility(showActions() ? View.VISIBLE : View.GONE);
 
+        // Initialize ViewPager adapter
+        mFragPagerAdapter = new TunnelsPagerAdapter(getChildFragmentManager());
+        mViewPager.setAdapter(mFragPagerAdapter);
+
         if (v.findViewById(R.id.detail_fragment) != null) {
-            // The detail container view will be present only in the
-            // large-screen layouts (res/values-w720dp). If this view
-            // is present, then the activity should be in two-pane mode.
             mTwoPane = true;
         }
 
@@ -100,6 +120,8 @@ public class TunnelsContainer extends Fragment implements
                     savedInstanceState, FRAGMENT_SERVER);
         }
 
+        setupMagicIndicator();
+
         return v;
     }
 
@@ -107,12 +129,13 @@ public class TunnelsContainer extends Fragment implements
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         
+        // Initialize ViewPager and adapter
         mFragPagerAdapter = new TunnelsPagerAdapter(getChildFragmentManager());
         mViewPager.setAdapter(mFragPagerAdapter);
 
-        // Bind the page indicator to the pager.
-        mPageIndicator.setViewPager(mViewPager);
+        setupMagicIndicator();
 
+        // Setup New Tunnel button
         mNewTunnel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -311,4 +334,54 @@ public class TunnelsContainer extends Fragment implements
             }
         }
     }
+
+    private void setupMagicIndicator() {
+        if (mPageIndicator == null || getContext() == null) {
+            return;
+        }
+    
+        CommonNavigator commonNavigator = new CommonNavigator(getContext());
+        commonNavigator.setAdjustMode(true);  // Add this line for better spacing
+        commonNavigator.setAdapter(new CommonNavigatorAdapter() {
+            @Override
+            public int getCount() {
+                return mFragPagerAdapter.getCount();
+            }
+    
+            @Override
+            public IPagerTitleView getTitleView(Context context, final int index) {
+                SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
+                simplePagerTitleView.setText(mFragPagerAdapter.getPageTitle(index));
+                simplePagerTitleView.setTextSize(16); // Add this line to increase text size
+                simplePagerTitleView.setNormalColor(ContextCompat.getColor(context, 
+                    R.color.primary_text_disabled_material_dark));
+                simplePagerTitleView.setSelectedColor(ContextCompat.getColor(context,
+                    R.color.primary_text_default_material_dark));
+                simplePagerTitleView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mViewPager.setCurrentItem(index);
+                    }
+                });
+                return simplePagerTitleView;
+            }
+    
+            @Override
+            public IPagerIndicator getIndicator(Context context) {
+                LinePagerIndicator indicator = new LinePagerIndicator(context);
+                indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
+                indicator.setColors(ContextCompat.getColor(context, R.color.primary));
+                indicator.setLineHeight(dpToPx(context, 3));
+                return indicator;
+            }
+        });
+    
+        mPageIndicator.setNavigator(commonNavigator);
+        ViewPagerHelper.bind(mPageIndicator, mViewPager);
+    }
+    
+    private int dpToPx(Context context, int dp) {
+        float density = context.getResources().getDisplayMetrics().density;
+        return Math.round(dp * density);
+    }
 }

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.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+//import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
+//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.PreferenceGroup;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//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.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+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.FragmentManager;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//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.v7.app.AlertDialog;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+//import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
+//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/AdvancedPreferenceFragment.java

@@ -1,8 +1,10 @@
 package net.i2p.android.preferences;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.preference.Preference;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;

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

@@ -2,10 +2,14 @@ package net.i2p.android.preferences;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.CheckBoxPreference;
+import androidx.preference.CheckBoxPreference;
+//import android.support.v7.preference.PreferenceCategory;
+import androidx.preference.PreferenceCategory;
+//import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
+//import android.support.v7.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/LoggingPreferenceFragment.java

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences;
 
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.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,10 +4,15 @@ 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.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.preference.PreferenceScreen;
+//import android.support.v7.preference.CheckBoxPreference;
+//import android.support.v7.preference.Preference;
+//import android.support.v7.preference.PreferenceManager;
+//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;
 
 import net.i2p.android.router.R;

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

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

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.os.Bundle;
-import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+//import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+import androidx.preference.EditTextPreferenceDialogFragmentCompat;
 import android.text.InputType;
 import android.view.View;
 import android.widget.EditText;

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

@@ -1,8 +1,9 @@
 package net.i2p.android.preferences.util;
 
-import android.support.v4.app.DialogFragment;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 
 /**
  * Handles custom Preferences.

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.content.Context;
-import android.support.v7.preference.EditTextPreference;
+//import android.support.v7.preference.EditTextPreference;
+import androidx.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 public class IntEditTextPreference extends EditTextPreference {

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.os.Bundle;
-import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+//import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+import androidx.preference.EditTextPreferenceDialogFragmentCompat;
 import android.text.InputType;
 import android.view.View;
 import android.widget.EditText;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.content.Context;
-import android.support.v7.preference.ListPreference;
+//import android.support.v7.preference.ListPreference;
+import android.preference.ListPreference;
 import android.util.AttributeSet;
 
 public class IntListPreference extends ListPreference {

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

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

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.os.Bundle;
-import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+//import android.support.v7.preference.EditTextPreferenceDialogFragmentCompat;
+import androidx.preference.EditTextPreferenceDialogFragmentCompat;
 import android.text.InputType;
 import android.view.View;
 import android.widget.EditText;

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

@@ -1,7 +1,8 @@
 package net.i2p.android.preferences.util;
 
 import android.content.Context;
-import android.support.v7.preference.EditTextPreference;
+//import android.support.v7.preference.EditTextPreference;
+import android.preference.EditTextPreference;
 import android.util.AttributeSet;
 
 public class SummaryEditTextPreference extends EditTextPreference {

app/src/main/java/net/i2p/android/router/ConsoleContainer.java

@@ -3,7 +3,8 @@ package net.i2p.android.router;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/net/i2p/android/router/I2PFragmentBase.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import net.i2p.android.router.util.Util;
 import net.i2p.router.CommSystemFacade;

app/src/main/java/net/i2p/android/router/LicenseActivity.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 

app/src/main/java/net/i2p/android/router/LicenseFragment.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;

app/src/main/java/net/i2p/android/router/MainFragment.java

@@ -14,8 +14,10 @@ import android.os.Handler;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AlertDialog;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.AndroidRuntimeException;
 import android.view.Gravity;
 import android.view.LayoutInflater;

app/src/main/java/net/i2p/android/router/NewsActivity.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 

app/src/main/java/net/i2p/android/router/SettingsActivity.java

@@ -3,13 +3,20 @@ package net.i2p.android.router;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.preference.Preference;
+import androidx.preference.Preference;
+//import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivity;
 import net.i2p.android.preferences.AdvancedPreferenceFragment;

app/src/main/java/net/i2p/android/router/addressbook/AddressEntryAdapter.java

@@ -1,8 +1,9 @@
 package net.i2p.android.router.addressbook;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+//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/router/addressbook/AddressEntryLoader.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.addressbook;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.android.router.util.NamingServiceUtil;
 import net.i2p.android.router.util.Util;

app/src/main/java/net/i2p/android/router/addressbook/AddressbookAddWizardActivity.java

@@ -6,9 +6,11 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import net.i2p.android.wizard.model.AbstractWizardModel;
 import net.i2p.android.wizard.ui.AbstractWizardActivity;

app/src/main/java/net/i2p/android/router/addressbook/AddressbookContainer.java

@@ -6,13 +6,21 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.SearchView;
+//import android.support.v4.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+//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.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
+//import android.support.v4.view.MenuItemCompat;
+import androidx.core.view.MenuItemCompat;
+//import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
+//import android.support.v7.widget.SearchView;
+import androidx.appcompat.widget.SearchView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -20,18 +28,27 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.viewpagerindicator.TitlePageIndicator;
+import net.lucode.hackware.magicindicator.MagicIndicator;
+import net.lucode.hackware.magicindicator.ViewPagerHelper;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.util.NamingServiceUtil;
 import net.i2p.android.router.util.Util;
 import net.i2p.client.naming.NamingService;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView;
 
 public class AddressbookContainer extends Fragment
         implements AddressbookFragment.OnAddressSelectedListener,
         SearchView.OnQueryTextListener {
     public static final int ADD_WIZARD_REQUEST = 1;
     public static final String ADD_WIZARD_DATA = "add_wizard_data";
+    private MagicIndicator mPageIndicator;
 
     /**
      * Whether or not the container is in two-pane mode, i.e. running on a tablet
@@ -41,7 +58,6 @@ public class AddressbookContainer extends Fragment
 
     ViewPager mViewPager;
     FragmentPagerAdapter mFragPagerAdapter;
-
     private static final String FRAGMENT_ROUTER = "router_fragment";
     private static final String FRAGMENT_PRIVATE = "private_fragment";
     private static final int FRAGMENT_ID_ROUTER = 0;
@@ -67,6 +83,17 @@ public class AddressbookContainer extends Fragment
             mTwoPane = true;
         }
     
+        if (!mTwoPane) {
+            // Initialize ViewPager and adapter first
+            mViewPager = (ViewPager) v.findViewById(R.id.pager);
+            mFragPagerAdapter = new AddressbookPagerAdapter(getActivity(), getChildFragmentManager());
+            mViewPager.setAdapter(mFragPagerAdapter);
+            
+            // Then set up MagicIndicator
+            mPageIndicator = v.findViewById(R.id.magic_indicator);
+            setupMagicIndicator();
+        }
+
         if (savedInstanceState != null) {
             mRouterFrag = (AddressbookFragment) getChildFragmentManager().getFragment(
                     savedInstanceState, FRAGMENT_ROUTER);
@@ -90,14 +117,6 @@ public class AddressbookContainer extends Fragment
             ft.commit();
         }
 
-        if (!mTwoPane) {
-            mViewPager = (ViewPager) v.findViewById(R.id.pager);
-            TitlePageIndicator pageIndicator = (TitlePageIndicator) v.findViewById(R.id.page_indicator);
-            mFragPagerAdapter = new AddressbookPagerAdapter(getActivity(), getChildFragmentManager());
-            mViewPager.setAdapter(mFragPagerAdapter);
-            pageIndicator.setViewPager(mViewPager);
-        }
-
         return v;
     }
 
@@ -250,4 +269,38 @@ public class AddressbookContainer extends Fragment
         if (mPrivateFrag != null)
             mPrivateFrag.filterAddresses(query);
     }
+
+    private void setupMagicIndicator() {
+        if (mPageIndicator == null || mFragPagerAdapter == null || mViewPager == null) {
+            return;
+        }
+    
+        CommonNavigator commonNavigator = new CommonNavigator(getContext());
+        commonNavigator.setAdapter(new CommonNavigatorAdapter() {
+            @Override
+            public int getCount() {
+                return mFragPagerAdapter.getCount();
+            }
+    
+            @Override
+            public IPagerTitleView getTitleView(Context context, int index) {
+                SimplePagerTitleView titleView = new ColorTransitionPagerTitleView(context);
+                titleView.setText(mFragPagerAdapter.getPageTitle(index));
+                titleView.setNormalColor(ContextCompat.getColor(context, R.color.primary_text_disabled_material_dark));
+                titleView.setSelectedColor(ContextCompat.getColor(context, R.color.primary_text_default_material_dark));
+                titleView.setOnClickListener(v -> mViewPager.setCurrentItem(index));
+                return titleView;
+            }
+    
+            @Override
+            public IPagerIndicator getIndicator(Context context) {
+                LinePagerIndicator indicator = new LinePagerIndicator(context);
+                indicator.setColors(ContextCompat.getColor(context, R.color.primary));
+                return indicator;
+            }
+        });
+    
+        mPageIndicator.setNavigator(commonNavigator);
+        ViewPagerHelper.bind(mPageIndicator, mViewPager);
+    }
 }

app/src/main/java/net/i2p/android/router/addressbook/AddressbookFragment.java

@@ -6,12 +6,18 @@ 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.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+//import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;

app/src/main/java/net/i2p/android/router/addressbook/AddressbookSettingsActivity.java

@@ -2,8 +2,10 @@ package net.i2p.android.router.addressbook;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;

app/src/main/java/net/i2p/android/router/dialog/AboutDialog.java

@@ -4,9 +4,11 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/net/i2p/android/router/dialog/FirstStartDialog.java

@@ -7,9 +7,11 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/net/i2p/android/router/dialog/TextResourceDialog.java

@@ -4,9 +4,11 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;

app/src/main/java/net/i2p/android/router/dialog/VersionDialog.java

@@ -3,9 +3,11 @@ package net.i2p.android.router.dialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import net.i2p.android.I2PActivityBase;
 import net.i2p.android.router.MainFragment;

app/src/main/java/net/i2p/android/router/log/LogActivity.java

@@ -3,7 +3,8 @@ package net.i2p.android.router.log;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/net/i2p/android/router/log/LogDetailActivity.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.log;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/router/log/LogFragment.java

@@ -4,9 +4,12 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/net/i2p/android/router/log/LogLoader.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.log;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.I2PAppContext;
 

app/src/main/java/net/i2p/android/router/netdb/NetDbActivity.java

@@ -2,8 +2,10 @@ package net.i2p.android.router.netdb;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;

app/src/main/java/net/i2p/android/router/netdb/NetDbDetailActivity.java

@@ -2,7 +2,8 @@ package net.i2p.android.router.netdb;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/router/netdb/NetDbEntryLoader.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.netdb;
 
 import android.content.Context;
-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.data.Destination;

app/src/main/java/net/i2p/android/router/netdb/NetDbListFragment.java

@@ -2,9 +2,12 @@ package net.i2p.android.router.netdb;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/net/i2p/android/router/netdb/NetDbStatsLoader.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.netdb;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import net.i2p.android.router.R;
 import net.i2p.data.Hash;

app/src/main/java/net/i2p/android/router/netdb/NetDbSummaryPagerFragment.java

@@ -1,12 +1,18 @@
 package net.i2p.android.router.netdb;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.view.ViewPager;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+//import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
+//import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
+//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/router/netdb/NetDbSummaryTableFragment.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.netdb;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/router/service/AndroidSAMSecureSession.java

@@ -4,7 +4,10 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.os.Handler;
+import android.os.Looper;
+import java.util.concurrent.CountDownLatch;
+import androidx.appcompat.app.AppCompatActivity;
 
 import net.i2p.android.I2PActivity;
 import net.i2p.android.I2PActivityBase;
@@ -22,6 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+
 /**
  * Implements SAMSecureSessionInterface on Android platforms using a Toast
  * as the interactive channel.
@@ -45,12 +49,35 @@ public class AndroidSAMSecureSession extends AppCompatActivity implements SAMSec
         results.put(clientId, 1);
     }
 
-    public AndroidSAMSecureSession(Context ctx, RouterService rCtx, StatusBar statusBar) {
+    private AndroidSAMSecureSession(Context ctx, RouterService rCtx, StatusBar statusBar) {
         mCtx = ctx;
         _routerService = rCtx;
         _statusBar = statusBar;
     }
 
+    public static AndroidSAMSecureSession create(Context ctx, RouterService rCtx, StatusBar statusBar) {
+        if (Looper.getMainLooper().getThread() == Thread.currentThread()) {
+            // We're on the main thread, create directly
+            return new AndroidSAMSecureSession(ctx, rCtx, statusBar);
+        } else {
+            // We're not on the main thread, post to main thread
+            final AndroidSAMSecureSession[] result = new AndroidSAMSecureSession[1];
+            final CountDownLatch latch = new CountDownLatch(1);
+            
+            new Handler(Looper.getMainLooper()).post(() -> {
+                result[0] = new AndroidSAMSecureSession(ctx, rCtx, statusBar);
+                latch.countDown();
+            });
+
+            try {
+                latch.await();
+                return result[0];
+            } catch (InterruptedException e) {
+                throw new RuntimeException("Failed to create AndroidSAMSecureSession", e);
+            }
+        }
+    }
+
     private void waitForResult(String clientId) {
         for (int i=0;i<60;i++) {
             try {

app/src/main/java/net/i2p/android/router/service/LoadClientsJob.java

@@ -180,7 +180,8 @@ class LoadClientsJob extends JobImpl {
             try {
                 Util.i("Starting the SAM API");
                 Looper.prepare();
-                AndroidSAMSecureSession _androidSecureSession = new AndroidSAMSecureSession(mCtx, _routerService, _statusBar);
+                //AndroidSAMSecureSession _androidSecureSession = new AndroidSAMSecureSession(mCtx, _routerService, _statusBar);
+                AndroidSAMSecureSession _androidSecureSession = AndroidSAMSecureSession.create(mCtx, _routerService, _statusBar);
                 SAMSecureSessionInterface _secureSession = _androidSecureSession;
                 SAM_BRIDGE = new SAMBridge("127.0.0.1",
                  7656,

app/src/main/java/net/i2p/android/router/service/RouterService.java

@@ -1,5 +1,7 @@
 package net.i2p.android.router.service;
 
+import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE;
+
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -12,7 +14,8 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-import android.support.v4.content.LocalBroadcastManager;
+//import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.receiver.I2PReceiver;
@@ -173,11 +176,18 @@ public class RouterService extends Service {
         // We need to *not* check if we're restarting on Android greater than Oreo due to
         // changes in how notifications work and the use of NotificationChannels.
         if(!restart) {
-            startForeground(1337, _statusBar.getNote());
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(1337, _statusBar.getNote(), FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+            } else {
+                startForeground(1337, _statusBar.getNote());
+            }
         } else {
             if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
                 startForeground(1337, _statusBar.getNote());
             }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                startForeground(1337, _statusBar.getNote(), FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+            }
         }
 
 

app/src/main/java/net/i2p/android/router/service/StatusBar.java

@@ -7,7 +7,8 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+//import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.view.Gravity;
 import android.widget.Toast;
 
@@ -140,6 +141,7 @@ class StatusBar {
             mNotificationManager.createNotificationChannel(mNotificationChannel);
             mNotificationChannel.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
             mNotifyBuilder.setChannelId(NOTIFICATION_CHANNEL_ID);
+            //
         }
         mNotif = mNotifyBuilder.build();
         mNotificationManager.notify(ID, mNotif);

app/src/main/java/net/i2p/android/router/stats/PeersActivity.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.stats;
 
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+//import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 
 import net.i2p.android.I2PActivityBase;
 import net.i2p.android.router.R;

app/src/main/java/net/i2p/android/router/stats/RateGraphActivity.java

@@ -3,8 +3,10 @@ package net.i2p.android.router.stats;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
+//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.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;

app/src/main/java/net/i2p/android/router/stats/RateGraphFragment.java

@@ -3,7 +3,7 @@ package net.i2p.android.router.stats;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/router/util/BetterAsyncTaskLoader.java

@@ -1,7 +1,8 @@
 package net.i2p.android.router.util;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+//import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 public abstract class BetterAsyncTaskLoader<T> extends AsyncTaskLoader<T> {
     protected T mData;

app/src/main/java/net/i2p/android/router/util/Notifications.java

@@ -8,7 +8,8 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+//import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 public class Notifications {
     private final Context mCtx;

app/src/main/java/net/i2p/android/router/web/I2PWebViewClient.java

@@ -6,7 +6,8 @@ import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.Gravity;
 import android.view.View;
 import android.webkit.HttpAuthHandler;

app/src/main/java/net/i2p/android/util/AlphanumericHeaderAdapter.java

@@ -1,7 +1,8 @@
 package net.i2p.android.util;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+//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/util/FragmentUtils.java

@@ -1,7 +1,9 @@
 package net.i2p.android.util;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 public class FragmentUtils {
     public interface TwoPaneProvider {

app/src/main/java/net/i2p/android/util/MemoryFragmentPagerAdapter.java

@@ -1,8 +1,11 @@
 package net.i2p.android.util;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
 import android.util.SparseArray;
 import android.view.ViewGroup;
 

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.RecyclerView;
+//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.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;
 

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

@@ -1,7 +1,8 @@
 package net.i2p.android.widget;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+//import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 

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

@@ -19,8 +19,10 @@ package net.i2p.android.widget;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+//import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+//import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.util.TypedValue;

app/src/main/java/net/i2p/android/wizard/model/BranchPage.java

@@ -18,7 +18,8 @@ package net.i2p.android.wizard.model;
 
 import net.i2p.android.wizard.ui.SingleChoiceFragment;
 
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 
 import java.util.ArrayList;

app/src/main/java/net/i2p/android/wizard/model/I2PDestinationPage.java

@@ -2,7 +2,8 @@ package net.i2p.android.wizard.model;
 
 import java.util.Locale;
 
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import net.i2p.I2PAppContext;
 import net.i2p.android.wizard.ui.I2PDestinationFragment;

app/src/main/java/net/i2p/android/wizard/model/MultipleFixedChoicePage.java

@@ -18,7 +18,8 @@ package net.i2p.android.wizard.model;
 
 import net.i2p.android.wizard.ui.MultipleChoiceFragment;
 
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 

app/src/main/java/net/i2p/android/wizard/model/Page.java

@@ -18,7 +18,8 @@
 package net.i2p.android.wizard.model;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/net/i2p/android/wizard/model/SingleFixedBooleanPage.java

@@ -20,7 +20,8 @@ import java.util.ArrayList;
 
 import net.i2p.android.wizard.ui.SingleBooleanFragment;
 
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 public class SingleFixedBooleanPage extends Page {
     protected String mDesc = "";

app/src/main/java/net/i2p/android/wizard/model/SingleFixedChoicePage.java

@@ -18,7 +18,8 @@ package net.i2p.android.wizard.model;
 
 import net.i2p.android.wizard.ui.SingleChoiceFragment;
 
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 
 import java.util.ArrayList;

app/src/main/java/net/i2p/android/wizard/model/SingleTextFieldPage.java

@@ -18,7 +18,8 @@ package net.i2p.android.wizard.model;
 
 import net.i2p.android.wizard.ui.SingleTextFieldFragment;
 
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 
 import java.util.ArrayList;

app/src/main/java/net/i2p/android/wizard/ui/AbstractWizardActivity.java

@@ -1,12 +1,18 @@
 package net.i2p.android.wizard.ui;
 
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
+//import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+//import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
+//import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
+//import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+//import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/wizard/ui/I2PDestinationFragment.java

@@ -21,7 +21,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

app/src/main/java/net/i2p/android/wizard/ui/MultipleChoiceFragment.java

@@ -20,7 +20,8 @@ package net.i2p.android.wizard.ui;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.ListFragment;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/net/i2p/android/wizard/ui/ReviewFragment.java

@@ -25,7 +25,10 @@ import net.i2p.android.wizard.model.ReviewItem;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/net/i2p/android/wizard/ui/SingleBooleanFragment.java

@@ -18,7 +18,8 @@ package net.i2p.android.wizard.ui;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/wizard/ui/SingleChoiceFragment.java

@@ -24,7 +24,8 @@ import net.i2p.android.wizard.model.SingleFixedChoicePage;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.ListFragment;
+//import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/net/i2p/android/wizard/ui/SingleTextFieldFragment.java

@@ -23,7 +23,8 @@ import net.i2p.android.wizard.model.SingleTextFieldPage;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+//import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;

app/src/main/res/layout-land/activity_viewpager.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/main_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -18,7 +18,7 @@
             android:id="@+id/sliding_tabs"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <net.i2p.android.widget.DrawShadowFrameLayout
         android:layout_width="match_parent"
@@ -27,7 +27,7 @@
         android:clipChildren="false"
         app:shadowDrawable="@drawable/header_shadow">
 
-        <android.support.v4.view.CustomViewPager
+        <androidx.viewpager.widget.CustomViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

app/src/main/res/layout-land/fragment_main.xml

@@ -72,7 +72,7 @@
             </LinearLayout>
         </LinearLayout>
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/console_bottom_toolbar"
             android:layout_width="match_parent"
             android:layout_height="56dp"
@@ -130,7 +130,7 @@
                         tools:text="0.0 KBps / 0.0 KB" />
                 </LinearLayout>
             </LinearLayout>
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
     </RelativeLayout>
 
     <ScrollView