Skip to content

Commit 5cbc138

Browse files
committed
move the Last modified date and time formatting to an extension
1 parent 7571ffc commit 5cbc138

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.simplemobiletools.filemanager.dialogs
33
import android.content.Context
44
import android.content.res.Resources
55
import android.support.v7.app.AlertDialog
6-
import android.text.format.DateFormat
76
import android.view.LayoutInflater
87
import android.view.ViewGroup
98
import com.simplemobiletools.filemanager.Config
@@ -12,7 +11,6 @@ import com.simplemobiletools.filemanager.extensions.*
1211
import kotlinx.android.synthetic.main.item_properties.view.*
1312
import kotlinx.android.synthetic.main.property_item.view.*
1413
import java.io.File
15-
import java.util.*
1614

1715
class PropertiesDialog() {
1816
lateinit var mContext: Context
@@ -36,7 +34,7 @@ class PropertiesDialog() {
3634
addProperty(R.string.name, file.name)
3735
addProperty(R.string.path, file.parent)
3836
addProperty(R.string.size, getItemSize(file))
39-
addProperty(R.string.last_modified, formatLastModified(file.lastModified()))
37+
addProperty(R.string.last_modified, file.lastModified().formatLastModified())
4038

4139
if (file.isDirectory) {
4240
addProperty(R.string.files_count, mFilesCnt.toString())
@@ -73,12 +71,6 @@ class PropertiesDialog() {
7371
return file.length().formatSize()
7472
}
7573

76-
private fun formatLastModified(ts: Long): String {
77-
val cal = Calendar.getInstance(Locale.ENGLISH)
78-
cal.timeInMillis = ts
79-
return DateFormat.format("dd.MM.yyyy HH:mm", cal).toString()
80-
}
81-
8274
private fun getDirectorySize(dir: File): Long {
8375
var size = 0L
8476
if (dir.exists()) {

app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/long.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.simplemobiletools.filemanager.extensions
22

3+
import android.text.format.DateFormat
34
import java.text.DecimalFormat
5+
import java.util.*
46

57
fun Long.formatSize(): String {
68
if (this <= 0)
@@ -10,3 +12,9 @@ fun Long.formatSize(): String {
1012
val digitGroups = (Math.log10(toDouble()) / Math.log10(1024.0)).toInt()
1113
return DecimalFormat("#,##0.#").format(this / Math.pow(1024.0, digitGroups.toDouble())) + " " + units[digitGroups]
1214
}
15+
16+
fun Long.formatLastModified(): String {
17+
val cal = Calendar.getInstance(Locale.ENGLISH)
18+
cal.timeInMillis = this
19+
return DateFormat.format("dd.MM.yyyy HH:mm", cal).toString()
20+
}

0 commit comments

Comments
 (0)