Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e211707 authored by tibbi's avatar tibbi
Browse files

rename the Long formatting extension function

parent dabb5ef7

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
        propMinSdkVersion = 16

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '3.1.3'

        propVersionName = '3.1.4'

        kotlin_version = '1.2.0'

        support_libs = '27.0.2'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PropertiesDialog.kt

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class PropertiesDialog() { 
                    if (cursor.moveToFirst()) {

                        val dateModified = cursor.getIntValue(MediaStore.Images.Media.DATE_MODIFIED)

                        activity.runOnUiThread {

                            view.findViewById<TextView>(R.id.properties_last_modified).property_value.text = (dateModified * 1000L).formatLastModified()

                            view.findViewById<TextView>(R.id.properties_last_modified).property_value.text = (dateModified * 1000L).formatDate()

                        }

                    }

                }
@@ -90,7 +90,7 @@ class PropertiesDialog() { 
        }



        if (file.isDirectory) {

            addProperty(R.string.last_modified, file.lastModified().formatLastModified())

            addProperty(R.string.last_modified, file.lastModified().formatDate())

        } else {

            addProperty(R.string.last_modified, "...", R.id.properties_last_modified)

            addExifProperties(path)

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Long.kt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ fun Long.formatSize(): String { 
    return "${DecimalFormat("#,##0.#").format(this / Math.pow(1024.0, digitGroups.toDouble()))} ${units[digitGroups]}"

}



fun Long.formatLastModified(): String {

fun Long.formatDate(): String {

    val cal = Calendar.getInstance(Locale.ENGLISH)

    cal.timeInMillis = this

    return DateFormat.format("dd.MM.yyyy kk:mm", cal).toString()

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/String.kt

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ fun String.getExifDateTaken(exif: ExifInterface): String { 
        if (it?.isNotEmpty() == true) {

            try {

                val simpleDateFormat = SimpleDateFormat("yyyy:MM:dd kk:mm:ss", Locale.ENGLISH)

                return simpleDateFormat.parse(it).time.formatLastModified().trim()

                return simpleDateFormat.parse(it).time.formatDate().trim()

            } catch (ignored: Exception) {

            }

        }