diff --git a/app/build.gradle b/app/build.gradle index 59677c68..9b7b0eb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -46,16 +46,16 @@ dependencies { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "android.arch.lifecycle:extensions:1.1.1" - implementation "android.arch.lifecycle:common-java8:1.1.1" - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' + implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0" + implementation 'androidx.appcompat:appcompat:1.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' - annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1' - implementation 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'com.github.bumptech.glide:glide:4.8.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0' + implementation 'com.jakewharton:butterknife:9.0.0-rc1' + 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' diff --git a/app/src/main/java/android/support/v7/app/NightModeAccessor.java b/app/src/main/java/androidx/appcompat/app/NightModeAccessor.java similarity index 90% rename from app/src/main/java/android/support/v7/app/NightModeAccessor.java rename to app/src/main/java/androidx/appcompat/app/NightModeAccessor.java index c5d2ca21..80ecb70c 100644 --- a/app/src/main/java/android/support/v7/app/NightModeAccessor.java +++ b/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 { diff --git a/app/src/main/java/android/support/v4/widget/ThemedSwipeRefreshLayout.java b/app/src/main/java/androidx/swiperefreshlayout/widget/ThemedSwipeRefreshLayout.java similarity index 89% rename from app/src/main/java/android/support/v4/widget/ThemedSwipeRefreshLayout.java rename to app/src/main/java/androidx/swiperefreshlayout/widget/ThemedSwipeRefreshLayout.java index 91bd7223..42c28a4d 100644 --- a/app/src/main/java/android/support/v4/widget/ThemedSwipeRefreshLayout.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/AppApplication.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/AppApplication.java index fd91f0b3..60c905a3 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/AppApplication.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutActivity.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutActivity.java index fb65a456..bfd5c714 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutActivity.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutFragment.java index 2f95c751..39feff89 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/about/AboutFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJob.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJob.java index ad50d42b..9f18affd 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJob.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobService.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobService.java index 31ceef43..92b02241 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobService.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobs.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobs.java index d56b607c..a2a00451 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileJobs.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileProvider.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileProvider.java index c0c96495..3f06d5d2 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileProvider.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileTypeNames.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileTypeNames.java index 63a74f3a..046072b2 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FileTypeNames.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FormatUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FormatUtils.java index 2c73526c..b628857a 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/FormatUtils.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypeIcons.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypeIcons.java index f357f16b..928fd05d 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypeIcons.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypes.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypes.java index 1321b118..a0cdf286 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/file/MimeTypes.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbData.java index 1c28bbf0..31ff03ed 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbData.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLayout.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLayout.java index 8073a69d..d30855e7 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLayout.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLiveData.java index 4061dbca..4609402b 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/BreadcrumbLiveData.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/ConfirmDeleteFilesDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/ConfirmDeleteFilesDialogFragment.java index d7115268..557c8ef9 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/ConfirmDeleteFilesDialogFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateDirectoryDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateDirectoryDialogFragment.java index 4ea9e729..422ec5b4 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateDirectoryDialogFragment.java +++ b/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 android.support.v4.app.Fragment; - +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import me.zhanghai.android.materialfilemanager.R; public class CreateDirectoryDialogFragment extends FileNameDialogFragment { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateFileDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateFileDialogFragment.java index f4bae1d5..0d6fb795 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/CreateFileDialogFragment.java +++ b/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 android.support.v4.app.Fragment; - +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import me.zhanghai.android.materialfilemanager.R; public class CreateFileDialogFragment extends FileNameDialogFragment { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListAdapter.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListAdapter.java index 6f9e28fd..882b73e4 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListAdapter.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListData.java index c43cc1e9..c9288e66 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListData.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListFragment.java index e7a65b1b..bf6d7514 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListLiveData.java index 4132d6b6..599e615f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListLiveData.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListViewModel.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListViewModel.java index 375469b3..db65491d 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileListViewModel.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileNameDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileNameDialogFragment.java index c919467d..b40ef17d 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileNameDialogFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptions.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptions.java index d2e745bf..8c285906 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptions.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptionsLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptionsLiveData.java index 307aa5f6..38403789 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/FileSortOptionsLiveData.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenApkDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenApkDialogFragment.java index c0aed7af..678bb620 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenApkDialogFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenFileAsDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenFileAsDialogFragment.java index b9121b08..45acc28a 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/OpenFileAsDialogFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/RenameFileDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/RenameFileDialogFragment.java index 0bf345d5..363cb42c 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/RenameFileDialogFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailData.java index 1738340f..ecbcbf20 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailData.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailLiveData.java index 547d875e..7b72f565 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filelist/TrailLiveData.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesBasicTabFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesBasicTabFragment.java index 0a90bae1..ebef7564 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesBasicTabFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesDialogFragment.java index e9d37b8c..c05f9ee4 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesDialogFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesPermissionsTabFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesPermissionsTabFragment.java index d51d696a..97fa94eb 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FilePropertiesPermissionsTabFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FirstPageWrapContentViewPager.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FirstPageWrapContentViewPager.java index 669ce238..07ed016b 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/fileproperties/FirstPageWrapContentViewPager.java +++ b/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) { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Archive.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Archive.java index e7f500ea..fd7b1b4f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Archive.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ArchiveFile.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ArchiveFile.java index 28af6d39..8cf64f60 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ArchiveFile.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/BaseFile.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/BaseFile.java index dc924dce..158d6fc1 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/BaseFile.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Documents.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Documents.java index 3eb040d1..d59f510b 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Documents.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/File.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/File.java index bf16364f..59d66a47 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/File.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/FileSystemException.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/FileSystemException.java index f00d03b3..1a504d5c 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/FileSystemException.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Files.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Files.java index f45dbeca..cc7c97b4 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Files.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFile.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFile.java index e48f457d..7a504fb5 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFile.java +++ b/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) { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFileObserver.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFileObserver.java index 0277fe55..27d21439 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/JavaFileObserver.java +++ b/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; /* diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFile.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFile.java index 0253a1ec..05c93078 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFile.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFileSystem.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFileSystem.java index b39fa0b9..d73fe443 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/LocalFileSystem.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixGroup.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixGroup.java index 15b1840b..89c8c7bb 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixGroup.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixUser.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixUser.java index dd2b3956..09f74fab 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/PosixUser.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellEscaper.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellEscaper.java index ad8dab17..7cbfe8b5 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellEscaper.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellFs.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellFs.java index 33cbf52c..75eadbb2 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ShellFs.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Syscall.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Syscall.java index e79b3b5a..1358a8c9 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/Syscall.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ZipFileCompat.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ZipFileCompat.java index bf88f301..f529f6d9 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/filesystem/ZipFileCompat.java +++ b/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 diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/Functional.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/Functional.java index a4da98b0..b96e53b3 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/Functional.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/FunctionalIterator.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/FunctionalIterator.java index 58776c8d..b15f09cc 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/FunctionalIterator.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/compat/BinaryOperator.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/compat/BinaryOperator.java index cb938971..1d2da96c 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/compat/BinaryOperator.java +++ b/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 diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/throwing/ThrowingBinaryOperator.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/throwing/ThrowingBinaryOperator.java index 51b3b949..163b5bd4 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/functional/throwing/ThrowingBinaryOperator.java +++ b/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 diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/ApkIconModelLoader.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/ApkIconModelLoader.java index 5c860916..b0b9f4e8 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/ApkIconModelLoader.java +++ b/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 implements ModelLoader { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/AppGlideModule.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/AppGlideModule.java index 1325db08..bf54106e 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/AppGlideModule.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/IgnoreErrorDrawableImageViewTarget.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/IgnoreErrorDrawableImageViewTarget.java index 78e2a05e..0d337933 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/IgnoreErrorDrawableImageViewTarget.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/MediaEmbeddedPictureModelLoader.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/MediaEmbeddedPictureModelLoader.java index a34c1aed..0d33abb6 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/glide/MediaEmbeddedPictureModelLoader.java +++ b/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 implements ModelLoader { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/Linux.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/Linux.java index 95aa5b9e..27a95c9d 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/Linux.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructGroup.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructGroup.java index 73511676..15d91ed0 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructGroup.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructPasswd.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructPasswd.java index 92958372..f7163344 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructPasswd.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructStatCompat.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructStatCompat.java index 9dd0d72f..5a92fdea 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/jni/StructStatCompat.java +++ b/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 */ diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainActivity.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainActivity.java index 7f5c742a..c63639f6 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainActivity.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainFragment.java index ac6d7bf3..be46ccec 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/main/MainFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationFragment.java index 8d00440e..8db1cce7 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItem.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItem.java index 9f5adbf3..489f6cdb 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItem.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemColor.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemColor.java index 6ae6b418..24986889 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemColor.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemListLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemListLiveData.java index 8bc7587f..47ceab35 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItemListLiveData.java +++ b/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> { @Nullable diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItems.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItems.java index 71c79579..354c8447 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationItems.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationListAdapter.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationListAdapter.java index 84d7dd8f..b58d84a7 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationListAdapter.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRecyclerView.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRecyclerView.java index 2aeb4432..9ccfffc7 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRecyclerView.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRoot.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRoot.java index c2052958..87b40f21 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRoot.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRootMapLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRootMapLiveData.java index b266252a..ad2d59f5 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/navigation/NavigationRootMapLiveData.java +++ b/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> { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/CharsetPreference.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/CharsetPreference.java index 36d506b6..bdbf2f68 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/CharsetPreference.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/EnumSettingsLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/EnumSettingsLiveData.java index 5ebfa077..905a3090 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/EnumSettingsLiveData.java +++ b/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> extends LiveData diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/NightMode.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/NightMode.java index b6ac8e41..5bb34eaa 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/NightMode.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/Settings.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/Settings.java index a8ee09c5..59af3fa0 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/Settings.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivity.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivity.java index cf74fc70..cd81a71d 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivity.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivityFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivityFragment.java index 9e1ee11b..cb0f1a5a 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsActivityFragment.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntries.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntries.java index 4498fc86..6154f4f6 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntries.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntry.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntry.java index e25c3cf1..bef78d43 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsEntry.java +++ b/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 android.support.annotation.Nullable; -import android.support.annotation.StringRes; - +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import me.zhanghai.android.materialfilemanager.AppApplication; import me.zhanghai.android.materialfilemanager.util.SharedPrefsUtils; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsFragment.java index ad3ee49d..1e4ff833 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsLiveData.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsLiveData.java index 5b0c4fdd..3d376894 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/settings/SettingsLiveData.java +++ b/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 extends LiveData diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/shell/SuShell.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/shell/SuShell.java index 5e381f5e..8600a757 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/shell/SuShell.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/terminal/Terminal.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/terminal/Terminal.java index 43b120fe..a0b2581f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/terminal/Terminal.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AnimatedSortedListAdapter.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AnimatedSortedListAdapter.java index aa898114..b3133bfa 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AnimatedSortedListAdapter.java +++ b/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 diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AutoGoneTextView.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AutoGoneTextView.java index a057d06c..870c2669 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/AutoGoneTextView.java +++ b/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; /** diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableFrameLayout.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableFrameLayout.java index e7bafc5f..8a9bd971 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableFrameLayout.java +++ b/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 = { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableItemBackground.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableItemBackground.java index 52fe01ae..30e7256f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableItemBackground.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableLinearLayout.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableLinearLayout.java index 60486da4..541068b1 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CheckableLinearLayout.java +++ b/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 = { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ClickableMovementMethod.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ClickableMovementMethod.java index ff9594d1..8e6178fd 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ClickableMovementMethod.java +++ b/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. diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CrossfadeSubtitleToolbar.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CrossfadeSubtitleToolbar.java index 186415a1..df657913 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/CrossfadeSubtitleToolbar.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/FixNestedScrollAppBarLayout.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/FixNestedScrollAppBarLayout.java index 4d1c2fca..e2cdca5f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/FixNestedScrollAppBarLayout.java +++ b/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 { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LicensesDialogFragment.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LicensesDialogFragment.java index cb356db7..d7a4116f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LicensesDialogFragment.java +++ b/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; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LinkArrowKeyMovementMethod.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LinkArrowKeyMovementMethod.java index 84b68bda..b0e17589 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/LinkArrowKeyMovementMethod.java +++ b/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 diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/PassWindowInsetsFrameLayout.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/PassWindowInsetsFrameLayout.java index 890bc743..78788aa2 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/PassWindowInsetsFrameLayout.java +++ b/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) { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SetMenuResourceMaterialCab.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SetMenuResourceMaterialCab.java index 0b02cda1..0e38b06a 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SetMenuResourceMaterialCab.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SetMenuResourceMaterialCab.java @@ -6,13 +6,14 @@ package me.zhanghai.android.materialfilemanager.ui; import android.os.Bundle; -import android.support.annotation.MenuRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import com.afollestad.materialcab.MaterialCab; +import androidx.annotation.MenuRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + public class SetMenuResourceMaterialCab extends com.afollestad.materialcab.MaterialCab { @MenuRes diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SimpleAdapter.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SimpleAdapter.java index 092d84e7..f4510e5c 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SimpleAdapter.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SimpleAdapter.java @@ -5,14 +5,14 @@ package me.zhanghai.android.materialfilemanager.ui; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + public abstract class SimpleAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SortedListAdapter.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SortedListAdapter.java index 4cbe80cd..2189a501 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SortedListAdapter.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/SortedListAdapter.java @@ -5,14 +5,14 @@ package me.zhanghai.android.materialfilemanager.ui; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.util.SortedList; -import android.support.v7.widget.RecyclerView; - import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.SortedList; + public abstract class SortedListAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/StatusBarBackgroundView.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/StatusBarBackgroundView.java index 00432402..7133ba4d 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/StatusBarBackgroundView.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/StatusBarBackgroundView.java @@ -10,12 +10,12 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.WindowInsets; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import me.zhanghai.android.materialfilemanager.R; import me.zhanghai.android.materialfilemanager.util.ViewUtils; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/TabFragmentPagerAdapter.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/TabFragmentPagerAdapter.java index 075e166b..f7160b1a 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/TabFragmentPagerAdapter.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/TabFragmentPagerAdapter.java @@ -5,17 +5,18 @@ package me.zhanghai.android.materialfilemanager.ui; -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.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import com.google.android.material.tabs.TabLayout; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; + public class TabFragmentPagerAdapter extends FragmentPagerAdapter { @NonNull diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ThemedSpeedDialView.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ThemedSpeedDialView.java index 21a41ea6..f7fbf44b 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ThemedSpeedDialView.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/ui/ThemedSpeedDialView.java @@ -7,10 +7,6 @@ package me.zhanghai.android.materialfilemanager.ui; import android.content.Context; import android.os.Parcelable; -import android.support.annotation.MenuRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.PopupMenu; import android.util.AttributeSet; import android.view.Menu; import android.view.MenuItem; @@ -21,6 +17,10 @@ import com.leinardi.android.speeddial.SpeedDialView; import java.util.ArrayList; +import androidx.annotation.MenuRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.PopupMenu; import me.zhanghai.android.materialfilemanager.R; import me.zhanghai.android.materialfilemanager.util.ViewUtils; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/AppUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/AppUtils.java index dbeb9179..74e3114c 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/AppUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/AppUtils.java @@ -16,16 +16,16 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.NavUtils; -import android.support.v4.app.TaskStackBuilder; import java.lang.reflect.Field; import java.lang.reflect.Method; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NavUtils; +import androidx.core.app.TaskStackBuilder; +import androidx.fragment.app.Fragment; import me.zhanghai.android.materialfilemanager.R; public class AppUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/BundleBuilder.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/BundleBuilder.java index 3c6de9aa..03718557 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/BundleBuilder.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/BundleBuilder.java @@ -11,10 +11,6 @@ import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v4.app.BundleCompat; import android.util.Size; import android.util.SizeF; import android.util.SparseArray; @@ -22,6 +18,11 @@ import android.util.SparseArray; import java.io.Serializable; import java.util.ArrayList; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.app.BundleCompat; + @SuppressWarnings("unused") public class BundleBuilder { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ClipboardUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ClipboardUtils.java index 4202f60b..32e6c8e7 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ClipboardUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ClipboardUtils.java @@ -8,11 +8,11 @@ package me.zhanghai.android.materialfilemanager.util; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import me.zhanghai.android.materialfilemanager.R; public class ClipboardUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/CollectionUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/CollectionUtils.java index 8b6998d3..30179eba 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/CollectionUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/CollectionUtils.java @@ -5,10 +5,6 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.ObjectsCompat; - import java.util.AbstractList; import java.util.Collection; import java.util.HashSet; @@ -16,6 +12,9 @@ import java.util.List; import java.util.RandomAccess; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.ObjectsCompat; import me.zhanghai.android.materialfilemanager.functional.Functional; public class CollectionUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FileNameUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FileNameUtils.java index 1de72d79..862259be 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FileNameUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FileNameUtils.java @@ -5,9 +5,10 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.NonNull; import android.text.TextUtils; +import androidx.annotation.NonNull; + /** * This class assumes the only separator to be '/'. * diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FragmentUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FragmentUtils.java index f98c9554..ceb966f0 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FragmentUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/FragmentUtils.java @@ -6,12 +6,13 @@ package me.zhanghai.android.materialfilemanager.util; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; + +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; public class FragmentUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/Holder.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/Holder.java index e7f1dabe..dceedbde 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/Holder.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/Holder.java @@ -5,7 +5,7 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class Holder { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/IntentUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/IntentUtils.java index 0061baac..63e7415f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/IntentUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/IntentUtils.java @@ -12,14 +12,14 @@ import android.os.Build; import android.os.Parcelable; import android.provider.MediaStore; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.IntentCompat; import org.apache.commons.lang3.ArrayUtils; import java.io.File; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.IntentCompat; import me.zhanghai.android.materialfilemanager.file.MimeTypes; public class IntentUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ListBuilder.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ListBuilder.java index cceaab3e..06220fde 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ListBuilder.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ListBuilder.java @@ -6,9 +6,6 @@ package me.zhanghai.android.materialfilemanager.util; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import java.util.ArrayList; import java.util.Collection; @@ -18,6 +15,10 @@ import java.util.List; import java.util.function.Predicate; import java.util.function.UnaryOperator; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + @SuppressWarnings("unused") public class ListBuilder> { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/LogUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/LogUtils.java index fb01edbf..98903c63 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/LogUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/LogUtils.java @@ -5,9 +5,9 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.NonNull; import android.util.Log; +import androidx.annotation.NonNull; import me.zhanghai.android.materialfilemanager.BuildConfig; public class LogUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapBuilder.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapBuilder.java index 50040dc6..920f056f 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapBuilder.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapBuilder.java @@ -6,15 +6,16 @@ package me.zhanghai.android.materialfilemanager.util; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.function.BiFunction; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + @SuppressWarnings("unused") public class MapBuilder> { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapCompat.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapCompat.java index e5d1c98c..8f4a1ead 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapCompat.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MapCompat.java @@ -5,12 +5,11 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - import java.util.Map; import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import me.zhanghai.android.materialfilemanager.functional.compat.BiFunction; import me.zhanghai.android.materialfilemanager.functional.compat.Function; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MoreTextUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MoreTextUtils.java index 9c514f29..1d0dc8b0 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MoreTextUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/MoreTextUtils.java @@ -5,10 +5,11 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class MoreTextUtils { private MoreTextUtils() {} diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NaturalOrderComparator.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NaturalOrderComparator.java index c8c5e847..56c84f44 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NaturalOrderComparator.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NaturalOrderComparator.java @@ -5,10 +5,10 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.NonNull; - import java.util.Comparator; +import androidx.annotation.NonNull; + public class NaturalOrderComparator implements Comparator { private static final int DIGIT_RADIX = 10; diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NightModeHelper.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NightModeHelper.java index f5512718..97d18847 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NightModeHelper.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/NightModeHelper.java @@ -10,16 +10,16 @@ import android.app.Application; import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.app.NightModeAccessor; import java.util.HashMap; import java.util.Map; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.app.NightModeAccessor; import me.zhanghai.android.materialfilemanager.functional.extension.TriConsumer; import me.zhanghai.android.materialfilemanager.settings.NightMode; import me.zhanghai.android.materialfilemanager.settings.SettingsLiveDatas; @@ -61,7 +61,7 @@ public class NightModeHelper { * Should be called before super.onConfigurationChanged() to avoid activity recreation by * AppCompat. * - * @see android.support.v7.app.AppCompatDelegateImpl#updateForNightMode(int) + * @see androidx.appcompat.app.AppCompatDelegateImpl#updateForNightMode(int) */ public static void onConfigurationChanged( @NonNull Activity activity, diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ObjectUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ObjectUtils.java index f3c0a286..169c0ba1 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ObjectUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ObjectUtils.java @@ -5,8 +5,8 @@ package me.zhanghai.android.materialfilemanager.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class ObjectUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ResourcesFlusher.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ResourcesFlusher.java index 1ffd1db7..8e349b3e 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ResourcesFlusher.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ResourcesFlusher.java @@ -9,20 +9,22 @@ import android.annotation.SuppressLint; import android.content.res.Resources; import android.os.Build; import android.os.Build.VERSION; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import android.util.ArrayMap; import android.util.LongSparseArray; + import java.lang.reflect.Field; import java.util.Map; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + /** * This class flushes all the entries of ThemedResourceCache, instead of only mUnthemedEntries as in * AppCompat. * - * @see android.support.v7.app.ResourcesFlusher + * @see androidx.appcompat.app.ResourcesFlusher */ public class ResourcesFlusher { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SetBuilder.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SetBuilder.java index 37a70b74..d564e535 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SetBuilder.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SetBuilder.java @@ -6,9 +6,6 @@ package me.zhanghai.android.materialfilemanager.util; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import java.util.Collection; import java.util.Collections; @@ -16,6 +13,10 @@ import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + @SuppressWarnings("unused") public class SetBuilder> { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SharedPrefsUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SharedPrefsUtils.java index 7eae4c8b..c328afbe 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SharedPrefsUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/SharedPrefsUtils.java @@ -7,11 +7,11 @@ package me.zhanghai.android.materialfilemanager.util; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import me.zhanghai.android.materialfilemanager.AppApplication; public class SharedPrefsUtils { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageManagerCompat.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageManagerCompat.java index 17bdcac9..bec8ff1e 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageManagerCompat.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageManagerCompat.java @@ -9,14 +9,15 @@ import android.annotation.SuppressLint; import android.os.Build; import android.os.storage.StorageManager; import android.os.storage.StorageVolume; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * @see StorageManager * @see diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageVolumeCompat.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageVolumeCompat.java index b5ff99ce..58144454 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageVolumeCompat.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StorageVolumeCompat.java @@ -9,14 +9,15 @@ import android.annotation.SuppressLint; import android.content.Context; import android.os.Build; import android.os.storage.StorageVolume; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + /** * @see StorageVolume * @see diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StringCompat.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StringCompat.java index 51647d8d..4e369541 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StringCompat.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/StringCompat.java @@ -6,7 +6,8 @@ package me.zhanghai.android.materialfilemanager.util; import android.os.Build; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; public class StringCompat { diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ToastUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ToastUtils.java index ed886992..2b5b0033 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ToastUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ToastUtils.java @@ -6,10 +6,11 @@ package me.zhanghai.android.materialfilemanager.util; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; + public class ToastUtils { private ToastUtils() {} diff --git a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ViewUtils.java b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ViewUtils.java index 1359edd1..ef19634a 100644 --- a/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ViewUtils.java +++ b/app/src/main/java/me/zhanghai/android/materialfilemanager/util/ViewUtils.java @@ -16,22 +16,6 @@ import android.content.res.TypedArray; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.AnyRes; -import android.support.annotation.AttrRes; -import android.support.annotation.Dimension; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.Px; -import android.support.annotation.StyleRes; -import android.support.design.widget.TextInputLayout; -import android.support.v4.util.ObjectsCompat; -import android.support.v4.view.MarginLayoutParamsCompat; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.animation.FastOutLinearInInterpolator; -import android.support.v4.view.animation.FastOutSlowInInterpolator; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.content.res.AppCompatResources; -import android.support.v7.view.ContextThemeWrapper; import android.text.Editable; import android.text.TextWatcher; import android.util.DisplayMetrics; @@ -44,6 +28,23 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; +import com.google.android.material.textfield.TextInputLayout; + +import androidx.annotation.AnyRes; +import androidx.annotation.AttrRes; +import androidx.annotation.Dimension; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Px; +import androidx.annotation.StyleRes; +import androidx.appcompat.content.res.AppCompatResources; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.core.util.ObjectsCompat; +import androidx.core.view.MarginLayoutParamsCompat; +import androidx.core.view.ViewCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.interpolator.view.animation.FastOutLinearInInterpolator; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import me.zhanghai.android.materialfilemanager.R; import me.zhanghai.android.materialfilemanager.functional.compat.BooleanSupplier; import me.zhanghai.android.materialfilemanager.ui.ClickableMovementMethod; diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml index 7675d032..31d582ff 100644 --- a/app/src/main/res/layout/about_fragment.xml +++ b/app/src/main/res/layout/about_fragment.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - @@ -175,9 +175,9 @@ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> - + - @@ -289,7 +289,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> - + diff --git a/app/src/main/res/layout/file_list_fragment.xml b/app/src/main/res/layout/file_list_fragment.xml index 169660b6..aaa38d6c 100644 --- a/app/src/main/res/layout/file_list_fragment.xml +++ b/app/src/main/res/layout/file_list_fragment.xml @@ -5,7 +5,7 @@ ~ All Rights Reserved. --> - - @@ -101,7 +101,7 @@ app:fastScrollPopupBgColor="?colorAccent" app:fastScrollThumbColor="?colorAccent" tools:listitem="@layout/file_item" /> - + - + diff --git a/app/src/main/res/layout/file_properties_dialog.xml b/app/src/main/res/layout/file_properties_dialog.xml index d89c30ae..cc99f203 100644 --- a/app/src/main/res/layout/file_properties_dialog.xml +++ b/app/src/main/res/layout/file_properties_dialog.xml @@ -23,7 +23,7 @@ android:layout_gravity="bottom" android:background="?colorControlHighlight" /> - - - + diff --git a/app/src/main/res/layout/settings_activity_fragment.xml b/app/src/main/res/layout/settings_activity_fragment.xml index b7c43c8d..fabad781 100644 --- a/app/src/main/res/layout/settings_activity_fragment.xml +++ b/app/src/main/res/layout/settings_activity_fragment.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" android:orientation="vertical"> -