Migrate to AndroidX

.gitignore

@@ -7,7 +7,6 @@
 /app/app.iml
 /.idea
 /*.iml
-gradle.properties
 *~
 .weblate
 *.class

app/build.gradle

@@ -11,7 +11,7 @@ android {
         versionCode 780
         versionName "0.17.3"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -43,9 +43,9 @@ android {
 }
 
 ext {
-    supportLibVersion = '28.0.0'
+    androidxLibVersion = '1.0.0'
-    exoPlayerLibVersion = '2.9.6'
+    exoPlayerLibVersion = '2.9.6' //2.10.5
-    roomDbLibVersion = '1.1.1'
+    roomDbLibVersion = '2.1.0'
     leakCanaryLibVersion = '1.5.4' //1.6.1
     okHttpLibVersion = '3.12.1'
     icepickLibVersion = '3.2.0'
@@ -53,7 +53,7 @@ ext {
 }
 
 dependencies {
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude module: 'support-annotations'
     })
 
@@ -61,13 +61,13 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
-    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation "com.android.support:support-v4:${supportLibVersion}"
+    implementation "androidx.legacy:legacy-support-v4:${androidxLibVersion}"
-    implementation "com.android.support:design:${supportLibVersion}"
+    implementation "com.google.android.material:material:${androidxLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
+    implementation "androidx.recyclerview:recyclerview:${androidxLibVersion}"
-    implementation "com.android.support:preference-v14:${supportLibVersion}"
+    implementation "androidx.legacy:legacy-preference-v14:${androidxLibVersion}"
-    implementation "com.android.support:cardview-v7:${supportLibVersion}"
+    implementation "androidx.cardview:cardview:${androidxLibVersion}"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     // Originally in NewPipeExtractor
     implementation 'com.grack:nanojson:1.1'
@@ -84,15 +84,15 @@ dependencies {
 
     debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
     debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
-    debugImplementation 'com.android.support:multidex:1.0.3'
+    debugImplementation 'androidx.multidex:multidex:2.0.1'
 
     implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
 
-    implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}"
+    implementation "androidx.room:room-runtime:${roomDbLibVersion}"
-    implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}"
+    implementation "androidx.room:room-rxjava2:${roomDbLibVersion}"
-    annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}"
+    annotationProcessor "androidx.room:room-compiler:${roomDbLibVersion}"
 
     implementation "frankiesardo:icepick:${icepickLibVersion}"
     annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}"

app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.report;
 
 import android.os.Parcel;
-import android.support.test.filters.LargeTest;
+import androidx.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/debug/java/org/schabi/newpipe/DebugApp.java

@@ -3,8 +3,8 @@ package org.schabi.newpipe;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.multidex.MultiDex;
+import androidx.multidex.MultiDex;
 
 import com.facebook.stetho.Stetho;
 import com.facebook.stetho.okhttp3.StethoInterceptor;

app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
+        <receiver android:name="androidx.media.session.MediaButtonReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
@@ -115,7 +115,7 @@
             android:label="@string/reCaptchaActivity"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/com/google/android/material/appbar/FlingBehavior.java

@@ -1,11 +1,13 @@
-package android.support.design.widget;
+package com.google.android.material.appbar;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.widget.OverScroller;
 
+import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import java.lang.reflect.Field;
 
 // check this https://stackoverflow.com/questions/56849221/recyclerview-fling-causes-laggy-while-appbarlayout-is-scrolling/57997489#57997489

app/src/main/java/org/schabi/newpipe/App.java

@@ -6,8 +6,8 @@ import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
-import android.preference.PreferenceManager;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
@@ -23,7 +23,6 @@ import org.acra.config.ConfigurationBuilder;
 import org.acra.sender.ReportSenderFactory;
 import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.utils.Localization;
 import org.schabi.newpipe.report.AcraReportSenderFactory;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;

app/src/main/java/org/schabi/newpipe/BaseFragment.java

@@ -2,10 +2,10 @@ package org.schabi.newpipe;
 
 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.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 

app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java

@@ -12,8 +12,8 @@ import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.util.Log;
 
 import org.json.JSONException;
@@ -21,13 +21,9 @@ import org.json.JSONObject;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
@@ -38,7 +34,6 @@ import java.util.concurrent.TimeUnit;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.RequestBody;
 import okhttp3.Response;
 
 /**

app/src/main/java/org/schabi/newpipe/Downloader.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.schabi.newpipe.extractor.DownloadRequest;
@@ -10,7 +10,6 @@ import org.schabi.newpipe.extractor.utils.Localization;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -28,15 +28,15 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-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.view.GravityCompat;
+import androidx.core.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
+import androidx.drawerlayout.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;

app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe;
 
-import android.arch.persistence.room.Room;
+import androidx.room.Room;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.database.AppDatabase;
 

app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java

@@ -5,13 +5,12 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
+import androidx.core.app.NavUtils;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.webkit.CookieManager;
-import android.webkit.ValueCallback;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -9,12 +9,12 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -26,6 +26,8 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.Toast;
 
+import androidx.fragment.app.FragmentManager;
+
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.extractor.Info;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -433,7 +435,7 @@ public class RouterActivity extends AppCompatActivity {
                     int selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(this,
                             sortedVideoStreams);
 
-                    android.support.v4.app.FragmentManager fm = getSupportFragmentManager();
+                    FragmentManager fm = getSupportFragmentManager();
                     DownloadDialog downloadDialog = DownloadDialog.newInstance(result);
                     downloadDialog.setVideoStreams(sortedVideoStreams);
                     downloadDialog.setAudioStreams(result.getAudioStreams());

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -4,13 +4,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
+import com.google.android.material.tabs.TabLayout;
-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.view.ViewPager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
-import android.support.v7.app.AppCompatActivity;
+import androidx.viewpager.widget.PagerAdapter;
-import android.support.v7.widget.Toolbar;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -44,12 +46,12 @@ public class AboutActivity extends AppCompatActivity {
     };
 
     /**
-     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * The {@link PagerAdapter} that will provide
      * fragments for each of the sections. We use a
      * {@link FragmentPagerAdapter} derivative, which will keep every
      * loaded fragment in memory. If this becomes too memory intensive, it
      * may be best to switch to a
-     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     * {@link FragmentStatePagerAdapter}.
      */
     private SectionsPagerAdapter mSectionsPagerAdapter;
 

