[Update]

- 🎨 migrate to AndroidX

Author: rosuH

filepicker/build.gradle

@@ -17,7 +17,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -41,11 +41,12 @@ dependencies {
     compileOnly ("com.github.bumptech.glide:glide:4.9.0") {
         exclude group: "com.android.support"
     }
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
     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:1.1.3"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     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.2.0'
 }

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

@@ -1,13 +1,14 @@
 package me.rosuh.filepicker;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.

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

@@ -7,16 +7,15 @@ 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.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.animation.AnimationUtils
 import android.widget.RelativeLayout
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.empty_file_list_file_picker.view.*
 import kotlinx.android.synthetic.main.main_activity_for_file_picker.*
 import me.rosuh.filepicker.R.string
@@ -262,7 +261,11 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
             navAdapter = produceNavAdapter(navDataList)
             adapter = navAdapter
             layoutManager =
-                LinearLayoutManager(this@FilePickerActivity, LinearLayoutManager.HORIZONTAL, false)
+                androidx.recyclerview.widget.LinearLayoutManager(
+                    this@FilePickerActivity,
+                    androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL,
+                    false
+                )
             removeOnItemTouchListener(navListener)
             addOnItemTouchListener(navListener)
         }
@@ -291,7 +294,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
     /**
      * 获取两个列表的监听器
      */
