AndroidX migration

Migration to AndroidX
- Update to API level 29
- Update Java sourcecode and xml import statements
- Upgrade Butterknife Version 10 AndroidX support
- Set Java 8 compile options due Butterknife needs it

app/build.gradle

@@ -11,16 +11,16 @@ def getVersionName = { ->
 
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
-    buildToolsVersion "28.0.3"
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         applicationId "org.xbmc.kore"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 26
         versionName = getVersionName()
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         def supportedLocales = ["en", "ast", "ru", "it", "ca", "cs", "zh-CN", "ja", "pt", "pt-BR",
                                 "pl", "sl", "sk", "lt", "eu", "iw", "fr", "es", "hr", "hu", "nl",
@@ -46,12 +46,20 @@ android {
     }
 
     testOptions {
-        execution 'ANDROID_TEST_ORCHESTRATOR'
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
         unitTests {
             includeAndroidResources = true
         }
     }
 
+    /*
+     * This is just to enable Java 8 in the app
+     */
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             if (keystoreFile.exists()) {
@@ -99,18 +107,18 @@ ext {
 }
 
 dependencies {
-    implementation "com.android.support:support-v4:${supportLibVersion}"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation "com.android.support:cardview-v7:${supportLibVersion}"
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "com.android.support:preference-v14:${supportLibVersion}"
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation "com.android.support:support-v13:${supportLibVersion}"
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation "com.android.support:design:${supportLibVersion}"
+    implementation 'com.google.android.material:material:1.0.0'
-    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation "com.android.support.constraint:constraint-layout:1.1.3"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.5.2'
-    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.jakewharton:butterknife:10.2.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
     implementation 'com.squareup.okhttp:okhttp:2.3.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'de.greenrobot:eventbus:2.4.0'
@@ -120,13 +128,13 @@ dependencies {
     implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.20'
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
 
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
-    androidTestUtil 'com.android.support.test:orchestrator:1.0.2'
+    androidTestUtil 'androidx.test:orchestrator:1.1.1'
     androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
-    androidTestImplementation "com.android.support:support-v13:${supportLibVersion}"
+    androidTestImplementation 'androidx.legacy:legacy-support-v13:1.0.0'
     androidTestImplementation 'junit:junit:4.12'
 
     testImplementation 'org.robolectric:robolectric:4.3'

app/src/androidTest/java/org/xbmc/kore/testhelpers/LoaderIdlingResource.java

@@ -17,7 +17,7 @@
 package org.xbmc.kore.testhelpers;
 
 import android.support.test.espresso.IdlingResource;
-import android.support.v4.app.LoaderManager;
+import androidx.core.app.LoaderManager;
 
 public class LoaderIdlingResource implements IdlingResource {
 

app/src/androidTest/java/org/xbmc/kore/testhelpers/Utils.java

@@ -22,7 +22,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.support.test.rule.ActivityTestRule;
-import android.support.v4.widget.DrawerLayout;
+import androidx.core.widget.DrawerLayout;
 import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.Gravity;

app/src/androidTest/java/org/xbmc/kore/testhelpers/action/NestedScrollTo.java

@@ -22,7 +22,7 @@ import android.support.test.espresso.UiController;
 import android.support.test.espresso.ViewAction;
 import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.espresso.util.HumanReadables;
-import android.support.v4.widget.NestedScrollView;
+import androidx.core.widget.NestedScrollView;
 import android.view.View;
 
 import org.hamcrest.Matcher;

app/src/androidTest/java/org/xbmc/kore/testhelpers/action/ViewActions.java

@@ -24,8 +24,8 @@ import android.support.test.espresso.action.MotionEvents;
 import android.support.test.espresso.action.Press;
 import android.support.test.espresso.util.HumanReadables;
 import android.support.test.espresso.util.TreeIterables;
-import android.support.v4.view.PagerAdapter;
+import androidx.core.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.core.view.ViewPager;
 import android.view.View;
 import android.widget.SeekBar;
 

app/src/main/java/org/xbmc/kore/jsonrpc/ApiFuture.java

@@ -1,6 +1,6 @@
 package org.xbmc.kore.jsonrpc;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;

app/src/main/java/org/xbmc/kore/service/ConnectionObserversManagerService.java

@@ -22,7 +22,7 @@ import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostConnectionObserver;

app/src/main/java/org/xbmc/kore/service/NotificationObserver.java

@@ -28,8 +28,8 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
 
 import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Target;
@@ -263,7 +263,7 @@ public class NotificationObserver
                 .addAction(rewindIcon, service.getString(R.string.rewind), rewindPendingIntent) // #0
                 .addAction(playPauseIcon, service.getString(R.string.play), playPausePendingIntent)  // #1
                 .addAction(ffIcon, service.getString(R.string.fast_forward), ffPendingIntent)     // #2
-                .setStyle(new android.support.v4.media.app.NotificationCompat.MediaStyle()
+                .setStyle(new androidx.media.app.NotificationCompat.MediaStyle()
                               .setShowActionsInCompactView(0, 1, 2))
                 .setContentIntent(remoteStartPendingIntent)
                 .setContentTitle(title)

app/src/main/java/org/xbmc/kore/ui/AbstractCursorListFragment.java

@@ -22,13 +22,15 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
-import android.support.v4.app.LoaderManager;
+import androidx.annotation.Nullable;
-import android.support.v4.content.CursorLoader;
+import androidx.appcompat.widget.SearchView;
-import android.support.v4.content.Loader;
+import androidx.core.view.MenuItemCompat;
-import android.support.v4.view.MenuItemCompat;
+import androidx.loader.app.LoaderManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.loader.content.CursorLoader;
-import android.support.v7.widget.SearchView;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;

app/src/main/java/org/xbmc/kore/ui/AbstractFragment.java

@@ -17,8 +17,9 @@
 package org.xbmc.kore.ui;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 public class AbstractFragment extends Fragment {
 

app/src/main/java/org/xbmc/kore/ui/AbstractInfoFragment.java

@@ -28,13 +28,15 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
+import androidx.core.content.ContextCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.widget.NestedScrollView;
-import android.support.v4.widget.NestedScrollView;
+import androidx.fragment.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.fragment.app.FragmentManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;

app/src/main/java/org/xbmc/kore/ui/AbstractListFragment.java

@@ -20,10 +20,6 @@ import android.annotation.TargetApi;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -32,6 +28,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.ui.viewgroups.RecyclerViewEmptyViewSupport;

app/src/main/java/org/xbmc/kore/ui/AbstractSearchableFragment.java

@@ -2,11 +2,13 @@ package org.xbmc.kore.ui;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
-import android.support.v4.view.MenuItemCompat;
+import androidx.appcompat.widget.SearchView;
-import android.support.v7.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+import androidx.fragment.app.Fragment;
+
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;

app/src/main/java/org/xbmc/kore/ui/AbstractTabsFragment.java

@@ -19,12 +19,13 @@ package org.xbmc.kore.ui;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.SharedElementTransition;

app/src/main/java/org/xbmc/kore/ui/BaseActivity.java

@@ -18,7 +18,8 @@ package org.xbmc.kore.ui;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.utils.UIUtils;

app/src/main/java/org/xbmc/kore/ui/BaseMediaActivity.java

@@ -21,11 +21,6 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
 import android.view.KeyEvent;
@@ -35,6 +30,12 @@ import android.view.View;
 import android.view.Window;
 import android.widget.ImageView;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 
 import org.xbmc.kore.R;

app/src/main/java/org/xbmc/kore/ui/RecyclerViewCursorAdapter.java

@@ -17,9 +17,10 @@
 package org.xbmc.kore.ui;
 
 import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 abstract public class RecyclerViewCursorAdapter

app/src/main/java/org/xbmc/kore/ui/animators/ChangeImageFadeAnimation.java

@@ -17,12 +17,11 @@ package org.xbmc.kore.ui.animators;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
-import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
 
-import org.xbmc.kore.utils.LogUtils;
+import androidx.annotation.NonNull;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 public class ChangeImageFadeAnimation {
 

app/src/main/java/org/xbmc/kore/ui/behaviors/FABSpeedDialBehavior.java

@@ -17,9 +17,10 @@
 package org.xbmc.kore.ui.behaviors;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
-import android.support.design.widget.CoordinatorLayout;
+import androidx.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 

app/src/main/java/org/xbmc/kore/ui/behaviors/FadeOutOnVerticalScrollBehavior.java

@@ -17,9 +17,10 @@
 package org.xbmc.kore.ui.behaviors;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
-import android.support.design.widget.CoordinatorLayout;
+import androidx.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 

app/src/main/java/org/xbmc/kore/ui/generic/CastFragment.java

@@ -20,15 +20,16 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.GridLayout;
 
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.VideoType;

app/src/main/java/org/xbmc/kore/ui/generic/GenericSelectDialog.java

@@ -19,9 +19,10 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
 
 /**
  * Dialog fragment that presents a list options to the user.

app/src/main/java/org/xbmc/kore/ui/generic/NavigationDrawerFragment.java

@@ -25,10 +25,12 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
+
-import android.support.v4.view.GravityCompat;
+import androidx.appcompat.app.ActionBarDrawerToggle;
-import android.support.v4.widget.DrawerLayout;
+import androidx.core.view.GravityCompat;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.MenuItem;

app/src/main/java/org/xbmc/kore/ui/generic/RefreshItem.java

@@ -19,9 +19,10 @@ package org.xbmc.kore.ui.generic;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.widget.Toast;
 
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/generic/SendTextDialogFragment.java

@@ -19,9 +19,6 @@ import android.app.Activity;
 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 android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -30,6 +27,10 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
 import org.xbmc.kore.R;
 
 /**

app/src/main/java/org/xbmc/kore/ui/generic/VolumeControllerDialogFragmentListener.java

@@ -5,14 +5,16 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceManager;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostConnectionObserver;
@@ -190,7 +192,7 @@ public class VolumeControllerDialogFragmentListener extends AppCompatDialogFragm
 
     public static boolean handleVolumeKeyEvent(Context context, KeyEvent event) {
         boolean shouldInterceptKey =
-                android.support.v7.preference.PreferenceManager.getDefaultSharedPreferences(context)
+                PreferenceManager.getDefaultSharedPreferences(context)
                         .getBoolean(Settings.KEY_PREF_USE_HARDWARE_VOLUME_KEYS,
                                 Settings.DEFAULT_PREF_USE_HARDWARE_VOLUME_KEYS);
 

app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java

@@ -22,7 +22,6 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -33,6 +32,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonsActivity.java

@@ -18,8 +18,9 @@ package org.xbmc.kore.ui.sections.addon;
 import android.annotation.TargetApi;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.core.text.TextDirectionHeuristicsCompat;
-import android.support.v4.text.TextDirectionHeuristicsCompat;
+import androidx.fragment.app.Fragment;
+
 import android.text.TextUtils;
 import android.view.MenuItem;
 

app/src/main/java/org/xbmc/kore/ui/sections/addon/SharedElementFragment.java

@@ -1,7 +1,7 @@
 package org.xbmc.kore.ui.sections.addon;
 
-import android.support.v4.app.Fragment;
 import android.view.View;
+import androidx.fragment.app.Fragment;
 
 public abstract class SharedElementFragment extends Fragment {
     public abstract View getSharedElement();

app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumInfoFragment.java

@@ -21,13 +21,14 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;

app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumListFragment.java

@@ -15,7 +15,6 @@
  */
 package org.xbmc.kore.ui.sections.audio;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -24,8 +23,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -37,6 +34,9 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+import androidx.loader.content.CursorLoader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostInfo;

app/src/main/java/org/xbmc/kore/ui/sections/audio/AlbumSongsListFragment.java

@@ -21,10 +21,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -37,6 +33,11 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistInfoFragment.java

@@ -21,12 +21,13 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.jsonrpc.event.MediaSyncEvent;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 import org.xbmc.kore.provider.MediaContract;

app/src/main/java/org/xbmc/kore/ui/sections/audio/ArtistListFragment.java

@@ -15,14 +15,11 @@
  */
 package org.xbmc.kore.ui.sections.audio;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -32,6 +29,9 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+import androidx.loader.content.CursorLoader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/audio/AudioGenresListFragment.java

@@ -15,13 +15,11 @@
  */
 package org.xbmc.kore.ui.sections.audio;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
-import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -31,6 +29,8 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
+import androidx.loader.content.CursorLoader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicActivity.java

@@ -17,9 +17,10 @@ package org.xbmc.kore.ui.sections.audio;
 
 import android.annotation.TargetApi;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.MenuItem;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.AbstractInfoFragment;
 import org.xbmc.kore.ui.BaseMediaActivity;

app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicListFragment.java

@@ -16,11 +16,12 @@
 package org.xbmc.kore.ui.sections.audio;
 
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.viewpager.widget.ViewPager;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.AbstractCursorListFragment;
 import org.xbmc.kore.ui.AbstractTabsFragment;

app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoInfoFragment.java

@@ -21,14 +21,15 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.jsonrpc.ApiCallback;
 import org.xbmc.kore.jsonrpc.event.MediaSyncEvent;

app/src/main/java/org/xbmc/kore/ui/sections/audio/MusicVideoListFragment.java

@@ -15,13 +15,11 @@
  */
 package org.xbmc.kore.ui.sections.audio;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.BaseColumns;
-import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -29,6 +27,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.loader.content.CursorLoader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/audio/SongsListFragment.java

@@ -15,7 +15,6 @@
  */
 package org.xbmc.kore.ui.sections.audio;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.Cursor;
@@ -23,10 +22,12 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
+
-import android.support.v4.content.CursorLoader;
+import androidx.annotation.Nullable;
-import android.support.v4.view.MenuItemCompat;
+import androidx.appcompat.widget.SearchView;
-import android.support.v7.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+import androidx.loader.content.CursorLoader;
+
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;

app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesActivity.java

@@ -15,7 +15,7 @@
  */
 package org.xbmc.kore.ui.sections.favourites;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.BaseMediaActivity;

app/src/main/java/org/xbmc/kore/ui/sections/favourites/FavouritesListFragment.java

@@ -19,11 +19,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -32,6 +27,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;

app/src/main/java/org/xbmc/kore/ui/sections/file/FileActivity.java

@@ -15,7 +15,7 @@
  */
 package org.xbmc.kore.ui.sections.file;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.BaseMediaActivity;

app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java

@@ -23,7 +23,6 @@ import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.net.Uri;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -33,6 +32,8 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;

app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostActivity.java

@@ -17,11 +17,12 @@ package org.xbmc.kore.ui.sections.hosts;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentFinish.java

@@ -22,7 +22,6 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
@@ -31,6 +30,8 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.fasterxml.jackson.databind.JsonNode;
 
 import org.xbmc.kore.R;

app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentWelcome.java

@@ -17,7 +17,6 @@ package org.xbmc.kore.ui.sections.hosts;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
@@ -26,6 +25,8 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 
 /**

app/src/main/java/org/xbmc/kore/ui/sections/hosts/AddHostFragmentZeroconf.java

@@ -22,7 +22,6 @@ import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
@@ -37,6 +36,8 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.jsonrpc.HostConnection;

app/src/main/java/org/xbmc/kore/ui/sections/hosts/EditHostActivity.java

@@ -18,10 +18,11 @@ package org.xbmc.kore.ui.sections.hosts;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.ActionBar;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostFragmentManualConfiguration.java

@@ -20,7 +20,6 @@ import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,6 +30,8 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.eventclient.EventServerConnection;
 import org.xbmc.kore.host.HostInfo;

app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostListFragment.java

@@ -21,10 +21,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -39,6 +35,11 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostInfo;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/hosts/HostManagerActivity.java

@@ -17,12 +17,13 @@ package org.xbmc.kore.ui.sections.hosts;
 
 
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.BaseActivity;
 import org.xbmc.kore.ui.generic.NavigationDrawerFragment;

app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileActivity.java

@@ -16,15 +16,11 @@
  */
 package org.xbmc.kore.ui.sections.localfile;
 
-import android.Manifest;
+import androidx.fragment.app.Fragment;
-import android.content.pm.PackageManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.BaseMediaActivity;
 import org.xbmc.kore.ui.OnBackPressedListener;
-import org.xbmc.kore.ui.sections.file.FileListFragment;
 
 /**
  * Handles listing of files fragments

app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalFileListFragment.java

@@ -18,7 +18,7 @@ package org.xbmc.kore.ui.sections.localfile;
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.jsonrpc.type.ListType;

app/src/main/java/org/xbmc/kore/ui/sections/localfile/LocalMediaFileListFragment.java

@@ -22,9 +22,11 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -62,7 +64,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 
-
 /**
  * Presents a list of files of different types (Video/Music)
  */

app/src/main/java/org/xbmc/kore/ui/sections/remote/NowPlayingFragment.java

@@ -19,7 +19,6 @@ import android.app.Activity;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
@@ -36,6 +35,8 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostConnectionObserver;
 import org.xbmc.kore.host.HostInfo;

app/src/main/java/org/xbmc/kore/ui/sections/remote/PlaylistFragment.java

@@ -19,8 +19,6 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.CardView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -36,6 +34,9 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.cardview.widget.CardView;
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostConnectionObserver;
 import org.xbmc.kore.host.HostConnectionObserver.PlayerEventsObserver;

app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteActivity.java

@@ -21,12 +21,14 @@ import android.graphics.Point;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.text.TextDirectionHeuristicsCompat;
+
-import android.support.v4.view.ViewPager;
+import androidx.appcompat.app.ActionBar;
-import android.support.v4.widget.DrawerLayout;
+import androidx.appcompat.widget.Toolbar;
-import android.support.v7.app.ActionBar;
+import androidx.core.text.TextDirectionHeuristicsCompat;
-import android.support.v7.preference.PreferenceManager;
+import androidx.drawerlayout.widget.DrawerLayout;
-import android.support.v7.widget.Toolbar;
+import androidx.preference.PreferenceManager;
+import androidx.viewpager.widget.ViewPager;
+
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -78,7 +80,6 @@ import java.util.regex.Pattern;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-
 public class RemoteActivity extends BaseActivity
         implements HostConnectionObserver.PlayerEventsObserver,
         NowPlayingFragment.NowPlayingListener,

app/src/main/java/org/xbmc/kore/ui/sections/remote/RemoteFragment.java

@@ -19,8 +19,6 @@ import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +28,9 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.eventclient.ButtonCodes;

app/src/main/java/org/xbmc/kore/ui/sections/settings/AboutDialogFragment.java

@@ -8,16 +8,16 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.widget.TextView;
 
-import org.xbmc.kore.R;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
 
+import org.xbmc.kore.R;
 
 /**
  * Dialog fragment that presents about

app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsActivity.java

@@ -18,12 +18,13 @@ package org.xbmc.kore.ui.sections.settings;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.utils.LogUtils;

app/src/main/java/org/xbmc/kore/ui/sections/settings/SettingsFragment.java

@@ -24,13 +24,15 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
-import android.support.v4.app.TaskStackBuilder;
+import androidx.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.TaskStackBuilder;
-import android.support.v7.preference.ListPreference;
+import androidx.core.content.ContextCompat;
-import android.support.v7.preference.Preference;
+import androidx.preference.ListPreference;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.Preference;
-import android.support.v7.preference.TwoStatePreference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.TwoStatePreference;
+
 import android.widget.Toast;
 
 import org.xbmc.kore.BuildConfig;

app/src/main/java/org/xbmc/kore/ui/sections/video/AllCastActivity.java

@@ -19,9 +19,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -34,6 +31,10 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.VideoType;

app/src/main/java/org/xbmc/kore/ui/sections/video/MovieInfoFragment.java

@@ -21,15 +21,16 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.jsonrpc.ApiCallback;

app/src/main/java/org/xbmc/kore/ui/sections/video/MovieListFragment.java

@@ -24,7 +24,6 @@ import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
-import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -35,6 +34,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.loader.content.CursorLoader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostInfo;

app/src/main/java/org/xbmc/kore/ui/sections/video/MoviesActivity.java

@@ -17,9 +17,10 @@ package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.MenuItem;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.BaseMediaActivity;
 import org.xbmc.kore.utils.LogUtils;

app/src/main/java/org/xbmc/kore/ui/sections/video/PVRActivity.java

@@ -17,11 +17,12 @@ package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.transition.TransitionInflater;
 import android.view.MenuItem;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.BaseMediaActivity;
 import org.xbmc.kore.utils.LogUtils;

app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelEPGListFragment.java

@@ -18,8 +18,6 @@ package org.xbmc.kore.ui.sections.video;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
@@ -30,6 +28,8 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;

app/src/main/java/org/xbmc/kore/ui/sections/video/PVRChannelsListFragment.java

@@ -20,7 +20,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -34,6 +33,8 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.ApiCallback;

app/src/main/java/org/xbmc/kore/ui/sections/video/PVRListFragment.java

@@ -16,7 +16,8 @@
 package org.xbmc.kore.ui.sections.video;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.AbstractTabsFragment;

app/src/main/java/org/xbmc/kore/ui/sections/video/PVRRecordingsListFragment.java

@@ -21,7 +21,6 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -36,6 +35,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeInfoFragment.java

@@ -21,14 +21,15 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.jsonrpc.ApiCallback;
 import org.xbmc.kore.jsonrpc.event.MediaSyncEvent;

app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowEpisodeListFragment.java

@@ -25,8 +25,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.content.CursorLoader;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -37,6 +35,9 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.loader.content.CursorLoader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostInfo;
@@ -94,7 +95,9 @@ public class TVShowEpisodeListFragment extends AbstractCursorListFragment {
     @Override
     protected int getSyncItemID() { return tvshowId; };
 
-    @TargetApi(16) @Nullable @Override
+    @TargetApi(16)
+    @Nullable
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = super.onCreateView(inflater, container, savedInstanceState);
         tvshowId = getArguments().getInt(TVSHOWID, -1);

app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowInfoFragment.java

@@ -19,9 +19,10 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.BaseColumns;
-import android.support.v4.app.LoaderManager;
+
-import android.support.v4.content.CursorLoader;
+import androidx.loader.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;

app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowListFragment.java

@@ -24,7 +24,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
-import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -36,6 +35,8 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.loader.content.CursorLoader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostInfo;

app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowProgressFragment.java

@@ -25,11 +25,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.BaseColumns;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.PopupMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -39,6 +34,12 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.host.HostManager;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;

app/src/main/java/org/xbmc/kore/ui/sections/video/TVShowsActivity.java

@@ -17,11 +17,12 @@ package org.xbmc.kore.ui.sections.video;
 
 import android.annotation.TargetApi;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.transition.TransitionInflater;
 import android.view.MenuItem;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.AbstractFragment;
 import org.xbmc.kore.ui.AbstractInfoFragment;

app/src/main/java/org/xbmc/kore/ui/viewgroups/RecyclerViewEmptyViewSupport.java

@@ -18,14 +18,12 @@ package org.xbmc.kore.ui.viewgroups;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
 /**

app/src/main/java/org/xbmc/kore/ui/views/CirclePageIndicator.java

@@ -25,9 +25,10 @@ import android.graphics.Paint.Style;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.view.MotionEventCompat;
+import androidx.core.view.MotionEventCompat;
-import android.support.v4.view.ViewConfigurationCompat;
+import androidx.core.view.ViewConfigurationCompat;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
+
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;

app/src/main/java/org/xbmc/kore/ui/views/PageIndicator.java

@@ -16,7 +16,7 @@
  */
 package org.xbmc.kore.ui.views;
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 /**
  * A PageIndicator is responsible to show an visual indicator on the total views

app/src/main/java/org/xbmc/kore/ui/views/RatingBar.java

@@ -19,11 +19,12 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.drawable.ClipDrawable;
-import android.support.annotation.DrawableRes;
+
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.DrawableRes;
-import android.support.v4.widget.ImageViewCompat;
+import androidx.appcompat.widget.AppCompatImageView;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.LinearLayoutCompat;
-import android.support.v7.widget.LinearLayoutCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.widget.ImageViewCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;

app/src/main/java/org/xbmc/kore/ui/widgets/ControlPad.java

@@ -24,7 +24,6 @@ import android.graphics.BitmapFactory;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.BitmapDrawable;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -33,6 +32,8 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.ui.viewgroups.SquareGridLayout;
 import org.xbmc.kore.utils.LogUtils;

app/src/main/java/org/xbmc/kore/ui/widgets/HighlightButton.java

@@ -17,10 +17,11 @@ package org.xbmc.kore.ui.widgets;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.ViewTreeObserver;
 
+import androidx.appcompat.widget.AppCompatImageButton;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.utils.Utils;
 

app/src/main/java/org/xbmc/kore/ui/widgets/PlaylistsBar.java

@@ -21,10 +21,11 @@ import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
-import android.support.design.widget.TabLayout;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 
+import com.google.android.material.tabs.TabLayout;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.jsonrpc.type.PlaylistType;
 

app/src/main/java/org/xbmc/kore/ui/widgets/RepeatModeButton.java

@@ -18,7 +18,6 @@ package org.xbmc.kore.ui.widgets;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 
 import org.xbmc.kore.R;

app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/DialActionButton.java

@@ -21,20 +21,20 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.Interpolator;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.content.res.AppCompatResources;
-import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import org.xbmc.kore.R;
-import org.xbmc.kore.utils.Utils;
 
 import butterknife.ButterKnife;
 import butterknife.BindView;

app/src/main/java/org/xbmc/kore/ui/widgets/fabspeeddial/FABSpeedDial.java

@@ -22,9 +22,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.content.res.AppCompatResources;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -33,6 +30,11 @@ import android.view.animation.AccelerateInterpolator;
 import android.view.animation.OvershootInterpolator;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.ui.animators.ChangeImageFadeAnimation;

app/src/main/java/org/xbmc/kore/utils/MediaPlayerUtils.java

@@ -20,9 +20,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;

app/src/main/java/org/xbmc/kore/utils/SharedElementTransition.java

@@ -18,9 +18,10 @@ package org.xbmc.kore.utils;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.support.v4.app.Fragment;
+import androidx.core.app.SharedElementCallback;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.SharedElementCallback;
+import androidx.fragment.app.FragmentTransaction;
+
 import android.transition.Transition;
 import android.transition.TransitionInflater;
 import android.view.View;
@@ -87,7 +88,7 @@ public class SharedElementTransition {
             return;
         }
 
-        android.support.v4.app.SharedElementCallback seCallback = new android.support.v4.app.SharedElementCallback() {
+        androidx.core.app.SharedElementCallback seCallback = new androidx.core.app.SharedElementCallback() {
             @Override
             public void onMapSharedElements(List<String> names, Map<String, View> sharedElements) {
                 // On returning, onMapSharedElements for the exiting fragment is called before the onMapSharedElements

app/src/main/java/org/xbmc/kore/utils/TabsAdapter.java

@@ -17,11 +17,12 @@ package org.xbmc.kore.utils;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 

app/src/main/java/org/xbmc/kore/utils/UIUtils.java

@@ -28,10 +28,12 @@ import android.graphics.Rect;
 import android.os.Handler;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
-import android.support.v4.widget.TextViewCompat;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.AlertDialog;
+import androidx.core.widget.TextViewCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;

app/src/main/java/org/xbmc/kore/utils/Utils.java

@@ -26,10 +26,11 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;

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

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
@@ -51,4 +51,4 @@
               android:layout_gravity="start"
               android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment"/>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
@@ -30,7 +30,6 @@
 
         <org.xbmc.kore.ui.widgets.NowPlayingPanel
             xmlns:sothree="http://schemas.android.com/apk/res-auto"
-            xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/now_playing_panel"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -47,4 +46,4 @@
               android:layout_gravity="start"
               android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment"/>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -41,4 +41,4 @@
               android:layout_gravity="start"
               android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
@@ -40,7 +40,7 @@
                 android:alpha="0.2"
                 android:contentDescription="@string/fanart"/>
 
-            <android.support.v4.view.ViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
@@ -61,4 +61,4 @@
               android:layout_gravity="start"
               android:name="org.xbmc.kore.ui.generic.NavigationDrawerFragment"/>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -27,5 +27,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
 
-
 </LinearLayout>

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

@@ -4,7 +4,7 @@
        android:orientation="horizontal"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content">
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/dial_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,7 +14,7 @@
         app:backgroundTint="@color/fabspeeddial_label"
         style="@style/TextAppearance.Label.FAB"
         android:elevation="4dp"/>
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/dial_action_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -26,7 +26,7 @@
         app:fabSize="mini"
         app:iconFABDial="?attr/iconTvShows"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabspeeddial"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -30,7 +30,6 @@
             android:paddingStart="@dimen/default_padding"
             android:paddingRight="@dimen/small_padding"
             android:paddingEnd="@dimen/small_padding"
-
             android:fontFamily="sans-serif"
             android:textSize="20sp"
             android:text="@string/app_name"/>
@@ -40,7 +39,6 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_gravity="center_vertical"
-
             android:fontFamily="sans-serif-light"
             android:textSize="18sp"/>