Skip to content

Commit 7a513de

Browse files
authored
Merge pull request #101 from rosuH/dev
🌐
2 parents 9f5e15a + 70fd8c0 commit 7a513de

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener,
412412
listAdapter?.multipleCheckOrNo(item, position, ::isCanSelect) {
413413
Toast.makeText(
414414
this@FilePickerActivity.applicationContext,
415-
"最多只能选择 $maxSelectable",
415+
getString(pickerConfig.maxSelectCountTips, maxSelectable),
416416
Toast.LENGTH_SHORT
417417
).show()
418418
}

sample/src/main/java/me/rosuh/sample/SampleActivity.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@ import me.rosuh.filepicker.adapter.FileListAdapter
2121
import me.rosuh.filepicker.bean.FileItemBeanImpl
2222
import me.rosuh.filepicker.config.*
2323
import me.rosuh.filepicker.engine.ImageEngine
24-
import me.rosuh.filepicker.filetype.FileType
25-
import me.rosuh.filepicker.config.AbstractFileFilter
26-
import me.rosuh.filepicker.config.FilePickerConfig
27-
import me.rosuh.filepicker.config.FilePickerManager
28-
import me.rosuh.filepicker.config.SimpleItemClickListener
2924
import me.rosuh.filepicker.filetype.AudioFileType
25+
import me.rosuh.filepicker.filetype.FileType
3026
import me.rosuh.filepicker.filetype.RasterImageFileType
3127
import me.rosuh.filepicker.utils.ScreenUtils
3228

@@ -137,13 +133,15 @@ class SampleActivity : AppCompatActivity() {
137133
FilePickerManager
138134
.from(this@SampleActivity)
139135
.setTheme(getRandomTheme())
136+
.maxSelectable(2)
140137
.forResult(FilePickerManager.REQUEST_CODE)
141138
}
142139
// 多选文件夹
143140
btn_multi_dir.setOnClickListener {
144141
FilePickerManager
145142
.from(this@SampleActivity)
146143
.setTheme(getRandomTheme())
144+
.maxSelectable(2)
147145
.filter(object : AbstractFileFilter() {
148146
override fun doFilter(listData: ArrayList<FileItemBeanImpl>): ArrayList<FileItemBeanImpl> {
149147
return ArrayList(listData.filter { item ->

0 commit comments

Comments
 (0)