-    private fun getListener(recyclerView: RecyclerView): RecyclerViewListener {
+    private fun getListener(recyclerView: androidx.recyclerview.widget.RecyclerView): RecyclerViewListener {
         return RecyclerViewListener(this@FilePickerActivity, recyclerView, this@FilePickerActivity)
     }
 
@@ -326,7 +329,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
     private fun saveCurrPos(item: FileNavBeanImpl?, position: Int) {
         item?.run {
             currPosMap[filePath] = position
-            (rv_list_file_picker?.layoutManager as? LinearLayoutManager)?.let {
+            (rv_list_file_picker?.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager)?.let {
                 currOffsetMap.put(filePath, it.findViewByPosition(position)?.top ?: 0)
             }
         }
@@ -338,7 +341,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
      * 传递 item 点击事件给调用者
      */
     override fun onItemClick(
-        adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
+        adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
         view: View,
         position: Int
     ) {
@@ -380,7 +383,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
      * 子控件被点击
      */
     override fun onItemChildClick(
-        adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
+        adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
         view: View,
         position: Int
     ) {
@@ -417,7 +420,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
      * 条目被长按
      */
     override fun onItemLongClick(
-        adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
+        adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
         view: View,
         position: Int
     ) {

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

@@ -1,10 +1,10 @@
 package me.rosuh.filepicker.adapter
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import me.rosuh.filepicker.bean.FileBean
 
-abstract class BaseAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+abstract class BaseAdapter :
+    androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
     abstract fun getItem(position: Int): FileBean?
     abstract fun getItemView(position: Int): View?
 }

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

@@ -1,14 +1,14 @@
 package me.rosuh.filepicker.adapter
 
 import android.net.Uri
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
 import android.widget.ImageView
 import android.widget.RadioButton
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import me.rosuh.filepicker.FilePickerActivity
 import me.rosuh.filepicker.R
 import me.rosuh.filepicker.bean.FileItemBeanImpl

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

@@ -1,6 +1,5 @@
 package me.rosuh.filepicker.adapter
 
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,10 +18,13 @@ class FileNavAdapter(
     var data: MutableList<FileNavBeanImpl>
 ) :
     BaseAdapter() {
-    private lateinit var recyclerView: RecyclerView
+    private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        if (parent is RecyclerView) {
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): androidx.recyclerview.widget.RecyclerView.ViewHolder {
+        if (parent is androidx.recyclerview.widget.RecyclerView) {
             recyclerView = parent
         }
         return NavListHolder(activity.layoutInflater, parent)
@@ -36,7 +38,10 @@ class FileNavAdapter(
         return data.size
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, postion: Int) {
+    override fun onBindViewHolder(
+        holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
+        postion: Int
+    ) {
         (holder as NavListHolder).bind(data[postion], postion)
     }
 
@@ -49,7 +54,13 @@ class FileNavAdapter(
     }
 
     inner class NavListHolder(inflater: LayoutInflater, val parent: ViewGroup) :
-        RecyclerView.ViewHolder(inflater.inflate(R.layout.item_nav_file_picker, parent, false)) {
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(
+            inflater.inflate(
+                R.layout.item_nav_file_picker,
+                parent,
+                false
+            )
+        ) {
 
         private var mBtnDir: TextView? = null
 

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

@@ -1,11 +1,10 @@
 package me.rosuh.filepicker.adapter
 
 import android.app.Activity
-import android.support.v4.view.GestureDetectorCompat
-import android.support.v7.widget.RecyclerView
 import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
+import androidx.core.view.GestureDetectorCompat
 import me.rosuh.filepicker.R
 import me.rosuh.filepicker.utils.ScreenUtils
 
@@ -19,10 +18,10 @@ import me.rosuh.filepicker.utils.ScreenUtils
  */
 class RecyclerViewListener(
     val activity: Activity,
-    val recyclerView: RecyclerView,
+    val recyclerView: androidx.recyclerview.widget.RecyclerView,
     val itemClickListener: OnItemClickListener
 ) :
-    RecyclerView.OnItemTouchListener {
+    androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
 
     /**
      * Custom item click listener, receive item event and redispatch
@@ -33,7 +32,7 @@ class RecyclerViewListener(
          * Item click
          */
         fun onItemClick(
-            adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
+            adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
             view: View,
             position: Int
         )
@@ -42,7 +41,7 @@ class RecyclerViewListener(
          * Item long click
          */
         fun onItemLongClick(
-            adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
+            adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
             view: View,
             position: Int
         )
@@ -51,7 +50,7 @@ class RecyclerViewListener(
          * Item child click
          */
         fun onItemChildClick(
-            adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
+            adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
             view: View,
             position: Int
         )
@@ -60,11 +59,14 @@ class RecyclerViewListener(
     private var gestureDetectorCompat: GestureDetectorCompat =
         GestureDetectorCompat(recyclerView.context, ItemTouchHelperGestureListener())
 
-    override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {
+    override fun onTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent) {
         gestureDetectorCompat.onTouchEvent(e)
     }
 
-    override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
+    override fun onInterceptTouchEvent(
+        rv: androidx.recyclerview.widget.RecyclerView,
+        e: MotionEvent
+    ): Boolean {
         return gestureDetectorCompat.onTouchEvent(e)
     }
 

filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerConfig.kt

@@ -1,8 +1,8 @@
 package me.rosuh.filepicker.config
 
 import android.content.Intent
-import android.support.annotation.NonNull
-import android.support.annotation.StringRes
+import androidx.annotation.NonNull
+import androidx.annotation.StringRes
 import me.rosuh.filepicker.FilePickerActivity
 import me.rosuh.filepicker.R
 

filepicker/src/main/java/me/rosuh/filepicker/config/FilePickerManager.kt

@@ -1,7 +1,6 @@
 package me.rosuh.filepicker.config
 
 import android.app.Activity
-import android.support.v4.app.Fragment
 import java.lang.ref.WeakReference
 
 /**
@@ -16,7 +15,7 @@ object FilePickerManager {
     const val REQUEST_CODE = 10401
 
     internal var contextRef: WeakReference<Activity>? = null
-    internal var fragmentRef: WeakReference<Fragment>? = null
+    internal var fragmentRef: WeakReference<androidx.fragment.app.Fragment>? = null
     internal lateinit var config: FilePickerConfig
 
     fun from(activity: Activity): FilePickerConfig {
@@ -34,7 +33,7 @@ object FilePickerManager {
     /**
      * 不能使用 fragmentRef.getContext()，因为无法保证外部的代码环境
      */
-    fun from(fragment: Fragment): FilePickerConfig {
+    fun from(fragment: androidx.fragment.app.Fragment): FilePickerConfig {
         reset()
         this.fragmentRef = WeakReference(fragment)
         this.contextRef = WeakReference(fragment.activity!!)

filepicker/src/main/java/me/rosuh/filepicker/widget/PosLinearLayoutManager.kt

@@ -2,11 +2,9 @@ package me.rosuh.filepicker.widget
 
 import android.content.Context
 import android.os.Parcelable
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
 
-class PosLinearLayoutManager : LinearLayoutManager {
+class PosLinearLayoutManager : androidx.recyclerview.widget.LinearLayoutManager {
     constructor(context: Context?) : super(context)
     constructor(context: Context?, orientation: Int, reverseLayout: Boolean) : super(
         context,
@@ -30,7 +28,10 @@ class PosLinearLayoutManager : LinearLayoutManager {
 
     private var pendingPosOffset = -1
 
-    override fun onLayoutChildren(recycler: RecyclerView.Recycler?, state: RecyclerView.State?) {
+    override fun onLayoutChildren(
+        recycler: androidx.recyclerview.widget.RecyclerView.Recycler?,
+        state: androidx.recyclerview.widget.RecyclerView.State?
+    ) {
         if (pendingTargetPos != -1 && state?.itemCount ?: 0 > 0) {
             scrollToPositionWithOffset(pendingTargetPos, pendingPosOffset)
             pendingPosOffset = -1