Migrated to AndroidX. (#159)

* 📝
[Update]
- README.md

* 🚩
[Update]
- Migrated to AndroidX.

* ✨
[Add]
- Supported custom Thread Pool.

Author: rosuH

README.md

@@ -27,9 +27,8 @@ Well, it doesn't have a name like Rocky, Cosmos or Fish. Android File Picker, li
 | ![](https://github.com/rosuH/AndroidFilePicker/master/images/default_theme.png) | ![](https://github.com/rosuH/AndroidFilePicker/master/images/reply_theme.png) | ![](https://github.com/rosuH/AndroidFilePicker/master/images/crane_theme.png) | ![](https://github.com/rosuH/AndroidFilePicker/master/images/shrine_theme.png) |
 
 ## Version Compatibility
-It depends on your targetAPI:
-- `targetAPI <= 28`, you are fine ;)
-- `targetAPI >= 29`, please enable `requestLegacyExternalStorage` feature for your project :D
+
+Support Android 11 and all versions below.
 
 ## Download
 

README_CN.md

@@ -28,10 +28,7 @@
 | ![](https://github.com/rosuH/AndroidFilePicker/master/images/default_theme.png) | ![](https://github.com/rosuH/AndroidFilePicker/master/images/reply_theme.png) | ![](https://github.com/rosuH/AndroidFilePicker/master/images/crane_theme.png) | ![](https://github.com/rosuH/AndroidFilePicker/master/images/shrine_theme.png) |
 
 ## 版本兼容性
-这取决于您的 targetAPI ：
-
-- `targetAPI <= 28`，完全没有问题 ;）
-- `targetAPI >= 29`，请为您的项目启用 `requestLegacyExternalStorage` 特性：D
+支持 Android 11 及其以下所有版本。
 
 ## 下载使用
 

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version="1.5.21"
+    ext.kotlin_version="1.6.0"
     repositories {
         google()
         mavenCentral()

filepicker/build.gradle

@@ -36,19 +36,20 @@ android {
     }
 }
 
-ext.supportLibVersion = '28.0.0'
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     compileOnly 'com.squareup.picasso:picasso:2.5.2'
     compileOnly ("com.github.bumptech.glide:glide:4.9.0") {
         exclude group: "com.android.support"
     }
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
-    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
-    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
-    implementation "com.android.support.constraint:constraint-layout:2.0.4"
+    def kotlin_version = '1.6.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }

filepicker/src/androidTest/java/me/rosuh/filepicker/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package me.rosuh.filepicker;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

filepicker/src/main/java/me/rosuh/filepicker/FilePickerActivity.kt

@@ -7,13 +7,13 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.*
 import android.os.Environment.MEDIA_MOUNTED
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
-import android.support.v4.util.ArrayMap
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.collection.ArrayMap
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -48,28 +48,15 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
     private var btnGoBack: ImageView? = null
     private var mainHandler = Handler(Looper.getMainLooper())
 
-    private val loadingFileWorkerQueue: BlockingQueue<Runnable> = LinkedBlockingQueue()
-
     // Creates a thread pool manager
-    private var loadingThreadPool: ThreadPoolExecutor = ThreadPoolExecutor(
-        1,       // Initial pool size
-        1,       // Max pool size
-        KEEP_ALIVE_TIME,
-        TimeUnit.MINUTES,
-        loadingFileWorkerQueue
-    )
-        get() {
-            if (field.isShutdown) {
-                field = ThreadPoolExecutor(
-                    1,
-                    1,
-                    KEEP_ALIVE_TIME,
-                    TimeUnit.MINUTES,
-                    loadingFileWorkerQueue
-                )
-            }
-            return field
-        }
+    private val loadingThreadPool: ExecutorService =
+        FilePickerManager.config.threadPool ?: ThreadPoolExecutor(
+            1,       // Initial pool size
+            1,       // Max pool size
+            KEEP_ALIVE_TIME,
+            TimeUnit.MINUTES,
+            LinkedBlockingDeque()
+        )
 
     private val loadFileRunnable: Runnable by lazy {
         Runnable {
@@ -190,7 +177,12 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
 
     override fun onDestroy() {
         super.onDestroy()
-        if (!loadingThreadPool.isShutdown) {
+        Log.i(TAG, "onDestroy")
+        val shouldShutDownThreadPool = pickerConfig.threadPool != loadingThreadPool
+                || pickerConfig.threadPoolAutoShutDown
+
+        if (!loadingThreadPool.isShutdown && shouldShutDownThreadPool) {
+            Log.i(TAG, "shutdown thread pool")
             loadingThreadPool.shutdown()
         }
         currOffsetMap.clear()
@@ -218,6 +210,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
         permissions: Array<out String>,
         grantResults: IntArray
     ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {
             FILE_PICKER_PERMISSION_REQUEST_CODE -> {
                 if (grantResults.isEmpty() || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
@@ -303,7 +296,11 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
 
         rvNav = findViewById<RecyclerView>(R.id.rv_nav_file_picker).apply {
             layoutManager =
-                LinearLayoutManager(this@FilePickerActivity, LinearLayoutManager.HORIZONTAL, false)
+                LinearLayoutManager(
+                    this@FilePickerActivity,
+                    LinearLayoutManager.HORIZONTAL,
+                    false
+                )
             adapter = navAdapter
         }
         rvList = findViewById<RecyclerViewFilePicker>(R.id.rv_list_file_picker).apply {
@@ -328,9 +325,18 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
             return
         }
         if (Environment.getExternalStorageState() != MEDIA_MOUNTED) {
-            throw Throwable(cause = IllegalStateException("External storage is not available ====>>> Environment.getExternalStorageState() != MEDIA_MOUNTED"))
+            Log.e(
+                TAG, "External storage is not available ====>>> "
+                        + "Environment.getExternalStorageState() != MEDIA_MOUNTED"
+            )
+            return
+        }
+        try {
+            Log.i(TAG, "loadList in ${Thread.currentThread()} in $loadingThreadPool")
+            loadingThreadPool.submit(loadFileRunnable)
+        } catch (e: RejectedExecutionException) {
+            Log.e(TAG, "submit job failed")
         }
-        loadingThreadPool.submit(loadFileRunnable)
     }
 
     private fun initRv(
@@ -652,6 +658,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
     private fun isCanSelect() = selectedCount < maxSelectable
 
     companion object {
+        private const val TAG = "FilePickerActivity"
         private const val FILE_PICKER_PERMISSION_REQUEST_CODE = 10201
 
         // Sets the amount of time an idle thread waits before terminating

filepicker/src/main/java/me/rosuh/filepicker/adapter/BaseAdapter.kt

@@ -1,6 +1,6 @@
 package me.rosuh.filepicker.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import me.rosuh.filepicker.bean.FileBean
 

filepicker/src/main/java/me/rosuh/filepicker/adapter/FileListAdapter.kt

@@ -1,7 +1,7 @@
 package me.rosuh.filepicker.adapter
 
-import android.support.v4.util.ArraySet
-import android.support.v7.widget.RecyclerView
+import androidx.collection.ArraySet
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

filepicker/src/main/java/me/rosuh/filepicker/adapter/FileNavAdapter.kt

@@ -1,6 +1,6 @@
 package me.rosuh.filepicker.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

filepicker/src/main/java/me/rosuh/filepicker/adapter/RecyclerViewListener.kt

@@ -1,8 +1,8 @@
 package me.rosuh.filepicker.adapter
 
 import android.content.res.Resources
-import android.support.v4.view.GestureDetectorCompat
-import android.support.v7.widget.RecyclerView
+import androidx.core.view.GestureDetectorCompat
+import androidx.recyclerview.widget.RecyclerView
 import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View