Migrate to Jetpack

app/build.gradle

@@ -19,6 +19,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-v4:23.4.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation files('libs/slf4j-android-1.6.1-RC1.jar')
 }

app/src/main/java/org/pyload/android/client/RemoteSettings.java

@@ -1,7 +1,7 @@
 package org.pyload.android.client;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.MenuItem;
 
 public class RemoteSettings extends FragmentActivity {

app/src/main/java/org/pyload/android/client/components/ExpandableListFragment.java

@@ -1,7 +1,7 @@
 package org.pyload.android.client.components;
 
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.ContextMenu;

app/src/main/java/org/pyload/android/client/components/FragmentPagerAdapter.java

@@ -17,15 +17,15 @@
 package org.pyload.android.client.components;
 
 import android.os.Parcelable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.PagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.viewpager.widget.PagerAdapter;
 import android.util.Log;
 import android.view.View;
 
 /**
- * Implementation of {@link android.support.v4.view.PagerAdapter} that
+ * Implementation of {@link PagerAdapter} that
  * represents each page as a {@link Fragment} that is persistently kept in the
  * fragment manager as long as the user can return to the page.
  */

app/src/main/java/org/pyload/android/client/components/FragmentTabsPager.java

@@ -22,9 +22,9 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 import android.view.Window;
 import android.widget.TabHost;
@@ -72,8 +72,8 @@ public int getCurrentTab() {
 	public Fragment getCurrentFragment() {
 		return mTabsAdapter.getFragment(getCurrentTab());
 	}
-	
-	
+
+
 	/**
 	 * This is a helper class that implements the management of tabs and all
 	 * details of connecting a ViewPager with associated TabHost. It relies on a
@@ -150,16 +150,16 @@ public int getCount() {
 		@Override
 		public Fragment getItem(int position) {
 			TabInfo info = mTabs.get(position);
-		
+
 			Fragment frag = Fragment.instantiate(mContext,
 					info.clss.getName(), info.args);
-			
+
 			((TabHandler) frag).setPosition(position);
-			
+
 			return frag;
 		}
-	
-	
+
+
 		@Override
 		public void onTabChanged(String tabId) {
 			int position = mTabHost.getCurrentTab();
@@ -173,7 +173,7 @@ public void onPageScrolled(int position, float positionOffset,
 
 		@Override
 		public void onPageSelected(int position) {
-			
+
 			Fragment pos = getFragment(position);
 			if (pos != null)
 				((TabHandler) pos).onSelected();

app/src/main/java/org/pyload/android/client/dialogs/AccountDialog.java

@@ -4,7 +4,7 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/pyload/android/client/dialogs/CaptchaDialog.java

@@ -11,7 +11,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;

app/src/main/java/org/pyload/android/client/dialogs/FileInfoDialog.java

@@ -6,7 +6,7 @@
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/pyload/android/client/fragments/ConfigSectionFragment.java

@@ -13,7 +13,7 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.InputType;
 import android.text.method.PasswordTransformationMethod;
 import android.util.Log;

app/src/main/java/org/pyload/android/client/fragments/OverviewFragment.java

@@ -26,8 +26,8 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.NotificationCompat;
+import androidx.fragment.app.ListFragment;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;

app/src/main/java/org/pyload/android/client/fragments/SettingsFragment.java

@@ -15,9 +15,9 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.app.ListFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.fragment.app.ListFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/pyload/android/client/pyLoad.java

@@ -31,7 +31,7 @@
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.TabHost;
-import android.support.v4.view.MenuItemCompat;
+import androidx.core.view.MenuItemCompat;
 
 public class pyLoad extends FragmentTabsPager
 {

app/src/main/java/org/pyload/android/client/pyLoadApp.java

@@ -39,7 +39,7 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.widget.Toast;
 

app/src/main/res/layout/fragment_tabs_pager.xml

@@ -42,7 +42,7 @@
             android:layout_height="0dp"
             android:layout_weight="0"/>
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="wrap_content"
             android:layout_height="0dp"

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true