app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.*;
 import android.widget.TextView;
 import org.schabi.newpipe.R;

app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java

@@ -4,8 +4,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.webkit.WebView;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;

app/src/main/java/org/schabi/newpipe/database/AppDatabase.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.room.Database;
+import androidx.room.Database;
-import android.arch.persistence.room.RoomDatabase;
+import androidx.room.RoomDatabase;
-import android.arch.persistence.room.TypeConverters;
+import androidx.room.TypeConverters;
 
 import org.schabi.newpipe.database.history.dao.SearchHistoryDAO;
 import org.schabi.newpipe.database.history.dao.StreamHistoryDAO;

app/src/main/java/org/schabi/newpipe/database/BasicDAO.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Delete;
+import androidx.room.Delete;
-import android.arch.persistence.room.Insert;
+import androidx.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
+import androidx.room.OnConflictStrategy;
-import android.arch.persistence.room.Update;
+import androidx.room.Update;
 
 import java.util.Collection;
 import java.util.List;

app/src/main/java/org/schabi/newpipe/database/Converters.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.room.TypeConverter;
+import androidx.room.TypeConverter;
 
 import org.schabi.newpipe.extractor.stream.StreamType;
 

app/src/main/java/org/schabi/newpipe/database/Migrations.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database;
 
-import android.arch.persistence.db.SupportSQLiteDatabase;
+import androidx.sqlite.db.SupportSQLiteDatabase;
-import android.arch.persistence.room.migration.Migration;
+import androidx.room.migration.Migration;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.schabi.newpipe.BuildConfig;

app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database.history.dao;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.database.history.model.SearchHistoryEntry;
 

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.database.history.dao;
 
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;

app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.history.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.Ignore;
+import androidx.room.Ignore;
-import android.arch.persistence.room.Index;
+import androidx.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.PrimaryKey;
 
 import java.util.Date;
 

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java

@@ -1,17 +1,17 @@
 package org.schabi.newpipe.database.history.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.ForeignKey;
+import androidx.room.ForeignKey;
-import android.arch.persistence.room.Ignore;
+import androidx.room.Ignore;
-import android.arch.persistence.room.Index;
+import androidx.room.Index;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 
 import java.util.Date;
 
-import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static androidx.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID;
 import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE;

app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.history.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.extractor.stream.StreamType;

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.playlist;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;

app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.playlist;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.database.playlist.dao;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database.playlist.dao;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.database.playlist.dao;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.database.playlist.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.Index;
+import androidx.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.PrimaryKey;
 
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME;
 import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE;

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.playlist.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.Ignore;
+import androidx.room.Ignore;
-import android.arch.persistence.room.Index;
+import androidx.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.PrimaryKey;
 
 import org.schabi.newpipe.database.playlist.PlaylistLocalItem;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfo;

