Skip to content

Commit fcf2e62

Browse files
rosuHrosuH
committed
🎨
[Update] - AndroidX version.
1 parent 0d8f522 commit fcf2e62

21 files changed

+109
-103
lines changed

‎filepicker/build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
versionCode 1
1616
versionName "1.0"
1717

18-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
18+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1919

2020
}
2121

@@ -45,10 +45,8 @@ dependencies {
4545
exclude group: "com.android.support"
4646
}
4747
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
48-
implementation "com.android.support:appcompat-v7:${supportLibVersion}"
49-
implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
50-
implementation "com.android.support.constraint:constraint-layout:2.0.4"
51-
testImplementation 'junit:junit:4.12'
52-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
53-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
48+
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
49+
implementation 'androidx.appcompat:appcompat:1.3.1'
50+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
51+
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
5452
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.rosuh.filepicker;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

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

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import android.content.Intent
77
import android.content.pm.PackageManager
88
import android.os.*
99
import android.os.Environment.MEDIA_MOUNTED
10-
import android.support.v4.app.ActivityCompat
11-
import android.support.v4.content.ContextCompat
12-
import android.support.v4.util.ArrayMap
13-
import android.support.v4.widget.SwipeRefreshLayout
14-
import android.support.v7.app.AppCompatActivity
15-
import android.support.v7.widget.LinearLayoutManager
16-
import android.support.v7.widget.RecyclerView
10+
import androidx.core.app.ActivityCompat
11+
import androidx.core.content.ContextCompat
12+
import androidx.collection.ArrayMap
13+
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
14+
import androidx.appcompat.app.AppCompatActivity
15+
import androidx.recyclerview.widget.LinearLayoutManager
16+
import androidx.recyclerview.widget.RecyclerView
1717
import android.view.LayoutInflater
1818
import android.view.View
1919
import android.view.animation.AnimationUtils
@@ -38,8 +38,8 @@ import java.util.concurrent.*
3838
class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerViewListener.OnItemClickListener{
3939

4040
private var rvList: RecyclerViewFilePicker? = null
41-
private var rvNav: RecyclerView? = null
42-
private var srl: SwipeRefreshLayout? = null
41+
private var rvNav: androidx.recyclerview.widget.RecyclerView? = null
42+
private var srl: androidx.swiperefreshlayout.widget.SwipeRefreshLayout? = null
4343
private var tvToolbarTitle: TextView? = null
4444
private var btnConfirm: Button? = null
4545
private var btnSelectedAll: Button? = null
@@ -250,7 +250,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
250250
} else {
251251
View.VISIBLE
252252
}
253-
srl = findViewById<SwipeRefreshLayout>(R.id.swipe_refresh_layout)
253+
srl = findViewById<androidx.swiperefreshlayout.widget.SwipeRefreshLayout>(R.id.swipe_refresh_layout)
254254
srl?.apply {
255255
setOnRefreshListener {
256256
resetViewState()
@@ -277,9 +277,13 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
277277
)
278278
}
279279

