fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-02-19 21:30:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

properly display the size of files in the properties dialog

Browse Source
This commit is contained in:
tibbi 2016-10-16 15:25:31 +02:00
parent b3c619c28d
commit 93f3fafd58
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/PropertiesDialog.kt
View File

@ -15,23 +15,34 @@ import java.io.File
import java.util.* import java.util.*
class PropertiesDialog : DialogFragment() { class PropertiesDialog : DialogFragment() {
companion object {
lateinit var mItem: FileDirItem
private var mFilesCnt: Int = 0
private var mShowHidden: Boolean = false
fun newInstance(item: FileDirItem): PropertiesDialog {
mItem = item
mFilesCnt = 0
return PropertiesDialog()
}
}
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
mShowHidden = Config.newInstance(context).showHidden mShowHidden = Config.newInstance(context).showHidden
val title = if (mItem!!.isDirectory) R.string.directory_properties else R.string.file_properties val title = if (mItem.isDirectory) R.string.directory_properties else R.string.file_properties
val infoView = activity.layoutInflater.inflate(R.layout.item_properties, null) val infoView = activity.layoutInflater.inflate(R.layout.item_properties, null)
(infoView.findViewById(R.id.properties_name) as TextView).text = mItem!!.name (infoView.findViewById(R.id.properties_name) as TextView).text = mItem.name
(infoView.findViewById(R.id.properties_path) as TextView).text = mItem!!.path (infoView.findViewById(R.id.properties_path) as TextView).text = mItem.path
(infoView.findViewById(R.id.properties_size) as TextView).text = getItemSize() (infoView.findViewById(R.id.properties_size) as TextView).text = getItemSize()
if (mItem!!.isDirectory) { if (mItem.isDirectory) {
infoView.findViewById(R.id.properties_files_count_label).visibility = View.VISIBLE infoView.findViewById(R.id.properties_files_count_label).visibility = View.VISIBLE
infoView.findViewById(R.id.properties_files_count).visibility = View.VISIBLE infoView.findViewById(R.id.properties_files_count).visibility = View.VISIBLE
(infoView.findViewById(R.id.properties_files_count) as TextView).text = mFilesCnt.toString() (infoView.findViewById(R.id.properties_files_count) as TextView).text = mFilesCnt.toString()
} }
val file = File(mItem!!.path) val file = File(mItem.path)
(infoView.findViewById(R.id.properties_last_modified) as TextView).text = formatLastModified(file.lastModified()) (infoView.findViewById(R.id.properties_last_modified) as TextView).text = formatLastModified(file.lastModified())
val builder = AlertDialog.Builder(context) val builder = AlertDialog.Builder(context)
@ -43,11 +54,11 @@ class PropertiesDialog : DialogFragment() {
} }
fun getItemSize(): String { fun getItemSize(): String {
if (mItem!!.isDirectory) { if (mItem.isDirectory) {
return getDirectorySize(File(mItem!!.path)).formatSize() return getDirectorySize(File(mItem.path)).formatSize()
} }
return "" return mItem.size.formatSize()
} }
private fun formatLastModified(ts: Long): String { private fun formatLastModified(ts: Long): String {
@ -73,16 +84,4 @@ class PropertiesDialog : DialogFragment() {
} }
return 0 return 0
} }
companion object {
private var mItem: FileDirItem? = null
private var mFilesCnt: Int = 0
private var mShowHidden: Boolean = false
fun newInstance(item: FileDirItem): PropertiesDialog {
mItem = item
mFilesCnt = 0
return PropertiesDialog()
}
}
} }