wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fetch children count at the Properties dialog asynchronously

Browse source
This commit is contained in:
tibbi 2021-10-24 17:39:58 +02:00
parent 35f8470267
commit e0dad0bfab
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PropertiesDialog.kt
View file

@ -14,10 +14,7 @@ import androidx.exifinterface.media.ExifInterface
import com.simplemobiletools.commons.R
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.helpers.isNougatPlus
import com.simplemobiletools.commons.helpers.sumByInt
import com.simplemobiletools.commons.helpers.sumByLong
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.FileDirItem
import kotlinx.android.synthetic.main.dialog_properties.view.*
import kotlinx.android.synthetic.main.property_item.view.*
@ -57,11 +54,19 @@ class PropertiesDialog() {
ensureBackgroundThread {
val fileCount = fileDirItem.getProperFileCount(activity, countHiddenItems)
val size = fileDirItem.getProperSize(activity, countHiddenItems).formatSize()
val directChildrenCount = if (fileDirItem.isDirectory) {
fileDirItem.getDirectChildrenCount(activity, countHiddenItems).toString()
} else {
0
}
activity.runOnUiThread {
(view.findViewById<LinearLayout>(R.id.properties_size).property_value as TextView).text = size
if (fileDirItem.isDirectory) {
(view.findViewById<LinearLayout>(R.id.properties_file_count).property_value as TextView).text = fileCount.toString()
(view.findViewById<LinearLayout>(R.id.properties_direct_children_count).property_value as TextView).text = directChildrenCount.toString()
}
}
@ -110,7 +115,7 @@ class PropertiesDialog() {
when {
fileDirItem.isDirectory -> {
addProperty(R.string.direct_children_count, fileDirItem.getDirectChildrenCount(activity, countHiddenItems).toString())
addProperty(R.string.direct_children_count, "…", R.id.properties_direct_children_count)
addProperty(R.string.files_count, "…", R.id.properties_file_count)
}
fileDirItem.path.isImageSlow() -> {

1
commons/src/main/res/values/ids.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="properties_size" type="id"/>
<item name="properties_direct_children_count" type="id"/>
<item name="properties_file_count" type="id"/>
<item name="properties_last_modified" type="id"/>
<item name="properties_md5" type="id"/>