app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistStreamEntity.java

@@ -1,13 +1,13 @@
 package org.schabi.newpipe.database.playlist.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.ForeignKey;
+import androidx.room.ForeignKey;
-import android.arch.persistence.room.Index;
+import androidx.room.Index;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 
-import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static androidx.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_INDEX;
 import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_PLAYLIST_ID;
 import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_STREAM_ID;

app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.database.stream;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
 
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.history.model.StreamHistoryEntity;

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.stream.dao;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Insert;
+import androidx.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
+import androidx.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity;

app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.stream.dao;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Insert;
+import androidx.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
+import androidx.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 import org.schabi.newpipe.database.stream.model.StreamStateEntity;

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.stream.model;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.Ignore;
+import androidx.room.Ignore;
-import android.arch.persistence.room.Index;
+import androidx.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.PrimaryKey;
 
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;

app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java

@@ -1,14 +1,14 @@
 package org.schabi.newpipe.database.stream.model;
 
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.ForeignKey;
+import androidx.room.ForeignKey;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.concurrent.TimeUnit;
 
-import static android.arch.persistence.room.ForeignKey.CASCADE;
+import static androidx.room.ForeignKey.CASCADE;
 import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID;
 import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE;
 

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.database.subscription;
 
-import android.arch.persistence.room.Dao;
+import androidx.room.Dao;
-import android.arch.persistence.room.Insert;
+import androidx.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
+import androidx.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
+import androidx.room.Query;
-import android.arch.persistence.room.Transaction;
+import androidx.room.Transaction;
 
 import org.schabi.newpipe.database.BasicDAO;
 

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java

@@ -1,11 +1,11 @@
 package org.schabi.newpipe.database.subscription;
 
-import android.arch.persistence.room.ColumnInfo;
+import androidx.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
+import androidx.room.Entity;
-import android.arch.persistence.room.Ignore;
+import androidx.room.Ignore;
-import android.arch.persistence.room.Index;
+import androidx.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.PrimaryKey;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;

app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java

@@ -3,9 +3,9 @@ package org.schabi.newpipe.download;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java

@@ -11,15 +11,15 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
-import android.support.v4.provider.DocumentFile;
+import androidx.documentfile.provider.DocumentFile;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.view.menu.ActionMenuItemView;
+import androidx.appcompat.view.menu.ActionMenuItemView;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;

app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java

@@ -1,10 +1,9 @@
 package org.schabi.newpipe.fragments;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;

app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -1,15 +1,15 @@
 package org.schabi.newpipe.fragments;
 
 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.design.widget.TabLayout;
+import com.google.android.material.tabs.TabLayout;
-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.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

app/src/main/java/org/schabi/newpipe/fragments/OnScrollBelowItemsListener.java

@@ -1,8 +1,8 @@
 package org.schabi.newpipe.fragments;
 
