jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert MediaFileUtils to a non-object

This commit is contained in:
ericdecanini 2022-04-14 11:28:14 +02:00
parent 8b66034af5
commit da843443ef
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
View File

@ -23,8 +23,8 @@ import android.provider.MediaStore
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import im.vector.lib.multipicker.entity.MultiPickerImageType import im.vector.lib.multipicker.entity.MultiPickerImageType
import im.vector.lib.multipicker.utils.MediaFileUtils.MediaType.IMAGE import im.vector.lib.multipicker.utils.MediaType
import im.vector.lib.multipicker.utils.MediaFileUtils.createTemporaryMediaFile import im.vector.lib.multipicker.utils.createTemporaryMediaFile
import im.vector.lib.multipicker.utils.toMultiPickerImageType import im.vector.lib.multipicker.utils.toMultiPickerImageType
/** /**
@ -61,7 +61,7 @@ class CameraPicker {
companion object { companion object {
fun createPhotoUri(context: Context): Uri { fun createPhotoUri(context: Context): Uri {
val file = createTemporaryMediaFile(context, IMAGE) val file = createTemporaryMediaFile(context, MediaType.IMAGE)
val authority = context.packageName + ".multipicker.fileprovider" val authority = context.packageName + ".multipicker.fileprovider"
return FileProvider.getUriForFile(context, authority, file) return FileProvider.getUriForFile(context, authority, file)
} }

33
library/multipicker/src/main/java/im/vector/lib/multipicker/utils/MediaFileUtils.kt
View File

@ -22,24 +22,21 @@ import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
object MediaFileUtils { fun createTemporaryMediaFile(context: Context, mediaType: MediaType): File {
val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
fun createTemporaryMediaFile(context: Context, mediaType: MediaType): File { val storageDir: File = context.filesDir.also { it.mkdirs() }
val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date()) val fileSuffix = when (mediaType) {
val storageDir: File = context.filesDir.also { it.mkdirs() } MediaType.IMAGE -> ".jpg"
val fileSuffix = when (mediaType) { MediaType.VIDEO -> ".mp4"
MediaType.IMAGE -> ".jpg"
MediaType.VIDEO -> ".mp4"
}
return File.createTempFile(
"${timeStamp}_",
fileSuffix,
storageDir
)
} }
enum class MediaType { return File.createTempFile(
IMAGE, VIDEO "${timeStamp}_",
} fileSuffix,
storageDir
)
}
enum class MediaType {
IMAGE, VIDEO
} }