Skip to content

Commit 4b80fbd

Browse files
committed
simplify some property getting
1 parent f866f01 commit 4b80fbd

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ class PropertiesDialog : DialogFragment() {
4343
} else if (mItem.isImage()) {
4444
properties_resolution_label.visibility = View.VISIBLE
4545
properties_resolution.visibility = View.VISIBLE
46-
properties_resolution.text = mItem.imageResolution
47-
} else if (mItem.isAudio(context)) {
46+
properties_resolution.text = mItem.getImageResolution()
47+
} else if (mItem.isAudio()) {
4848
properties_duration_label.visibility = View.VISIBLE
4949
properties_duration.visibility = View.VISIBLE
50-
properties_duration.text = mItem.getDuration(context)
51-
} else if (mItem.isVideo(context)) {
50+
properties_duration.text = mItem.getDuration()
51+
} else if (mItem.isVideo()) {
5252
properties_duration_label.visibility = View.VISIBLE
5353
properties_duration.visibility = View.VISIBLE
54-
properties_duration.text = mItem.getDuration(context)
54+
properties_duration.text = mItem.getDuration()
5555

5656
properties_resolution_label.visibility = View.VISIBLE
5757
properties_resolution.visibility = View.VISIBLE
58-
properties_resolution.text = mItem.getVideoResolution(context)
58+
properties_resolution.text = mItem.getVideoResolution()
5959
}
6060

6161
val file = File(mItem.path)

library/src/main/kotlin/com/simplemobiletools/filepicker/models/FileDirItem.kt

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package com.simplemobiletools.filepicker.models
22

3-
import android.content.Context
43
import android.graphics.Bitmap
54
import android.graphics.BitmapFactory
65
import android.media.MediaMetadataRetriever
7-
import android.net.Uri
8-
import java.io.File
96
import java.util.*
107

118
class FileDirItem(val path: String, val name: String, val isDirectory: Boolean, val children: Int, val size: Long) :
@@ -32,37 +29,37 @@ class FileDirItem(val path: String, val name: String, val isDirectory: Boolean,
3229
return options.outWidth != -1 && options.outHeight != -1
3330
}
3431

35-
fun isVideo(context: Context): Boolean {
36-
return getMimeType(context).startsWith("video")
32+
fun isVideo(): Boolean {
33+
return getMimeType().startsWith("video")
3734
}
3835

39-
fun isAudio(context: Context): Boolean {
40-
return getMimeType(context).startsWith("audio")
36+
fun isAudio(): Boolean {
37+
return getMimeType().startsWith("audio")
4138
}
4239

43-
fun getMimeType(context: Context): String {
40+
fun getMimeType(): String {
4441
try {
4542
val retriever = MediaMetadataRetriever()
46-
retriever.setDataSource(context, Uri.fromFile(File(path)))
43+
retriever.setDataSource(path)
4744
return retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_MIMETYPE)
4845
} catch (ignored: Exception) {
4946

5047
}
5148
return ""
5249
}
5350

54-
fun getDuration(context: Context): String {
51+
fun getDuration(): String {
5552
val retriever = MediaMetadataRetriever()
56-
retriever.setDataSource(context, Uri.fromFile(File(path)))
53+
retriever.setDataSource(path)
5754
val time = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
5855
val timeInMillisec = java.lang.Long.parseLong(time)
5956
return getFormattedDuration((timeInMillisec / 1000).toInt())
6057
}
6158

62-
fun getVideoResolution(context: Context): String {
59+
fun getVideoResolution(): String {
6360
try {
6461
val retriever = MediaMetadataRetriever()
65-
retriever.setDataSource(context, Uri.fromFile(File(path)))
62+
retriever.setDataSource(path)
6663
val width = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)
6764
val height = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)
6865
return "$width x $height"
@@ -72,14 +69,13 @@ class FileDirItem(val path: String, val name: String, val isDirectory: Boolean,
7269
return ""
7370
}
7471

75-
val imageResolution: String
76-
get () {
77-
val bitmap: Bitmap? = BitmapFactory.decodeFile(path)
78-
if (bitmap == null)
79-
return ""
72+
fun getImageResolution(): String {
73+
val bitmap: Bitmap? = BitmapFactory.decodeFile(path)
74+
if (bitmap == null)
75+
return ""
8076

81-
return "${bitmap.width} x ${bitmap.height}"
82-
}
77+
return "${bitmap.width} x ${bitmap.height}"
78+
}
8379

8480
private fun getFormattedDuration(duration: Int): String {
8581
val sb = StringBuilder(8)

0 commit comments

Comments
 (0)