[Refactor] Migrate to AndroidX for the future.

app/build.gradle

@@ -46,16 +46,16 @@ dependencies {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "android.arch.lifecycle:extensions:1.1.1"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
-    implementation "android.arch.lifecycle:common-java8:1.1.1"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha01'
     implementation 'com.afollestad:material-cab:0.1.12'
     debugImplementation 'com.facebook.stetho:stetho:1.5.0'
-    implementation 'com.github.bumptech.glide:glide:4.7.1'
+    implementation 'com.github.bumptech.glide:glide:4.8.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
-    implementation 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.jakewharton:butterknife:9.0.0-rc1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
     implementation 'com.jakewharton.threetenabp:threetenabp:1.0.5'
     implementation "com.leinardi.android:speed-dial:1.0.2"
     implementation 'com.simplecityapps:recyclerview-fastscroll:1.0.18'

app/src/main/java/androidx/appcompat/app/NightModeAccessor.java

@@ -3,7 +3,7 @@
  * All Rights Reserved.
  */
 
-package android.support.v7.app;
+package androidx.appcompat.app;
 
 public class NightModeAccessor {
 

app/src/main/java/androidx/swiperefreshlayout/widget/ThemedSwipeRefreshLayout.java

@@ -3,14 +3,14 @@
  * All Rights Reserved.
  */
 
-package android.support.v4.widget;
+package androidx.swiperefreshlayout.widget;
 
 import android.content.Context;
 import android.graphics.drawable.ShapeDrawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.util.ViewUtils;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/AppApplication.java

@@ -6,11 +6,11 @@
 package me.zhanghai.android.materialfilemanager;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
 
 import com.facebook.stetho.Stetho;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.util.NightModeHelper;
 
 public class AppApplication extends Application {

app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutActivity.java

@@ -8,10 +8,10 @@ package me.zhanghai.android.materialfilemanager.about;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import me.zhanghai.android.materialfilemanager.util.FragmentUtils;
 
 public class AboutActivity extends AppCompatActivity {

app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutFragment.java

@@ -7,16 +7,16 @@ package me.zhanghai.android.materialfilemanager.about;
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJob.java

@@ -6,8 +6,8 @@
 package me.zhanghai.android.materialfilemanager.file;
 
 import android.app.Service;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.filesystem.FileSystemException;
 import me.zhanghai.android.materialfilemanager.util.AppUtils;
 import me.zhanghai.android.materialfilemanager.util.ToastUtils;

app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobService.java

@@ -9,8 +9,6 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,6 +17,8 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 
 public class FileJobService extends Service {

app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobs.java

@@ -5,11 +5,10 @@
 
 package me.zhanghai.android.materialfilemanager.file;
 
-import android.support.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.filesystem.FileSystemException;
 import me.zhanghai.android.materialfilemanager.filesystem.LocalFile;

app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileProvider.java

@@ -15,8 +15,6 @@ import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import java.io.File;
@@ -24,6 +22,8 @@ import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.BuildConfig;
 
 public class FileProvider extends ContentProvider {

app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileTypeNames.java

@@ -6,12 +6,12 @@
 package me.zhanghai.android.materialfilemanager.file;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import java.util.Locale;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.util.MapBuilder;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/file/FormatUtils.java

@@ -6,7 +6,6 @@
 package me.zhanghai.android.materialfilemanager.file;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
 import android.text.format.Time;
@@ -16,6 +15,7 @@ import org.threeten.bp.ZoneId;
 import org.threeten.bp.format.DateTimeFormatter;
 import org.threeten.bp.format.FormatStyle;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.R;
 
 public class FormatUtils {

app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypeIcons.java

@@ -5,11 +5,11 @@
 
 package me.zhanghai.android.materialfilemanager.file;
 
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import java.util.Map;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.util.MapBuilder;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypes.java

@@ -7,8 +7,6 @@ package me.zhanghai.android.materialfilemanager.file;
 
 import android.os.Build;
 import android.provider.DocumentsContract;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
 
@@ -16,6 +14,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.filesystem.PosixFileType;
 import me.zhanghai.android.materialfilemanager.util.FileNameUtils;
 import me.zhanghai.android.materialfilemanager.util.MapBuilder;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbData.java

@@ -6,12 +6,12 @@
 package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.List;
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.functional.compat.Function;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLayout.java

@@ -7,9 +7,6 @@ package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.view.ContextThemeWrapper;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.HorizontalScrollView;
@@ -20,6 +17,9 @@ import android.widget.TextView;
 
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.view.ContextThemeWrapper;
 import butterknife.BindDimen;
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLiveData.java

@@ -5,15 +5,15 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MediatorLiveData;
 import android.content.Context;
-import android.support.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MediatorLiveData;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.functional.compat.Function;
 import me.zhanghai.android.materialfilemanager.navigation.NavigationRoot;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/ConfirmDeleteFilesDialogFragment.java

@@ -7,16 +7,16 @@ package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.functional.Functional;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateDirectoryDialogFragment.java

@@ -5,9 +5,8 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-
 import me.zhanghai.android.materialfilemanager.R;
 
 public class CreateDirectoryDialogFragment extends FileNameDialogFragment {

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateFileDialogFragment.java

@@ -5,9 +5,8 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-
 import me.zhanghai.android.materialfilemanager.R;
 
 public class CreateFileDialogFragment extends FileNameDialogFragment {

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListAdapter.java

@@ -7,13 +7,6 @@ package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v7.content.res.AppCompatResources;
-import android.support.v7.util.SortedList;
-import android.support.v7.widget.PopupMenu;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.util.SortedListAdapterCallback;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
@@ -33,6 +26,13 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SortedList;
+import androidx.recyclerview.widget.SortedListAdapterCallback;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListData.java

@@ -5,11 +5,10 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 
 public class FileListData {

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListFragment.java

@@ -6,24 +6,12 @@
 package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.Manifest;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -35,6 +23,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.afollestad.materialcab.MaterialCab;
+import com.google.android.material.appbar.AppBarLayout;
 import com.leinardi.android.speeddial.SpeedDialView;
 
 import java.util.ArrayList;
@@ -43,6 +32,17 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.effortlesspermissions.AfterPermissionDenied;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListLiveData.java

@@ -6,14 +6,14 @@
 package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.annotation.SuppressLint;
-import android.arch.lifecycle.LiveData;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.lifecycle.LiveData;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.filesystem.JavaFileObserver;
 import me.zhanghai.android.materialfilemanager.filesystem.LocalFile;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListViewModel.java

@@ -5,19 +5,19 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Transformations;
-import android.arch.lifecycle.ViewModel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Transformations;
+import androidx.lifecycle.ViewModel;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.filesystem.Files;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileNameDialogFragment.java

@@ -7,11 +7,6 @@ package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
@@ -19,6 +14,12 @@ import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 
+import com.google.android.material.textfield.TextInputLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptions.java

@@ -5,12 +5,11 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.support.annotation.NonNull;
-
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.functional.ComparatorCompat;
 import me.zhanghai.android.materialfilemanager.functional.Functional;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptionsLiveData.java

@@ -5,10 +5,9 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.arch.lifecycle.MediatorLiveData;
-
 import javax.annotation.Nullable;
 
+import androidx.lifecycle.MediatorLiveData;
 import me.zhanghai.android.materialfilemanager.settings.SettingsLiveDatas;
 
 public class FileSortOptionsLiveData extends MediatorLiveData<FileSortOptions> {

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenApkDialogFragment.java

@@ -7,12 +7,12 @@ package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.util.FragmentUtils;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenFileAsDialogFragment.java

@@ -7,15 +7,15 @@ package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.util.Pair;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.file.MimeTypes;
 import me.zhanghai.android.materialfilemanager.filesystem.File;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/RenameFileDialogFragment.java

@@ -7,11 +7,11 @@ package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.util.FileNameUtils;

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailData.java

@@ -6,14 +6,14 @@
 package me.zhanghai.android.materialfilemanager.filelist;
 
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 
 public class TrailData {

app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailLiveData.java

@@ -5,10 +5,10 @@
 
 package me.zhanghai.android.materialfilemanager.filelist;
 
-import android.arch.lifecycle.LiveData;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 
 public class TrailLiveData extends LiveData<TrailData> {

app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesBasicTabFragment.java

@@ -6,14 +6,14 @@
 package me.zhanghai.android.materialfilemanager.fileproperties;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDialogFragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesDialogFragment.java

@@ -8,17 +8,18 @@ package me.zhanghai.android.materialfilemanager.fileproperties;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.material.tabs.TabLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesPermissionsTabFragment.java

@@ -6,9 +6,6 @@
 package me.zhanghai.android.materialfilemanager.fileproperties;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.system.OsConstants;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,6 +14,9 @@ import android.widget.Button;
 
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDialogFragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FirstPageWrapContentViewPager.java

@@ -6,12 +6,13 @@
 package me.zhanghai.android.materialfilemanager.fileproperties;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
 public class FirstPageWrapContentViewPager extends ViewPager {
 
     public FirstPageWrapContentViewPager(@NonNull Context context) {

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Archive.java

@@ -8,8 +8,6 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveException;
@@ -36,6 +34,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.functional.Functional;
 import me.zhanghai.android.materialfilemanager.functional.FunctionalIterator;
 import me.zhanghai.android.materialfilemanager.functional.compat.Consumer;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ArchiveFile.java

@@ -7,9 +7,6 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.net.Uri;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
 
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.threeten.bp.Instant;
@@ -19,6 +16,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.functional.Functional;
 import me.zhanghai.android.materialfilemanager.util.CollectionUtils;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/BaseFile.java

@@ -7,8 +7,9 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.net.Uri;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public abstract class BaseFile implements File {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Documents.java

@@ -8,7 +8,8 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class Documents {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/File.java

@@ -8,9 +8,6 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
 
 import org.threeten.bp.Instant;
 
@@ -18,6 +15,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import me.zhanghai.android.materialfilemanager.file.FileTypeNames;
 import me.zhanghai.android.materialfilemanager.file.MimeTypes;
 import me.zhanghai.android.materialfilemanager.util.CollectionUtils;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/FileSystemException.java

@@ -6,7 +6,8 @@
 package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 public class FileSystemException extends Exception {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Files.java

@@ -6,12 +6,12 @@
 package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.functional.Functional;
 
 public class Files {

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFile.java

@@ -5,10 +5,10 @@
 
 package me.zhanghai.android.materialfilemanager.filesystem;
 
-import android.support.annotation.NonNull;
-
 import java.io.File;
 
+import androidx.annotation.NonNull;
+
 public class JavaFile {
 
     public static long getFreeSpace(@NonNull String path) {

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFileObserver.java

@@ -6,9 +6,9 @@
 package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.os.FileObserver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.util.AppUtils;
 
 /*

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFile.java

@@ -7,10 +7,6 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.net.Uri;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.support.v4.util.Pair;
 import android.text.TextUtils;
 
 import org.threeten.bp.Instant;
@@ -19,6 +15,10 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.core.util.Pair;
 import me.zhanghai.android.materialfilemanager.file.MimeTypes;
 import me.zhanghai.android.materialfilemanager.functional.Functional;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFileSystem.java

@@ -7,10 +7,6 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.support.v4.util.Pair;
 import android.system.ErrnoException;
 import android.system.OsConstants;
 
@@ -20,6 +16,10 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.core.util.Pair;
 import me.zhanghai.android.materialfilemanager.functional.Functional;
 import me.zhanghai.android.materialfilemanager.functional.FunctionalException;
 import me.zhanghai.android.materialfilemanager.functional.throwing.ThrowingFunction;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixGroup.java

@@ -7,11 +7,12 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class PosixGroup implements Parcelable {
 
     public int id;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixUser.java

@@ -7,11 +7,12 @@ package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.Objects;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class PosixUser implements Parcelable {
 
     public int id;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellEscaper.java

@@ -5,12 +5,11 @@
 
 package me.zhanghai.android.materialfilemanager.filesystem;
 
-import android.support.annotation.NonNull;
-
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.commons.text.translate.CharSequenceTranslator;
 import org.apache.commons.text.translate.LookupTranslator;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.util.MapBuilder;
 
 public class ShellEscaper {

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellFs.java

@@ -5,8 +5,6 @@
 
 package me.zhanghai.android.materialfilemanager.filesystem;
 
-import android.support.annotation.NonNull;
-import android.support.v4.util.Pair;
 import android.text.TextUtils;
 
 import org.threeten.bp.Instant;
@@ -16,6 +14,8 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.core.util.Pair;
 import me.zhanghai.android.materialfilemanager.AppApplication;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.functional.Functional;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Syscall.java

@@ -5,8 +5,6 @@
 
 package me.zhanghai.android.materialfilemanager.filesystem;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
@@ -18,6 +16,8 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.functional.compat.LongConsumer;
 import me.zhanghai.android.materialfilemanager.jni.Linux;

app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ZipFileCompat.java

@@ -6,7 +6,6 @@
 package me.zhanghai.android.materialfilemanager.filesystem;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
@@ -21,6 +20,8 @@ import java.util.Iterator;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 
+import androidx.annotation.NonNull;
+
 public class ZipFileCompat implements Closeable {
 
     @NonNull

app/src/main/java/me/zhanghai/android/materialfilemanager/functional/Functional.java

@@ -5,14 +5,13 @@
 
 package me.zhanghai.android.materialfilemanager.functional;
 
-import android.support.annotation.CheckResult;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 
+import androidx.annotation.CheckResult;
 import me.zhanghai.android.materialfilemanager.functional.compat.BiConsumer;
 import me.zhanghai.android.materialfilemanager.functional.compat.BiFunction;
 import me.zhanghai.android.materialfilemanager.functional.compat.BiPredicate;

app/src/main/java/me/zhanghai/android/materialfilemanager/functional/FunctionalIterator.java

@@ -5,12 +5,11 @@
 
 package me.zhanghai.android.materialfilemanager.functional;
 
-import android.support.annotation.CheckResult;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
+import androidx.annotation.CheckResult;
 import me.zhanghai.android.materialfilemanager.functional.compat.BiConsumer;
 import me.zhanghai.android.materialfilemanager.functional.compat.BiFunction;
 import me.zhanghai.android.materialfilemanager.functional.compat.BiPredicate;

app/src/main/java/me/zhanghai/android/materialfilemanager/functional/compat/BinaryOperator.java

@@ -24,8 +24,8 @@
  */
 package me.zhanghai.android.materialfilemanager.functional.compat;
 
-import java.util.Objects;
 import java.util.Comparator;
+import java.util.Objects;
 
 /**
  * Represents an operation upon two operands of the same type, producing a result

app/src/main/java/me/zhanghai/android/materialfilemanager/functional/throwing/ThrowingBinaryOperator.java

@@ -24,8 +24,8 @@
  */
 package me.zhanghai.android.materialfilemanager.functional.throwing;
 
-import java.util.Objects;
 import java.util.Comparator;
+import java.util.Objects;
 
 /**
  * Represents an operation upon two operands of the same type, producing a result

app/src/main/java/me/zhanghai/android/materialfilemanager/glide/ApkIconModelLoader.java

@@ -10,8 +10,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.bumptech.glide.Priority;
@@ -24,6 +22,8 @@ import com.bumptech.glide.signature.ObjectKey;
 
 import java.io.File;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.file.MimeTypes;
 
 public class ApkIconModelLoader<Model> implements ModelLoader<Model, Drawable> {

app/src/main/java/me/zhanghai/android/materialfilemanager/glide/AppGlideModule.java

@@ -8,7 +8,6 @@ package me.zhanghai.android.materialfilemanager.glide;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.NonNull;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.Registry;
@@ -17,6 +16,8 @@ import com.bumptech.glide.annotation.GlideModule;
 import java.io.File;
 import java.nio.ByteBuffer;
 
+import androidx.annotation.NonNull;
+
 @GlideModule
 public class AppGlideModule extends com.bumptech.glide.module.AppGlideModule {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/glide/IgnoreErrorDrawableImageViewTarget.java

@@ -6,12 +6,13 @@
 package me.zhanghai.android.materialfilemanager.glide;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.widget.ImageView;
 
 import com.bumptech.glide.request.target.DrawableImageViewTarget;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 // Setting the placeholder drawable as error drawable again causes animation glitches, so we just
 // ignore the onLoadFailed callback.
 public class IgnoreErrorDrawableImageViewTarget extends DrawableImageViewTarget {

app/src/main/java/me/zhanghai/android/materialfilemanager/glide/MediaEmbeddedPictureModelLoader.java

@@ -7,8 +7,6 @@ package me.zhanghai.android.materialfilemanager.glide;
 
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.bumptech.glide.Priority;
@@ -22,6 +20,8 @@ import com.bumptech.glide.signature.ObjectKey;
 import java.io.File;
 import java.nio.ByteBuffer;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.file.MimeTypes;
 
 public class MediaEmbeddedPictureModelLoader<Model> implements ModelLoader<Model, ByteBuffer> {

app/src/main/java/me/zhanghai/android/materialfilemanager/jni/Linux.java

@@ -5,14 +5,15 @@
 
 package me.zhanghai.android.materialfilemanager.jni;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
 import android.system.ErrnoException;
 import android.system.Int64Ref;
 
 import java.io.FileDescriptor;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+
 public class Linux {
 
     public static final long UTIME_NOW = (1L << 30) - 1L;

app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructGroup.java

@@ -5,7 +5,7 @@
 
 package me.zhanghai.android.materialfilemanager.jni;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public final class StructGroup {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructPasswd.java

@@ -5,7 +5,7 @@
 
 package me.zhanghai.android.materialfilemanager.jni;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public final class StructPasswd {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructStatCompat.java

@@ -5,9 +5,10 @@
 
 package me.zhanghai.android.materialfilemanager.jni;
 
-import android.support.annotation.NonNull;
 import android.system.StructStat;
 
+import androidx.annotation.NonNull;
+
 /**
  * @see StructStat
  */

app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainActivity.java

@@ -8,10 +8,10 @@ package me.zhanghai.android.materialfilemanager.main;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 import me.zhanghai.android.materialfilemanager.util.FragmentUtils;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainFragment.java

@@ -6,16 +6,16 @@
 package me.zhanghai.android.materialfilemanager.main;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.DrawerLayout;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationFragment.java

@@ -6,23 +6,23 @@
 package me.zhanghai.android.materialfilemanager.navigation;
 
 import android.app.Activity;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.Observer;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.Observer;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItem.java

@@ -8,12 +8,12 @@ package me.zhanghai.android.materialfilemanager.navigation;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.content.res.AppCompatResources;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.content.res.AppCompatResources;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 
 public abstract class NavigationItem {

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemColor.java

@@ -7,8 +7,8 @@ package me.zhanghai.android.materialfilemanager.navigation;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.util.ViewUtils;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemListLiveData.java

@@ -5,12 +5,12 @@
 
 package me.zhanghai.android.materialfilemanager.navigation;
 
-import android.arch.lifecycle.LiveData;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+
 public class NavigationItemListLiveData extends LiveData<List<NavigationItem>> {
 
     @Nullable

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItems.java

@@ -11,12 +11,6 @@ import android.content.Intent;
 import android.os.Environment;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
 import android.util.Pair;
 
 import java.util.ArrayList;
@@ -24,6 +18,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 import me.zhanghai.android.materialfilemanager.AppApplication;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.about.AboutActivity;

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationListAdapter.java

@@ -7,8 +7,6 @@ package me.zhanghai.android.materialfilemanager.navigation;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -17,6 +15,8 @@ import android.widget.TextView;
 import java.util.Collections;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRecyclerView.java

@@ -8,12 +8,12 @@ package me.zhanghai.android.materialfilemanager.navigation;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v4.math.MathUtils;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.WindowInsets;
 
+import androidx.annotation.NonNull;
+import androidx.core.math.MathUtils;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindDimen;
 import butterknife.BindDrawable;
 import butterknife.ButterKnife;

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRoot.java

@@ -6,8 +6,8 @@
 package me.zhanghai.android.materialfilemanager.navigation;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 
 public interface NavigationRoot {

app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRootMapLiveData.java

@@ -5,14 +5,13 @@
 
 package me.zhanghai.android.materialfilemanager.navigation;
 
-import android.arch.lifecycle.MediatorLiveData;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.MediatorLiveData;
 import me.zhanghai.android.materialfilemanager.filesystem.File;
 
 public class NavigationRootMapLiveData extends MediatorLiveData<Map<File, NavigationRoot>> {

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/CharsetPreference.java

@@ -6,14 +6,14 @@
 package me.zhanghai.android.materialfilemanager.settings;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.ListPreference;
 import android.util.AttributeSet;
 
 import java.nio.charset.Charset;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
 import me.zhanghai.android.materialfilemanager.functional.Functional;
 import me.zhanghai.android.materialfilemanager.functional.compat.Function;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/EnumSettingsLiveData.java

@@ -5,11 +5,11 @@
 
 package me.zhanghai.android.materialfilemanager.settings;
 
-import android.arch.lifecycle.LiveData;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
 import me.zhanghai.android.materialfilemanager.util.SharedPrefsUtils;
 
 public class EnumSettingsLiveData<E extends Enum<E>> extends LiveData<E>

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/NightMode.java

@@ -5,7 +5,7 @@
 
 package me.zhanghai.android.materialfilemanager.settings;
 
-import android.support.v7.app.AppCompatDelegate;
+import androidx.appcompat.app.AppCompatDelegate;
 
 public enum NightMode {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/Settings.java

@@ -8,7 +8,9 @@ package me.zhanghai.android.materialfilemanager.settings;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.filelist.FileSortOptions;
 import me.zhanghai.android.materialfilemanager.filelist.OpenApkDefaultAction;
-import me.zhanghai.android.materialfilemanager.settings.SettingsEntries.*;
+import me.zhanghai.android.materialfilemanager.settings.SettingsEntries.BooleanSettingsEntry;
+import me.zhanghai.android.materialfilemanager.settings.SettingsEntries.EnumSettingsEntry;
+import me.zhanghai.android.materialfilemanager.settings.SettingsEntries.StringSettingsEntry;
 
 interface Settings {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivity.java

@@ -8,10 +8,10 @@ package me.zhanghai.android.materialfilemanager.settings;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import me.zhanghai.android.materialfilemanager.util.FragmentUtils;
 
 public class SettingsActivity extends AppCompatActivity {

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivityFragment.java

@@ -6,20 +6,19 @@
 package me.zhanghai.android.materialfilemanager.settings;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.zhanghai.android.materialfilemanager.R;
-import me.zhanghai.android.materialfilemanager.util.AppUtils;
 
 public class SettingsActivityFragment extends Fragment {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntries.java

@@ -6,12 +6,6 @@
 package me.zhanghai.android.materialfilemanager.settings;
 
 import android.net.Uri;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.BoolRes;
-import android.support.annotation.IntegerRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
 import android.text.TextUtils;
 
 import java.util.Arrays;
@@ -19,6 +13,12 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import androidx.annotation.ArrayRes;
+import androidx.annotation.BoolRes;
+import androidx.annotation.IntegerRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import me.zhanghai.android.materialfilemanager.AppApplication;
 import me.zhanghai.android.materialfilemanager.util.LogUtils;
 import me.zhanghai.android.materialfilemanager.util.SharedPrefsUtils;

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntry.java

@@ -5,10 +5,9 @@
 
 package me.zhanghai.android.materialfilemanager.settings;
 
-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 me.zhanghai.android.materialfilemanager.AppApplication;
 import me.zhanghai.android.materialfilemanager.util.SharedPrefsUtils;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsFragment.java

@@ -6,10 +6,10 @@
 package me.zhanghai.android.materialfilemanager.settings;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 
 import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;
 
+import androidx.annotation.Nullable;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.util.NightModeHelper;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsLiveData.java

@@ -5,12 +5,12 @@
 
 package me.zhanghai.android.materialfilemanager.settings;
 
-import android.arch.lifecycle.LiveData;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
 import me.zhanghai.android.materialfilemanager.util.SharedPrefsUtils;
 
 public class SettingsLiveData<T> extends LiveData<T>

app/src/main/java/me/zhanghai/android/materialfilemanager/shell/SuShell.java

@@ -7,10 +7,10 @@ package me.zhanghai.android.materialfilemanager.shell;
 
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import eu.chainfire.libsuperuser.Debug;
 import me.zhanghai.android.materialfilemanager.BuildConfig;
 import me.zhanghai.android.materialfilemanager.util.Holder;

app/src/main/java/me/zhanghai/android/materialfilemanager/terminal/Terminal.java

@@ -9,8 +9,8 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.util.AppUtils;
 
 public class Terminal {

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AnimatedSortedListAdapter.java

@@ -7,12 +7,12 @@ package me.zhanghai.android.materialfilemanager.ui;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import me.zhanghai.android.materialfilemanager.R;
 
 public abstract class AnimatedSortedListAdapter<T, VH extends RecyclerView.ViewHolder>

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AutoGoneTextView.java

@@ -6,12 +6,12 @@
 package me.zhanghai.android.materialfilemanager.ui;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatTextView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
 import me.zhanghai.android.materialfilemanager.util.ViewUtils;
 
 /**

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableFrameLayout.java

@@ -8,12 +8,13 @@ package me.zhanghai.android.materialfilemanager.ui;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.Checkable;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class CheckableFrameLayout extends FrameLayout implements Checkable {
 
     private static final int[] CHECKED_STATE_SET = {

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableItemBackground.java

@@ -10,8 +10,8 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import me.zhanghai.android.materialfilemanager.R;
 import me.zhanghai.android.materialfilemanager.util.ViewUtils;
 

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableLinearLayout.java

@@ -8,12 +8,13 @@ package me.zhanghai.android.materialfilemanager.ui;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.Checkable;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class CheckableLinearLayout extends LinearLayout implements Checkable {
 
     private static final int[] CHECKED_STATE_SET = {

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ClickableMovementMethod.java

@@ -5,8 +5,6 @@
 
 package me.zhanghai.android.materialfilemanager.ui;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Layout;
 import android.text.Selection;
 import android.text.Spannable;
@@ -16,6 +14,9 @@ import android.text.style.ClickableSpan;
 import android.view.MotionEvent;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * A movement method that traverses links in the text buffer and fires clicks. Unlike
  * {@link LinkMovementMethod}, this will not consume touch events outside {@link ClickableSpan}s.

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CrossfadeSubtitleToolbar.java

@@ -10,16 +10,16 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
 import java.lang.reflect.Field;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import me.zhanghai.android.materialfilemanager.util.ViewUtils;
 
 public class CrossfadeSubtitleToolbar extends Toolbar {

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/FixNestedScrollAppBarLayout.java

@@ -6,14 +6,16 @@
 package me.zhanghai.android.materialfilemanager.ui;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.google.android.material.appbar.AppBarLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+
 public class FixNestedScrollAppBarLayout extends AppBarLayout
         implements CoordinatorLayout.AttachedBehavior {
 

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LicensesDialogFragment.java

@@ -8,11 +8,11 @@ package me.zhanghai.android.materialfilemanager.ui;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatDialogFragment;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
 import de.psdev.licensesdialog.LicensesDialog;
 import de.psdev.licensesdialog.NoticesXmlParser;
 import de.psdev.licensesdialog.model.Notice;

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LinkArrowKeyMovementMethod.java

@@ -5,8 +5,6 @@
 
 package me.zhanghai.android.materialfilemanager.ui;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.Layout;
 import android.text.NoCopySpan;
 import android.text.Selection;
@@ -19,6 +17,9 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * @see LinkMovementMethod
  * @see ArrowKeyMovementMethod

app/src/main/java/me/zhanghai/android/materialfilemanager/ui/PassWindowInsetsFrameLayout.java

@@ -6,12 +6,13 @@
 package me.zhanghai.android.materialfilemanager.ui;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.WindowInsets;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class PassWindowInsetsFrameLayout extends FrameLayout {
 
     public PassWindowInsetsFrameLayout(@NonNull Context context) {