280-
rvNav = findViewById<RecyclerView>(R.id.rv_nav_file_picker).apply {
280+
rvNav = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.rv_nav_file_picker).apply {
281281
layoutManager =
282-
LinearLayoutManager(this@FilePickerActivity, LinearLayoutManager.HORIZONTAL, false)
282+
androidx.recyclerview.widget.LinearLayoutManager(
283+
this@FilePickerActivity,
284+
androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL,
285+
false
286+
)
283287
adapter = navAdapter
284288
}
285289
rvList = findViewById<RecyclerViewFilePicker>(R.id.rv_list_file_picker).apply {
@@ -338,18 +342,18 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
338342
/**
339343
* 获取两个列表的监听器
340344
*/
341-
private fun getListener(recyclerView: RecyclerView?): RecyclerViewListener? {
345+
private fun getListener(recyclerView: androidx.recyclerview.widget.RecyclerView?): RecyclerViewListener? {
342346
if (recyclerView == null) {
343347
return null
344348
}
345349
return RecyclerViewListener(recyclerView, this@FilePickerActivity)
346350
}
347351

348-
private val currPosMap: ArrayMap<String, Int> by lazy {
349-
ArrayMap(4)
352+
private val currPosMap: androidx.collection.ArrayMap<String, Int> by lazy {
353+
androidx.collection.ArrayMap(4)
350354
}
351-
private val currOffsetMap: ArrayMap<String, Int> by lazy {
352-
ArrayMap(4)
355+
private val currOffsetMap: androidx.collection.ArrayMap<String, Int> by lazy {
356+
androidx.collection.ArrayMap(4)
353357
}
354358

355359
/**
@@ -358,7 +362,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
358362
private fun saveCurrPos(item: FileNavBeanImpl?, position: Int) {
359363
item?.run {
360364
currPosMap[filePath] = position
361-
(rvList?.layoutManager as? LinearLayoutManager)?.let {
365+
(rvList?.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager)?.let {
362366
currOffsetMap.put(filePath, it.findViewByPosition(position)?.top ?: 0)
363367
}
364368
}
@@ -370,7 +374,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
370374
* 传递 item 点击事件给调用者
371375
*/
372376
override fun onItemClick(
373-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
377+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
374378
view: View,
375379
position: Int
376380
) {
@@ -421,7 +425,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
421425
* 子控件被点击
422426
*/
423427
override fun onItemChildClick(
424-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
428+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
425429
view: View,
426430
position: Int
427431
) {
@@ -467,7 +471,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, RecyclerVi
467471
* 条目被长按
468472
*/
469473
override fun onItemLongClick(
470-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
474+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
471475
view: View,
472476
position: Int
473477
) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package me.rosuh.filepicker.adapter
22

3-
import android.support.v7.widget.RecyclerView
3+
import androidx.recyclerview.widget.RecyclerView
44
import android.view.View
55
import me.rosuh.filepicker.bean.FileBean
66

7-
abstract class BaseAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
7+
abstract class BaseAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
88
abstract fun getItem(position: Int): FileBean?
99
abstract fun getItemView(position: Int): View?
1010
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.rosuh.filepicker.adapter
22

3-
import android.support.v4.util.ArraySet
4-
import android.support.v7.widget.RecyclerView
3+
import androidx.collection.ArraySet
4+
import androidx.recyclerview.widget.RecyclerView
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
@@ -29,23 +29,23 @@ class FileListAdapter(
2929
) : BaseAdapter() {
3030
val dataList: ArrayList<FileItemBeanImpl> = ArrayList(10)
3131
private var latestChoicePos = -1
32-
private lateinit var recyclerView: RecyclerView
32+
private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
3333

3434
private var listener: FileListAdapterListener? = null
3535

3636
fun addListener(block: FileListAdapterListenerBuilder.() -> Unit) {
3737
this.listener = FileListAdapterListenerBuilder().also(block)
3838
}
3939

40-
private val checkedSet: ArraySet<FileBean> by lazy {
41-
ArraySet(20)
40+
private val checkedSet: androidx.collection.ArraySet<FileBean> by lazy {
41+
androidx.collection.ArraySet(20)
4242
}
4343

4444
val checkedCount: Int
4545
get() = checkedSet.count()
4646

47-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
48-
if (parent is RecyclerView) {
47+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
48+
if (parent is androidx.recyclerview.widget.RecyclerView) {
4949
recyclerView = parent
5050
}
5151
return FileListItemHolder(
@@ -69,12 +69,12 @@ class FileListAdapter(
6969
return DEFAULT_FILE_TYPE
7070
}
7171

72-
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
72+
override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
7373
(holder as BaseViewHolder).bind(dataList[position], position)
7474
}
7575

7676
override fun onBindViewHolder(
77-
holder: RecyclerView.ViewHolder,
77+
holder: androidx.recyclerview.widget.RecyclerView.ViewHolder,
7878
position: Int,
7979
payloads: MutableList<Any>
8080
) {
@@ -97,7 +97,7 @@ class FileListAdapter(
9797

9898
/*--------------------------ViewHolder Begin------------------------------*/
9999

100-
abstract inner class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
100+
abstract inner class BaseViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
101101
abstract fun bind(itemImpl: FileItemBeanImpl, position: Int)
102102
}
103103

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package me.rosuh.filepicker.adapter
22

3-
import android.support.v7.widget.RecyclerView
3+
import androidx.recyclerview.widget.RecyclerView
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
@@ -17,11 +17,11 @@ import me.rosuh.filepicker.bean.FileNavBeanImpl
1717
class FileNavAdapter(
1818
private val activity: FilePickerActivity
1919
) : BaseAdapter() {
20-
private lateinit var recyclerView: RecyclerView
20+
private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
2121
val dataList: ArrayList<FileNavBeanImpl> = ArrayList(3)
2222

23-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
24-
if (parent is RecyclerView) {
23+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
24+
if (parent is androidx.recyclerview.widget.RecyclerView) {
2525
recyclerView = parent
2626
}
2727
return NavListHolder(activity.layoutInflater, parent)
@@ -35,7 +35,7 @@ class FileNavAdapter(
3535
return dataList.size
3636
}
3737

38-
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, postion: Int) {
38+
override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, postion: Int) {
3939
(holder as NavListHolder).bind(dataList[postion], postion)
4040
}
4141

@@ -56,7 +56,7 @@ class FileNavAdapter(
5656
}
5757

5858
inner class NavListHolder(inflater: LayoutInflater, val parent: ViewGroup) :
59-
RecyclerView.ViewHolder(inflater.inflate(R.layout.item_nav_file_picker, parent, false)) {
59+
androidx.recyclerview.widget.RecyclerView.ViewHolder(inflater.inflate(R.layout.item_nav_file_picker, parent, false)) {
6060

6161
private var mBtnDir: TextView? = null
6262

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.rosuh.filepicker.adapter
22

33
import android.content.res.Resources
4-
import android.support.v4.view.GestureDetectorCompat
5-
import android.support.v7.widget.RecyclerView
4+
import androidx.core.view.GestureDetectorCompat
5+
import androidx.recyclerview.widget.RecyclerView
66
import android.view.GestureDetector
77
import android.view.MotionEvent
88
import android.view.View
@@ -17,10 +17,10 @@ import me.rosuh.filepicker.R
1717
*
1818
*/
1919
class RecyclerViewListener(
20-
val recyclerView: RecyclerView,
20+
val recyclerView: androidx.recyclerview.widget.RecyclerView,
2121
val itemClickListener: OnItemClickListener
2222
) :
23-
RecyclerView.OnItemTouchListener {
23+
androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
2424

2525
/**
2626
* Custom item click listener, receive item event and redispatch
@@ -31,7 +31,7 @@ class RecyclerViewListener(
3131
* Item click
3232
*/
3333
fun onItemClick(
34-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
34+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
3535
view: View,
3636
position: Int
3737
)
@@ -40,7 +40,7 @@ class RecyclerViewListener(
4040
* Item long click
4141
*/
4242
fun onItemLongClick(
43-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
43+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
4444
view: View,
4545
position: Int
4646
)
@@ -49,7 +49,7 @@ class RecyclerViewListener(
4949
* Item child click
5050
*/
5151
fun onItemChildClick(
52-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
52+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
5353
view: View,
5454
position: Int
5555
)
@@ -58,11 +58,11 @@ class RecyclerViewListener(
5858
private var gestureDetectorCompat: GestureDetectorCompat =
5959
GestureDetectorCompat(recyclerView.context, ItemTouchHelperGestureListener())
6060

61-
override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {
61+
override fun onTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent) {
6262
gestureDetectorCompat.onTouchEvent(e)
6363
}
6464

65-
override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
65+
override fun onInterceptTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent): Boolean {
6666
return gestureDetectorCompat.onTouchEvent(e)
6767
}
6868

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package me.rosuh.filepicker.config
22

33
import android.content.Intent
4-
import android.support.annotation.NonNull
5-
import android.support.annotation.StringRes
4+
import androidx.annotation.NonNull
5+
import androidx.annotation.StringRes
66
import me.rosuh.filepicker.FilePickerActivity
77
import me.rosuh.filepicker.R
88
import me.rosuh.filepicker.engine.ImageEngine

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.rosuh.filepicker.config
22

33
import android.app.Activity
4-
import android.support.v4.app.Fragment
4+
import androidx.fragment.app.Fragment
55
import me.rosuh.filepicker.engine.ImageLoadController
66
import java.lang.ref.WeakReference
77

@@ -17,7 +17,7 @@ object FilePickerManager {
1717
const val REQUEST_CODE = 10401
1818

1919
internal var contextRef: WeakReference<Activity>? = null
20-
internal var fragmentRef: WeakReference<Fragment>? = null
20+
internal var fragmentRef: WeakReference<androidx.fragment.app.Fragment>? = null
2121
internal lateinit var config: FilePickerConfig
2222

2323
@JvmStatic
@@ -32,7 +32,7 @@ object FilePickerManager {
3232
* 不能使用 fragmentRef.getContext()，因为无法保证外部的代码环境
3333
*/
3434
@JvmStatic
35-
fun from(fragment: Fragment): FilePickerConfig {
35+
fun from(fragment: androidx.fragment.app.Fragment): FilePickerConfig {
3636
reset()
3737
this.fragmentRef = WeakReference(fragment)
3838
this.contextRef = WeakReference(fragment.activity!!)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package me.rosuh.filepicker.widget
22

33
import android.content.Context
44
import android.os.Parcelable
5-
import android.support.v7.widget.LinearLayoutManager
6-
import android.support.v7.widget.RecyclerView
5+
import androidx.recyclerview.widget.LinearLayoutManager
6+
import androidx.recyclerview.widget.RecyclerView
77
import android.util.AttributeSet
88

9-
class PosLinearLayoutManager : LinearLayoutManager {
9+
class PosLinearLayoutManager : androidx.recyclerview.widget.LinearLayoutManager {
1010
constructor(context: Context?) : super(context)
1111
constructor(context: Context?, orientation: Int, reverseLayout: Boolean) : super(
1212
context,
@@ -30,7 +30,7 @@ class PosLinearLayoutManager : LinearLayoutManager {
3030

3131
private var pendingPosOffset = -1
3232

33-
override fun onLayoutChildren(recycler: RecyclerView.Recycler?, state: RecyclerView.State?) {
33+
override fun onLayoutChildren(recycler: androidx.recyclerview.widget.RecyclerView.Recycler?, state: androidx.recyclerview.widget.RecyclerView.State?) {
3434
if (pendingTargetPos != -1 && state?.itemCount ?: 0 > 0) {
3535
scrollToPositionWithOffset(pendingTargetPos, pendingPosOffset)
3636
pendingPosOffset = -1

0 commit comments

Comments
 (0)