From 924f3585ce7360397a6fa6d2ba494f07a7d274e5 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 15 Nov 2016 23:53:36 +0100 Subject: [PATCH] move Utils to the proper folder --- .../com/simplemobiletools/camera/Utils.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename app/src/main/{java => kotlin}/com/simplemobiletools/camera/Utils.kt (91%) diff --git a/app/src/main/java/com/simplemobiletools/camera/Utils.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Utils.kt similarity index 91% rename from app/src/main/java/com/simplemobiletools/camera/Utils.kt rename to app/src/main/kotlin/com/simplemobiletools/camera/Utils.kt index e810835d..795e8ce4 100644 --- a/app/src/main/java/com/simplemobiletools/camera/Utils.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Utils.kt @@ -30,13 +30,11 @@ class Utils { return false } - val parameters = camera.parameters - - if (parameters.flashMode == null) { + if (camera.parameters.flashMode == null) { return false } - val supportedFlashModes = parameters.supportedFlashModes + val supportedFlashModes = camera.parameters.supportedFlashModes if (supportedFlashModes == null || supportedFlashModes.isEmpty() || supportedFlashModes.size == 1 && supportedFlashModes[0] == Camera.Parameters.FLASH_MODE_OFF) { return false @@ -56,9 +54,9 @@ class Utils { val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date()) return if (isPhoto) { - mediaStorageDir.path + File.separator + "IMG_" + timestamp + ".jpg" + "${mediaStorageDir.path}${File.separator}IMG_$timestamp.jpg" } else { - mediaStorageDir.path + File.separator + "VID_" + timestamp + ".mp4" + "${mediaStorageDir.path}${File.separator}VID_$timestamp.mp4" } }