Skip to content

Commit 82e7c88

Browse files
authored
Bugs fixed (#171)
* 🐛 [Fix] - item file name overlay in single choice mode. * ✏️ update doc. * 🐛 [Fix] - fixed #164
1 parent d779f18 commit 82e7c88

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ class FileListAdapter(
7171
}
7272

7373
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
74-
(holder as BaseViewHolder).bind(dataList[position], position)
74+
val item = getItem(position) ?: return
75+
(holder as BaseViewHolder).bind(item, position)
7576
}
7677

7778
override fun onBindViewHolder(
@@ -81,7 +82,7 @@ class FileListAdapter(
8182
) {
8283
// Using payload to refresh partly
8384
// 使用 payload 进行局部刷新
84-
if (payloads.isNullOrEmpty()) {
85+
if (payloads.isEmpty()) {
8586
onBindViewHolder(holder, position)
8687
return
8788
}

filepicker/src/main/java/me/rosuh/filepicker/utils/FileUtils.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class FileUtils {
4747
val realRoot = getRootFile()
4848
val isInRootParent = rootFile.list() == null
4949
&& !config.isSkipDir
50-
&& rootFile.path == realRoot.parentFile.path
50+
&& rootFile.path == realRoot.parentFile?.path
5151
if (isInRootParent) {
5252
// 如果是文件夹作为可选项时,需要让根目录也作为 item 被点击
5353
listData.add(
@@ -62,10 +62,11 @@ class FileUtils {
6262
)
6363
return config.selfFilter?.doFilter(listData) ?: listData
6464
}
65-
if (rootFile.listFiles().isNullOrEmpty()) {
65+
val listFiles = rootFile.listFiles()
66+
if (listFiles.isNullOrEmpty()) {
6667
return listData
6768
}
68-
for (file in rootFile.listFiles()) {
69+
for (file in listFiles) {
6970
//以符号 . 开头的视为隐藏文件或隐藏文件夹,后面进行过滤
7071
val isHiddenFile = file.name.startsWith(".")
7172
if (!config.isShowHiddenFiles && isHiddenFile) {

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
1515
kotlin.code.style=official
1616
android.useAndroidX=true
1717
android.enableJetifier=true
18+
android.injected.testOnly=false
19+

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,22 @@ package me.rosuh.sample
44
import android.app.Activity
55
import android.content.Context
66
import android.content.Intent
7+
import android.net.Uri
8+
import android.os.Build
79
import android.os.Bundle
8-
import androidx.fragment.app.DialogFragment
9-
import androidx.fragment.app.FragmentManager
10-
import androidx.appcompat.app.AppCompatActivity
11-
import androidx.recyclerview.widget.LinearLayoutManager
10+
import android.os.Environment
11+
import android.provider.Settings
1212
import android.util.Log
1313
import android.view.LayoutInflater
1414
import android.view.View
1515
import android.view.ViewGroup
1616
import android.widget.Button
1717
import android.widget.ImageView
1818
import android.widget.Toast
19+
import androidx.appcompat.app.AppCompatActivity
20+
import androidx.fragment.app.DialogFragment
21+
import androidx.fragment.app.FragmentManager
22+
import androidx.recyclerview.widget.LinearLayoutManager
1923
import com.bumptech.glide.Glide
2024
import kotlinx.android.synthetic.main.demo_activity_main.*
2125
import me.rosuh.filepicker.adapter.FileListAdapter
@@ -26,7 +30,6 @@ import me.rosuh.filepicker.filetype.AudioFileType
2630
import me.rosuh.filepicker.filetype.FileType
2731
import me.rosuh.filepicker.filetype.RasterImageFileType
2832
import java.util.concurrent.Executors
29-
import java.util.concurrent.ThreadPoolExecutor
3033

3134

3235
class SampleActivity : AppCompatActivity() {

0 commit comments

Comments
 (0)