fenix
/
Simple-File-Manager
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rewrite PropertiesDialog to not be a dialogfragment

This commit is contained in:
tibbi 2016-10-16 19:56:55 +02:00
parent faf721a9b1
commit 82018feee6
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java
View File

@ -390,8 +390,8 @@ public class ItemsFragment extends android.support.v4.app.Fragment
if (item == null)
return;
PropertiesDialog dialog = PropertiesDialog.Companion.newInstance(item);
dialog.show(getFragmentManager(), "properties");
final Config config = Config.newInstance(getContext());
new PropertiesDialog(getContext(), item, config.getShowHidden());
}
private void displayRenameDialog() {

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

@ -1,10 +1,9 @@
package com.simplemobiletools.filemanager.dialogs
import android.app.Dialog
import android.os.Bundle
import android.support.v4.app.DialogFragment
import android.content.Context
import android.support.v7.app.AlertDialog
import android.text.format.DateFormat
import android.view.LayoutInflater
import android.view.View
import com.simplemobiletools.filemanager.Config
import com.simplemobiletools.filemanager.R
@ -14,22 +13,19 @@ import kotlinx.android.synthetic.main.item_properties.view.*
import java.io.File
import java.util.*
class PropertiesDialog : DialogFragment() {
companion object {
lateinit var mItem: FileDirItem
private var mFilesCnt: Int = 0
private var mShowHidden: Boolean = false
class PropertiesDialog() {
lateinit var mContext: Context
lateinit var mItem: FileDirItem
private var mCountHiddenItems = false // we always include the hidden item's size, counting items themselves is the optional thing
private var mFilesCnt = 0
fun newInstance(item: FileDirItem): PropertiesDialog {
mItem = item
mFilesCnt = 0
return PropertiesDialog()
}
}
constructor(context: Context, item: FileDirItem, countHiddenItems: Boolean = false) : this() {
mContext = context
mItem = item
mCountHiddenItems = countHiddenItems
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
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 = LayoutInflater.from(context).inflate(R.layout.item_properties, null)
infoView.apply {
properties_name.text = mItem.name
@ -62,16 +58,17 @@ class PropertiesDialog : DialogFragment() {
properties_last_modified.text = formatLastModified(file.lastModified())
}
return AlertDialog.Builder(context)
.setTitle(resources.getString(title))
AlertDialog.Builder(context)
.setTitle(context.resources.getString(title))
.setView(infoView)
.setPositiveButton(R.string.ok, null)
.create()
.show()
}
private fun getItemSize(): String {
if (mItem.isDirectory) {
mShowHidden = Config.newInstance(context).showHidden
mCountHiddenItems = Config.newInstance(mContext).showHidden
return getDirectorySize(File(mItem.path)).formatSize()
}
@ -93,7 +90,7 @@ class PropertiesDialog : DialogFragment() {
size += getDirectorySize(files[i])
} else {
size += files[i].length()
if (!files[i].isHidden && !dir.isHidden || mShowHidden)
if (!files[i].isHidden && !dir.isHidden || mCountHiddenItems)
mFilesCnt++
}
}