Skip to content

Commit 6e04774

Browse files
rosuHrosuH
committed
[Update]
- Migrate to Androidx(0.6.5)
1 parent c35b684 commit 6e04774

File tree

21 files changed

+101
-93
lines changed

21 files changed

+101
-93
lines changed

‎filepicker/build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
versionCode 1
1818
versionName "1.0"
1919

20-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
20+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2121

2222
}
2323

@@ -42,10 +42,11 @@ dependencies {
4242
exclude group: "com.android.support"
4343
}
4444
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
45-
implementation "com.android.support:appcompat-v7:${supportLibVersion}"
46-
implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
47-
implementation "com.android.support.constraint:constraint-layout:2.0.1"
45+
implementation 'androidx.appcompat:appcompat:1.2.0'
46+
implementation 'androidx.recyclerview:recyclerview:1.1.0'
47+
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
48+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
4849
testImplementation 'junit:junit:4.12'
49-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
50-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
50+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
51+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
5152
}

‎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: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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.v7.app.AppCompatActivity
13-
import android.support.v7.widget.LinearLayoutManager
14-
import android.support.v7.widget.RecyclerView
10+
import androidx.core.app.ActivityCompat
11+
import androidx.core.content.ContextCompat
12+
import androidx.appcompat.app.AppCompatActivity
13+
import androidx.recyclerview.widget.LinearLayoutManager
14+
import androidx.recyclerview.widget.RecyclerView
1515
import android.view.LayoutInflater
1616
import android.view.View
1717
import android.view.animation.AnimationUtils
@@ -270,7 +270,11 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
270270
navAdapter = produceNavAdapter(navDataList)
271271
adapter = navAdapter
272272
layoutManager =
273-
LinearLayoutManager(this@FilePickerActivity, LinearLayoutManager.HORIZONTAL, false)
273+
androidx.recyclerview.widget.LinearLayoutManager(
274+
this@FilePickerActivity,
275+
androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL,
276+
false
277+
)
274278
removeOnItemTouchListener(navListener)
275279
addOnItemTouchListener(navListener)
276280
}
@@ -299,7 +303,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
299303
/**
300304
* 获取两个列表的监听器
301305
*/
302-
private fun getListener(recyclerView: RecyclerView): RecyclerViewListener {
306+
private fun getListener(recyclerView: androidx.recyclerview.widget.RecyclerView): RecyclerViewListener {
303307
return RecyclerViewListener(this@FilePickerActivity, recyclerView, this@FilePickerActivity)
304308
}
305309

@@ -334,7 +338,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
334338
private fun saveCurrPos(item: FileNavBeanImpl?, position: Int) {
335339
item?.run {
336340
currPosMap[filePath] = position
337-
(rv_list_file_picker?.layoutManager as? LinearLayoutManager)?.let {
341+
(rv_list_file_picker?.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager)?.let {
338342
currOffsetMap.put(filePath, it.findViewByPosition(position)?.top ?: 0)
339343
}
340344
}
@@ -346,7 +350,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
346350
* 传递 item 点击事件给调用者
347351
*/
348352
override fun onItemClick(
349-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
353+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
350354
view: View,
351355
position: Int
352356
) {
@@ -388,7 +392,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
388392
* 子控件被点击
389393
*/
390394
override fun onItemChildClick(
391-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
395+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
392396
view: View,
393397
position: Int
394398
) {
@@ -425,7 +429,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
425429
* 条目被长按
426430
*/
427431
override fun onItemLongClick(
428-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
432+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
429433
view: View,
430434
position: Int
431435
) {

‎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: 7 additions & 7 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
@@ -29,10 +29,10 @@ class FileListAdapter(
2929
private var isSingleChoice: Boolean = config.singleChoice
3030
) : BaseAdapter() {
3131
private var latestChoicePos = -1
32-
private lateinit var recyclerView: RecyclerView
32+
private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
3333

34-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
35-
if (parent is RecyclerView) {
34+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
35+
if (parent is androidx.recyclerview.widget.RecyclerView) {
3636
recyclerView = parent
3737
}
3838
return when (isSingleChoice) {
@@ -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
) {
@@ -210,7 +210,7 @@ class FileListAdapter(
210210

211211
/*--------------------------ViewHolder Begin------------------------------*/
212212

213-
abstract inner class BaseViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
213+
abstract inner class BaseViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
214214
abstract fun bind(itemImpl: FileItemBeanImpl, position: Int)
215215
}
216216

‎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
@@ -19,10 +19,10 @@ class FileNavAdapter(
1919
var data: MutableList<FileNavBeanImpl>
2020
) :
2121
BaseAdapter() {
22-
private lateinit var recyclerView: RecyclerView
22+
private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
2323

24-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
25-
if (parent is RecyclerView) {
24+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
25+
if (parent is androidx.recyclerview.widget.RecyclerView) {
2626
recyclerView = parent
2727
}
2828
return NavListHolder(activity.layoutInflater, parent)
@@ -36,7 +36,7 @@ class FileNavAdapter(
3636
return data.size
3737
}
3838

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

@@ -49,7 +49,7 @@ class FileNavAdapter(
4949
}
5050

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

5454
private var mBtnDir: TextView? = null
5555

‎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.app.Activity
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
@@ -19,10 +19,10 @@ import me.rosuh.filepicker.utils.ScreenUtils
1919
*/
2020
class RecyclerViewListener(
2121
val activity: Activity,
22-
val recyclerView: RecyclerView,
22+
val recyclerView: androidx.recyclerview.widget.RecyclerView,
2323
val itemClickListener: OnItemClickListener
2424
) :
25-
RecyclerView.OnItemTouchListener {
25+
androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
2626

2727
/**
2828
* Custom item click listener, receive item event and redispatch
@@ -33,7 +33,7 @@ class RecyclerViewListener(
3333
* Item click
3434
*/
3535
fun onItemClick(
36-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
36+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
3737
view: View,
3838
position: Int
3939
)
@@ -42,7 +42,7 @@ class RecyclerViewListener(
4242
* Item long click
4343
*/
4444
fun onItemLongClick(
45-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
45+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
4646
view: View,
4747
position: Int
4848
)
@@ -51,7 +51,7 @@ class RecyclerViewListener(
5151
* Item child click
5252
*/
5353
fun onItemChildClick(
54-
adapter: RecyclerView.Adapter<RecyclerView.ViewHolder>,
54+
adapter: androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>,
5555
view: View,
5656
position: Int
5757
)
@@ -60,11 +60,11 @@ class RecyclerViewListener(
6060
private var gestureDetectorCompat: GestureDetectorCompat =
6161
GestureDetectorCompat(recyclerView.context, ItemTouchHelperGestureListener())
6262

63-
override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {
63+
override fun onTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent) {
6464
gestureDetectorCompat.onTouchEvent(e)
6565
}
6666

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

‎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
fun from(activity: Activity): FilePickerConfig {
@@ -30,7 +30,7 @@ object FilePickerManager {
3030
/**
3131
* 不能使用 fragmentRef.getContext()，因为无法保证外部的代码环境
3232
*/
33-
fun from(fragment: Fragment): FilePickerConfig {
33+
fun from(fragment: androidx.fragment.app.Fragment): FilePickerConfig {
3434
reset()
3535
this.fragmentRef = WeakReference(fragment)
3636
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)