Skip to content

Bugs fixed #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 3, 2022
Merged

Bugs fixed #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21c9138
:bug:
rosuH Feb 13, 2022
5ae0cad
:pencil2:
rosuH Feb 13, 2022
d70211b
Merge branch 'master' into dev
rosuH Mar 3, 2022
bf9d1aa
:bug:
rosuH Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions filepicker/src/main/java/me/rosuh/filepicker/adapter/FileListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ class FileListAdapter(
}

override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
(holder as BaseViewHolder).bind(dataList[position], position)
val item = getItem(position) ?: return
(holder as BaseViewHolder).bind(item, position)
}

override fun onBindViewHolder(
Expand All @@ -81,7 +82,7 @@ class FileListAdapter(
) {
// Using payload to refresh partly
// 使用 payload 进行局部刷新
if (payloads.isNullOrEmpty()) {
if (payloads.isEmpty()) {
onBindViewHolder(holder, position)
return
}
Expand Down
7 changes: 4 additions & 3 deletions filepicker/src/main/java/me/rosuh/filepicker/utils/FileUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class FileUtils {
val realRoot = getRootFile()
val isInRootParent = rootFile.list() == null
&& !config.isSkipDir
&& rootFile.path == realRoot.parentFile.path
&& rootFile.path == realRoot.parentFile?.path
if (isInRootParent) {
// 如果是文件夹作为可选项时，需要让根目录也作为 item 被点击
listData.add(
Expand All @@ -62,10 +62,11 @@ class FileUtils {
)
return config.selfFilter?.doFilter(listData) ?: listData
}
if (rootFile.listFiles().isNullOrEmpty()) {
val listFiles = rootFile.listFiles()
if (listFiles.isNullOrEmpty()) {
return listData
}
for (file in rootFile.listFiles()) {
for (file in listFiles) {
//以符号 . 开头的视为隐藏文件或隐藏文件夹，后面进行过滤
val isHiddenFile = file.name.startsWith(".")
if (!config.isShowHiddenFiles && isHiddenFile) {
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true
android.injected.testOnly=false

13 changes: 8 additions & 5 deletions sample/src/main/java/me/rosuh/sample/SampleActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ package me.rosuh.sample
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.os.Bundle
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentManager
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
import android.os.Environment
import android.provider.Settings
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Button
import android.widget.ImageView
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.bumptech.glide.Glide
import kotlinx.android.synthetic.main.demo_activity_main.*
import me.rosuh.filepicker.adapter.FileListAdapter
Expand All @@ -26,7 +30,6 @@ import me.rosuh.filepicker.filetype.AudioFileType
import me.rosuh.filepicker.filetype.FileType
import me.rosuh.filepicker.filetype.RasterImageFileType
import java.util.concurrent.Executors
import java.util.concurrent.ThreadPoolExecutor


class SampleActivity : AppCompatActivity() {
Expand Down