From 70fd8c0312349afebfab783eb273361af5f9d22b Mon Sep 17 00:00:00 2001 From: rosuh Date: Wed, 30 Dec 2020 08:46:01 +0800 Subject: [PATCH] :globe_with_meridians: [Fix] - max selectable string. fix #100 --- .../main/java/me/rosuh/filepicker/FilePickerActivity.kt | 2 +- sample/src/main/java/me/rosuh/sample/SampleActivity.kt | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/filepicker/src/main/java/me/rosuh/filepicker/FilePickerActivity.kt b/filepicker/src/main/java/me/rosuh/filepicker/FilePickerActivity.kt index acd4fc6..465c3a2 100644 --- a/filepicker/src/main/java/me/rosuh/filepicker/FilePickerActivity.kt +++ b/filepicker/src/main/java/me/rosuh/filepicker/FilePickerActivity.kt @@ -412,7 +412,7 @@ class FilePickerActivity : AppCompatActivity(), View.OnClickListener, listAdapter?.multipleCheckOrNo(item, position, ::isCanSelect) { Toast.makeText( this@FilePickerActivity.applicationContext, - "最多只能选择 $maxSelectable 项", + getString(pickerConfig.maxSelectCountTips, maxSelectable), Toast.LENGTH_SHORT ).show() } diff --git a/sample/src/main/java/me/rosuh/sample/SampleActivity.kt b/sample/src/main/java/me/rosuh/sample/SampleActivity.kt index 7889764..6bc63c6 100644 --- a/sample/src/main/java/me/rosuh/sample/SampleActivity.kt +++ b/sample/src/main/java/me/rosuh/sample/SampleActivity.kt @@ -21,12 +21,8 @@ import me.rosuh.filepicker.adapter.FileListAdapter import me.rosuh.filepicker.bean.FileItemBeanImpl import me.rosuh.filepicker.config.* import me.rosuh.filepicker.engine.ImageEngine -import me.rosuh.filepicker.filetype.FileType -import me.rosuh.filepicker.config.AbstractFileFilter -import me.rosuh.filepicker.config.FilePickerConfig -import me.rosuh.filepicker.config.FilePickerManager -import me.rosuh.filepicker.config.SimpleItemClickListener import me.rosuh.filepicker.filetype.AudioFileType +import me.rosuh.filepicker.filetype.FileType import me.rosuh.filepicker.filetype.RasterImageFileType import me.rosuh.filepicker.utils.ScreenUtils @@ -137,6 +133,7 @@ class SampleActivity : AppCompatActivity() { FilePickerManager .from(this@SampleActivity) .setTheme(getRandomTheme()) + .maxSelectable(2) .forResult(FilePickerManager.REQUEST_CODE) } // 多选文件夹 @@ -144,6 +141,7 @@ class SampleActivity : AppCompatActivity() { FilePickerManager .from(this@SampleActivity) .setTheme(getRandomTheme()) + .maxSelectable(2) .filter(object : AbstractFileFilter() { override fun doFilter(listData: ArrayList): ArrayList { return ArrayList(listData.filter { item ->