-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.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 /**
  * Recycler view scroll listener which calls the method {@link #onScrolledDown(RecyclerView)}

app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.fragments.detail;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-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.view.ViewGroup;
 
 import java.util.ArrayList;

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -9,17 +9,17 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
+import com.google.android.material.appbar.AppBarLayout;
-import android.support.design.widget.TabLayout;
+import com.google.android.material.tabs.TabLayout;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -7,12 +7,12 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.fragments.list;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -4,10 +4,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 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.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;

app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java

@@ -2,8 +2,8 @@ package org.schabi.newpipe.fragments.list.comments;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.fragments.list.kiosk;
 
 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.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -3,10 +3,9 @@ package org.schabi.newpipe.fragments.list.playlist;
 import android.app.Activity;
 import android.content.Context;
 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.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -6,13 +6,13 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
-import android.support.v7.widget.TooltipCompat;
+import androidx.appcompat.widget.TooltipCompat;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -73,7 +73,7 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
 
-import static android.support.v7.widget.helper.ItemTouchHelper.Callback.makeMovementFlags;
+import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags;
 import static java.util.Arrays.asList;
 import static org.schabi.newpipe.util.AnimationUtils.animateView;
 

app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java

@@ -2,8 +2,8 @@ package org.schabi.newpipe.fragments.list.search;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.AttrRes;
+import androidx.annotation.AttrRes;
-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/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java

@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.info_list;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 

app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java

@@ -3,8 +3,8 @@ package org.schabi.newpipe.info_list;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 

app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.info_list;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.util.Linkify;
 import android.view.ViewGroup;
 import android.widget.TextView;

app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 

app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.info_list.holder;
 
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java

@@ -5,11 +5,11 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/local/HeaderFooterHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class HeaderFooterHolder extends RecyclerView.ViewHolder {

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.local;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java

@@ -3,9 +3,9 @@ package org.schabi.newpipe.local.bookmark;
 import android.app.AlertDialog;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-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/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java

@@ -1,10 +1,10 @@
 package org.schabi.newpipe.local.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.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java

@@ -3,8 +3,8 @@ package org.schabi.newpipe.local.dialog;
 import android.app.AlertDialog;
 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.view.View;
 import android.widget.EditText;
 import android.widget.Toast;

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java

@@ -2,9 +2,9 @@ package org.schabi.newpipe.local.dialog;
 
 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.view.Window;
 
 import org.schabi.newpipe.database.stream.model.StreamEntity;

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java

@@ -2,9 +2,9 @@ package org.schabi.newpipe.local.feed;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -183,7 +183,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
     }
 
     @Override
-    public void handleResult(@android.support.annotation.NonNull List<SubscriptionEntity> result) {
+    public void handleResult(@androidx.annotation.NonNull List<SubscriptionEntity> result) {
         super.handleResult(result);
 
         if (result.isEmpty()) {

app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java

@@ -1,9 +1,9 @@
 package org.schabi.newpipe.local.history;
 
 import android.content.Context;
-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 org.schabi.newpipe.util.Localization;
 

app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.history;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.StreamInfo;

app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java

@@ -21,7 +21,7 @@ package org.schabi.newpipe.local.history;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
@@ -51,7 +51,6 @@ import java.util.List;
 import io.reactivex.Completable;
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
-import io.reactivex.Scheduler;
 import io.reactivex.Single;
 import io.reactivex.schedulers.Schedulers;
 

app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java

@@ -4,10 +4,10 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -22,7 +22,6 @@ import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamType;

app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.holder;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 

app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.holder;
 
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.local.holder;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -4,11 +4,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
-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.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java

@@ -1,6 +1,6 @@
 package org.schabi.newpipe.local.playlist;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.database.AppDatabase;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;

app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java

@@ -4,10 +4,10 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Intent;
 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.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.util.ThemeHelper;

app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java

@@ -19,7 +19,7 @@
 
 package org.schabi.newpipe.local.subscription;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.grack.nanojson.JsonAppendableWriter;
 import com.grack.nanojson.JsonArray;

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java

@@ -17,15 +17,15 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.local.subscription;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.schabi.newpipe.MainActivity;
@@ -93,7 +93,7 @@ public class SubscriptionService {
      * in the cooldown interval, only the latest changes are emitted to the subscribers.
      * This reduces the amount of observations caused by frequent updates to the database.
      */
-    @android.support.annotation.NonNull
+    @androidx.annotation.NonNull
     public Flowable<List<SubscriptionEntity>> getSubscription() {
         return subscription;
     }

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java

@@ -3,11 +3,11 @@ package org.schabi.newpipe.local.subscription;
 import android.app.Activity;
 import android.content.Intent;
 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.annotation.StringRes;
+import androidx.annotation.StringRes;
-import android.support.v4.text.util.LinkifyCompat;
+import androidx.core.text.util.LinkifyCompat;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;

app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java

@@ -23,11 +23,11 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.text.TextUtils;
 import android.widget.Toast;
 

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java

@@ -20,7 +20,7 @@
 package org.schabi.newpipe.local.subscription.services;
 
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 

app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java

@@ -20,9 +20,9 @@
 package org.schabi.newpipe.local.subscription.services;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 

app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java

@@ -28,9 +28,9 @@ import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;

app/src/main/java/org/schabi/newpipe/player/BasePlayer.java

@@ -28,8 +28,8 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.AudioManager;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;

app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java

@@ -33,14 +33,14 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
-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.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.content.res.AppCompatResources;
+import androidx.appcompat.content.res.AppCompatResources;
-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.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;

app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.player;
 
 import android.os.Binder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 class PlayerServiceBinder extends Binder {
     private final BasePlayer basePlayer;

app/src/main/java/org/schabi/newpipe/player/PlayerState.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.player;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

@@ -35,9 +35,9 @@ import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.GestureDetector;

app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java

@@ -6,11 +6,11 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.Settings;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-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.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java

@@ -31,9 +31,9 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java

@@ -9,7 +9,7 @@ import android.media.AudioFocusRequest;
 import android.media.AudioManager;
 import android.media.audiofx.AudioEffect;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.exoplayer2.SimpleExoPlayer;

app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java

@@ -1,7 +1,7 @@
 package org.schabi.newpipe.player.helper;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.exoplayer2.upstream.DataSource;