SDK 28, Android X

app/build.gradle

@@ -34,13 +34,13 @@ static def getProperty(@Nullable Properties properties, String name) {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion '28.0.3'
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
 
-        renderscriptTargetApi 27
+        renderscriptTargetApi 28
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'com.kabouzeid.gramophone'
@@ -87,28 +87,24 @@ android {
     }
 }
 
-ext {
-    supportLibVersion = '27.1.1'
-}
-
 dependencies {
-    implementation "com.android.support:support-compat:$supportLibVersion"
+    implementation 'androidx.core:core:1.0.1'
-    implementation "com.android.support:support-core-utils:$supportLibVersion"
+    implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
-    implementation "com.android.support:support-core-ui:$supportLibVersion"
+    implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
-    implementation "com.android.support:support-media-compat:$supportLibVersion"
+    implementation 'androidx.media:media:1.0.1'
-    implementation "com.android.support:support-fragment:$supportLibVersion"
+    implementation 'androidx.fragment:fragment:1.0.0'
-    implementation "com.android.support:support-v13:$supportLibVersion"
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation "com.android.support:recyclerview-v7:$supportLibVersion"
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation "com.android.support:gridlayout-v7:$supportLibVersion"
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation "com.android.support:cardview-v7:$supportLibVersion"
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "com.android.support:palette-v7:$supportLibVersion"
+    implementation 'androidx.palette:palette:1.0.0'
-    implementation "com.android.support:design:$supportLibVersion"
+    implementation 'com.google.android.material:material:1.0.0'
-    implementation "com.android.support:support-annotations:$supportLibVersion"
+    implementation 'androidx.annotation:annotation:1.0.2'
-    implementation "com.android.support:percent:$supportLibVersion"
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
-    implementation "com.android.support:preference-v7:$supportLibVersion"
+    implementation 'androidx.preference:preference:1.0.0'
-    implementation "com.android.support:preference-v14:$supportLibVersion"
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation 'com.github.kabouzeid:app-theme-helper:1.3.10'
     implementation 'com.github.kabouzeid:RecyclerView-FastScroll:1.0.16-kmod'
@@ -124,15 +120,15 @@ dependencies {
         transitive = true
     }
 
-    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.jakewharton:butterknife:10.1.0'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
 
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
     implementation 'com.google.code.gson:gson:2.8.5'
 
     implementation 'com.anjlab.android.iab.v3:library:1.0.44'
-    implementation 'de.psdev.licensesdialog:licensesdialog:1.8.3'
+    implementation 'de.psdev.licensesdialog:licensesdialog:2.0.0'
 
     implementation 'com.github.bumptech.glide:glide:3.8.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'

app/src/main/AndroidManifest.xml

@@ -204,7 +204,7 @@
         </receiver>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/com/kabouzeid/gramophone/App.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone;
 
 import android.app.Application;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.anjlab.android.iab.v3.BillingProcessor;
 import com.anjlab.android.iab.v3.TransactionDetails;

app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java

@@ -2,9 +2,9 @@ package com.kabouzeid.gramophone.adapter;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/kabouzeid/gramophone/adapter/CategoryInfoAdapter.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/adapter/GenreAdapter.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-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/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java

@@ -2,10 +2,10 @@ package com.kabouzeid.gramophone.adapter;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-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/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java

@@ -3,10 +3,10 @@ package com.kabouzeid.gramophone.adapter;
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.os.Build;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java

@@ -1,10 +1,10 @@
 package com.kabouzeid.gramophone.adapter;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-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/com/kabouzeid/gramophone/adapter/SongFileAdapter.java

@@ -2,10 +2,10 @@ package com.kabouzeid.gramophone.adapter;
 
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/adapter/album/AlbumAdapter.java

@@ -1,11 +1,11 @@
 package com.kabouzeid.gramophone.adapter.album;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/adapter/album/HorizontalAlbumAdapter.java

@@ -1,10 +1,10 @@
 package com.kabouzeid.gramophone.adapter.album;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
+import androidx.cardview.widget.CardView;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/com/kabouzeid/gramophone/adapter/artist/ArtistAdapter.java

@@ -1,11 +1,11 @@
 package com.kabouzeid.gramophone.adapter.artist;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/adapter/base/AbsMultiSelectAdapter.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter.base;
 
 import android.content.Context;
-import android.support.annotation.MenuRes;
+import androidx.annotation.MenuRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 

app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter.base;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

app/src/main/java/com/kabouzeid/gramophone/adapter/song/AbsOffsetSongAdapter.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter.song;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/kabouzeid/gramophone/adapter/song/AlbumSongAdapter.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter.song;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.kabouzeid.gramophone.interfaces.CabHolder;

app/src/main/java/com/kabouzeid/gramophone/adapter/song/ArtistSongAdapter.java

@@ -1,10 +1,10 @@
 package com.kabouzeid.gramophone.adapter.song;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/com/kabouzeid/gramophone/adapter/song/OrderablePlaylistSongAdapter.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter.song;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 

app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlayingQueueAdapter.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.adapter.song;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 

app/src/main/java/com/kabouzeid/gramophone/adapter/song/PlaylistSongAdapter.java

@@ -1,10 +1,10 @@
 package com.kabouzeid.gramophone.adapter.song;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 

app/src/main/java/com/kabouzeid/gramophone/adapter/song/ShuffleButtonSongAdapter.java

@@ -1,10 +1,10 @@
 package com.kabouzeid.gramophone.adapter.song;
 
 import android.graphics.Typeface;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.kabouzeid.appthemehelper.ThemeStore;

app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java

@@ -1,11 +1,11 @@
 package com.kabouzeid.gramophone.adapter.song;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java

@@ -6,8 +6,8 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
-import android.support.v4.graphics.drawable.IconCompat;
+import androidx.core.graphics.drawable.IconCompat;
 import android.util.TypedValue;
 
 import com.kabouzeid.appthemehelper.ThemeStore;

app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java

@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;

app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetCard.java

@@ -6,8 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.graphics.Palette;
+import androidx.palette.graphics.Palette;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;

app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java

@@ -6,8 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.graphics.Palette;
+import androidx.palette.graphics.Palette;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;

app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java

@@ -6,8 +6,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.graphics.Palette;
+import androidx.palette.graphics.Palette;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;

app/src/main/java/com/kabouzeid/gramophone/dialogs/AddToPlaylistDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.kabouzeid.gramophone.R;

app/src/main/java/com/kabouzeid/gramophone/dialogs/BlacklistFolderChooserDialog.java

@@ -6,9 +6,9 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.View;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/dialogs/ChangelogDialog.java

@@ -7,8 +7,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/dialogs/ClearSmartPlaylistDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java

@@ -2,9 +2,9 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.InputType;
 import android.widget.Toast;
 

app/src/main/java/com/kabouzeid/gramophone/dialogs/DeletePlaylistDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/dialogs/DeleteSongsDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationsDialog.java

@@ -6,9 +6,9 @@ import android.content.Intent;
 import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/dialogs/LyricsDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.kabouzeid.gramophone.model.lyrics.Lyrics;

app/src/main/java/com/kabouzeid/gramophone/dialogs/RemoveFromPlaylistDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.dialogs;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.InputType;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/dialogs/ScanMediaFolderChooserDialog.java

@@ -9,10 +9,10 @@ import android.media.MediaScannerConnection;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.view.View;
 import android.widget.Toast;
 

app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java

@@ -9,8 +9,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.widget.CheckBox;
 import android.widget.FrameLayout;
 import android.widget.TextView;

app/src/main/java/com/kabouzeid/gramophone/dialogs/SongDetailDialog.java

@@ -4,8 +4,8 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;

app/src/main/java/com/kabouzeid/gramophone/dialogs/SongShareDialog.java

@@ -3,8 +3,8 @@ package com.kabouzeid.gramophone.dialogs;
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.kabouzeid.gramophone.R;

app/src/main/java/com/kabouzeid/gramophone/glide/ArtistGlideRequest.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.glide;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.BitmapRequestBuilder;
 import com.bumptech.glide.DrawableRequestBuilder;

app/src/main/java/com/kabouzeid/gramophone/glide/BlurTransformation.java

@@ -10,8 +10,8 @@ import android.renderscript.Element;
 import android.renderscript.RSRuntimeException;
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.FloatRange;
+import androidx.annotation.FloatRange;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;

app/src/main/java/com/kabouzeid/gramophone/glide/SongGlideRequest.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.glide;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.BitmapRequestBuilder;
 import com.bumptech.glide.DrawableRequestBuilder;

app/src/main/java/com/kabouzeid/gramophone/glide/palette/BitmapPaletteWrapper.java

@@ -1,7 +1,7 @@
 package com.kabouzeid.gramophone.glide.palette;
 
 import android.graphics.Bitmap;
-import android.support.v7.graphics.Palette;
+import androidx.palette.graphics.Palette;
 
 public class BitmapPaletteWrapper {
     private final Bitmap mBitmap;

app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java

@@ -15,8 +15,8 @@ import android.os.Environment;
 import android.os.IBinder;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;
 

app/src/main/java/com/kabouzeid/gramophone/helper/MusicProgressViewUpdateHelper.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.helper;
 
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)

app/src/main/java/com/kabouzeid/gramophone/helper/SearchQueryHelper.java

@@ -4,7 +4,7 @@ import android.app.SearchManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.model.Song;

app/src/main/java/com/kabouzeid/gramophone/helper/ShuffleHelper.java

@@ -1,6 +1,6 @@
 package com.kabouzeid.gramophone.helper;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.model.Song;
 

app/src/main/java/com/kabouzeid/gramophone/helper/menu/PlaylistMenuHelper.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.helper.menu;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.widget.Toast;
 

app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongMenuHelper.java

@@ -1,9 +1,9 @@
 package com.kabouzeid.gramophone.helper.menu;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.PopupMenu;

app/src/main/java/com/kabouzeid/gramophone/helper/menu/SongsMenuHelper.java

@@ -1,7 +1,7 @@
 package com.kabouzeid.gramophone.helper.menu;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.dialogs.AddToPlaylistDialog;

app/src/main/java/com/kabouzeid/gramophone/interfaces/CabHolder.java

@@ -1,6 +1,6 @@
 package com.kabouzeid.gramophone.interfaces;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.afollestad.materialcab.MaterialCab;
 

app/src/main/java/com/kabouzeid/gramophone/interfaces/PaletteColorHolder.java

@@ -1,6 +1,6 @@
 package com.kabouzeid.gramophone.interfaces;
 
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 /**
  * @author Aidan Follestad (afollestad)

app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java

@@ -1,8 +1,8 @@
 package com.kabouzeid.gramophone.lastfm.rest;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.lastfm.rest.service.LastFMService;
 

app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/service/LastFMService.java

@@ -1,6 +1,6 @@
 package com.kabouzeid.gramophone.lastfm.rest.service;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.lastfm.rest.model.LastFmAlbum;
 import com.kabouzeid.gramophone.lastfm.rest.model.LastFmArtist;

app/src/main/java/com/kabouzeid/gramophone/loader/AlbumLoader.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.loader;
 
 import android.content.Context;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.model.Album;
 import com.kabouzeid.gramophone.model.Song;

app/src/main/java/com/kabouzeid/gramophone/loader/ArtistLoader.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.loader;
 
 import android.content.Context;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.model.Album;
 import com.kabouzeid.gramophone.model.Artist;

app/src/main/java/com/kabouzeid/gramophone/loader/GenreLoader.java

@@ -3,8 +3,8 @@ package com.kabouzeid.gramophone.loader;
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.MediaStore.Audio.Genres;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.model.Genre;
 import com.kabouzeid.gramophone.model.Song;

app/src/main/java/com/kabouzeid/gramophone/loader/LastAddedLoader.java

@@ -3,7 +3,7 @@ package com.kabouzeid.gramophone.loader;
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.util.PreferenceUtil;

app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistLoader.java

@@ -5,8 +5,8 @@ import android.database.Cursor;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.PlaylistsColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.model.Playlist;
 

app/src/main/java/com/kabouzeid/gramophone/loader/PlaylistSongLoader.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.model.PlaylistSong;
 

app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java

@@ -5,8 +5,8 @@ import android.database.Cursor;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.provider.BlacklistStore;

app/src/main/java/com/kabouzeid/gramophone/loader/SortedCursor.java

@@ -17,8 +17,8 @@ package com.kabouzeid.gramophone.loader;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;

app/src/main/java/com/kabouzeid/gramophone/loader/SortedLongCursor.java

@@ -17,8 +17,8 @@ package com.kabouzeid.gramophone.loader;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;

app/src/main/java/com/kabouzeid/gramophone/loader/TopAndRecentlyPlayedTracksLoader.java

@@ -20,8 +20,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.model.Song;
 import com.kabouzeid.gramophone.provider.HistoryStore;

app/src/main/java/com/kabouzeid/gramophone/misc/CustomFragmentStatePagerAdapter.java

@@ -18,10 +18,12 @@ package com.kabouzeid.gramophone.misc;
 
 import android.os.Bundle;
 import android.os.Parcelable;
-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.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.viewpager.widget.PagerAdapter;
+
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,7 +31,7 @@ import android.view.ViewGroup;
 import java.util.ArrayList;
 
 /**
- * Implementation of {@link android.support.v4.view.PagerAdapter} that
+ * Implementation of {@link PagerAdapter} that
  * uses a {@link Fragment} to manage each page. This class also handles
  * saving and restoring of fragment's state.
  * <p/>
@@ -64,7 +66,7 @@ import java.util.ArrayList;
  * {@sample development/samples/Support13Demos/res/layout/fragment_pager_list.xml
  * complete}
  */
-public abstract class CustomFragmentStatePagerAdapter extends android.support.v4.view.PagerAdapter {
+public abstract class CustomFragmentStatePagerAdapter extends PagerAdapter {
 
     public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName();
     private static final boolean DEBUG = false;

app/src/main/java/com/kabouzeid/gramophone/misc/DialogAsyncTask.java

@@ -3,8 +3,8 @@ package com.kabouzeid.gramophone.misc;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 

app/src/main/java/com/kabouzeid/gramophone/misc/WeakContextAsyncTask.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.misc;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 

app/src/main/java/com/kabouzeid/gramophone/misc/WrappedAsyncTaskLoader.java

@@ -2,7 +2,7 @@
 package com.kabouzeid.gramophone.misc;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 /**
  * <a href="http://code.google.com/p/android/issues/detail?id=14944">Issue

app/src/main/java/com/kabouzeid/gramophone/model/AbsCustomPlaylist.java

@@ -2,9 +2,8 @@ package com.kabouzeid.gramophone.model;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
-import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.util.MusicUtil;
 
 import java.util.ArrayList;

app/src/main/java/com/kabouzeid/gramophone/model/Album.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 

app/src/main/java/com/kabouzeid/gramophone/model/Artist.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.util.MusicUtil;
 

app/src/main/java/com/kabouzeid/gramophone/model/Playlist.java

@@ -3,7 +3,7 @@ package com.kabouzeid.gramophone.model;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)

app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/AbsSmartPlaylist.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.model.smartplaylist;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.model.AbsCustomPlaylist;

app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/HistoryPlaylist.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.model.smartplaylist;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.loader.TopAndRecentlyPlayedTracksLoader;

app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/LastAddedPlaylist.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.model.smartplaylist;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.loader.LastAddedLoader;

app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/MyTopTracksPlaylist.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.model.smartplaylist;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.loader.TopAndRecentlyPlayedTracksLoader;

app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/NotRecentlyPlayedPlaylist.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.model.smartplaylist;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.loader.TopAndRecentlyPlayedTracksLoader;

app/src/main/java/com/kabouzeid/gramophone/model/smartplaylist/ShuffleAllPlaylist.java

@@ -2,7 +2,7 @@ package com.kabouzeid.gramophone.model.smartplaylist;
 
 import android.content.Context;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.loader.SongLoader;

app/src/main/java/com/kabouzeid/gramophone/preferences/BlacklistPreferenceDialog.java

@@ -2,8 +2,8 @@ package com.kabouzeid.gramophone.preferences;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.text.Html;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/preferences/LibraryPreferenceDialog.java

@@ -2,10 +2,10 @@ package com.kabouzeid.gramophone.preferences;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-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;
 
 import com.afollestad.materialdialogs.MaterialDialog;

app/src/main/java/com/kabouzeid/gramophone/preferences/NowPlayingScreenPreferenceDialog.java

@@ -5,10 +5,10 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/kabouzeid/gramophone/provider/BlacklistStore.java

@@ -7,7 +7,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Environment;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.kabouzeid.gramophone.service.MusicService;
 import com.kabouzeid.gramophone.util.FileUtil;

app/src/main/java/com/kabouzeid/gramophone/provider/HistoryStore.java

@@ -21,8 +21,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public class HistoryStore extends SQLiteOpenHelper {
     private static final int MAX_ITEMS_IN_DB = 5000;

app/src/main/java/com/kabouzeid/gramophone/provider/MusicPlaybackQueueStore.java

@@ -22,8 +22,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.BaseColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.kabouzeid.gramophone.loader.SongLoader;
 import com.kabouzeid.gramophone.model.Song;

app/src/main/java/com/kabouzeid/gramophone/provider/SongPlayCountStore.java

@@ -21,8 +21,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Interpolator;
 

app/src/main/java/com/kabouzeid/gramophone/service/MultiPlayer.java

@@ -7,8 +7,8 @@ import android.media.MediaPlayer;
 import android.media.audiofx.AudioEffect;
 import android.net.Uri;
 import android.os.PowerManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;
 

app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java

@@ -27,8 +27,8 @@ import android.os.PowerManager;
 import android.os.Process;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;

app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotification.java

@@ -4,7 +4,7 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.service.MusicService;

app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java

@@ -8,8 +8,8 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;

app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java

@@ -8,9 +8,9 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.media.app.NotificationCompat.MediaStyle;
+import androidx.media.app.NotificationCompat.MediaStyle;
-import android.support.v7.graphics.Palette;
+import androidx.palette.graphics.Palette;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;

app/src/main/java/com/kabouzeid/gramophone/service/playback/Playback.java

@@ -1,6 +1,6 @@
 package com.kabouzeid.gramophone.service.playback;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)

app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java

@@ -5,9 +5,9 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatButton;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -250,6 +250,6 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
                 )
                 .setIncludeOwnLicense(true)
                 .build()
-                .showAppCompat();
+                .show();
     }
 }

app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java

@@ -4,13 +4,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-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.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.text.Spanned;
 import android.view.Menu;

app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java

@@ -4,13 +4,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-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.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Html;
 import android.text.Spanned;
 import android.view.LayoutInflater;

app/src/main/java/com/kabouzeid/gramophone/ui/activities/GenreDetailActivity.java

@@ -2,12 +2,12 @@ package com.kabouzeid.gramophone.ui.activities;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-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.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java

@@ -9,11 +9,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.design.widget.NavigationView;
+import com.google.android.material.navigation.NavigationView;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;