Enhancement: Start video recording on camera icon clicked when "OnlyVideo" is enabled

imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerComponentsHolder.kt

@@ -13,13 +13,15 @@ interface ImagePickerComponents {
     val imageLoader: ImageLoader
     val imageFileLoader: ImageFileLoader
     val cameraModule: CameraModule
+    val videoModule: CameraModule
 }
 
 open class DefaultImagePickerComponents(context: Context) : ImagePickerComponents {
     override val appContext: Context = context.applicationContext
     override val imageLoader: ImageLoader by lazy { DefaultImageLoader() }
     override val imageFileLoader: ImageFileLoader by lazy { DefaultImageFileLoader(context.applicationContext) }
     override val cameraModule: CameraModule by lazy { DefaultCameraModule() }
+    override val videoModule: CameraModule by lazy { DefaultCameraModule() }
 }
 
 object ImagePickerComponentsHolder : ImagePickerComponents {
@@ -38,6 +40,9 @@ object ImagePickerComponentsHolder : ImagePickerComponents {
     override val cameraModule: CameraModule
         get() = internalComponents.cameraModule
 
+    override val videoModule: CameraModule
+        get() = internalComponents.videoModule
+
     fun setInternalComponent(components: ImagePickerComponents) {
         internalComponents = components
     }

imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerConfig.kt

@@ -27,6 +27,7 @@ class ImagePickerConfig(
     override var savePath: ImagePickerSavePath = ImagePickerSavePath.DEFAULT,
     override var returnMode: ReturnMode = ReturnMode.NONE,
     override var isSaveImage: Boolean = true,
+    override var isSaveVideo: Boolean = true,
     var showDoneButtonAlways: Boolean = false
 ) : BaseConfig(), Parcelable {
 

imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerFragment.kt

@@ -317,7 +317,11 @@ class ImagePickerFragment : Fragment() {
         if (!checkCameraAvailability(requireActivity())) {
             return
         }
-        presenter.captureImage(this, config, RC_CAPTURE)
+        if (config.isOnlyVideo) {
+            presenter.captureVideo(this, config, RC_CAPTURE)
+        } else{
+            presenter.captureImage(this, config, RC_CAPTURE)
+        }
     }
 
     override fun onDestroy() {

imagepicker/src/main/java/com/esafirm/imagepicker/features/ImagePickerPresenter.kt

@@ -22,7 +22,7 @@ internal class ImagePickerPresenter(
 ) : ImagePickerAction {
 
     private val cameraModule: CameraModule = ImagePickerComponentsHolder.cameraModule
-
+    private val videoModule: CameraModule = ImagePickerComponentsHolder.videoModule
     private val stateObs = LiveDataObservableState(
         ImagePickerState(isLoading = true),
         usePostValue = true
@@ -95,6 +95,20 @@ internal class ImagePickerPresenter(
         fragment.startActivityForResult(intent, requestCode)
     }
 
+    fun captureVideo(fragment: Fragment, config: BaseConfig, requestCode: Int) {
+        val context = fragment.requireContext().applicationContext
+        val intent = videoModule.getVideoIntent(fragment.requireContext(), config)
+        if (intent == null) {
+            Toast.makeText(
+                context,
+                context.getString(R.string.ef_error_create_image_file),
+                Toast.LENGTH_LONG
+            ).show()
+            return
+        }
+        fragment.startActivityForResult(intent, requestCode)
+    }
+
     fun finishCaptureImage(context: Context, data: Intent?, config: BaseConfig?) {
         cameraModule.getImage(context, data) { images ->
             if (ConfigUtils.shouldReturn(config!!, true)) {

imagepicker/src/main/java/com/esafirm/imagepicker/features/camera/CameraModule.kt

@@ -9,6 +9,7 @@ typealias OnImageReadyListener = (List<Image>?) -> Unit
 
 interface CameraModule {
     fun getCameraIntent(context: Context, config: BaseConfig): Intent?
+    fun getVideoIntent(context: Context, config: BaseConfig): Intent?
     fun getImage(context: Context, intent: Intent?, imageReadyListener: OnImageReadyListener)
     fun removeImage(context: Context)
 }

imagepicker/src/main/java/com/esafirm/imagepicker/features/camera/DefaultCameraModule.kt

@@ -35,6 +35,22 @@ class DefaultCameraModule : CameraModule {
         return intent
     }
 
+    override fun getVideoIntent(context: Context, config: BaseConfig): Intent? {
+        prepareForNewIntent()
+
+        val intent = Intent(MediaStore.ACTION_VIDEO_CAPTURE)
+        val imageFile = ImagePickerUtils.createVideoFile(config.savePath, context)
+
+        if (config.isSaveVideo && imageFile != null) {
+            val appContext = context.applicationContext
+            val uri = createVideoUri(appContext, imageFile)
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, uri)
+            ImagePickerUtils.grantAppPermission(context, intent, uri)
+            currentUri = uri.toString()
+        }
+        return intent
+    }
+
     private fun prepareForNewIntent() {
         currentImagePath = null
         currentUri = null
@@ -55,6 +71,21 @@ class DefaultCameraModule : CameraModule {
         return UriUtils.uriForFile(appContext, imageFile)
     }
 
+    private fun createVideoUri(appContext: Context, videoFile: File): Uri? {
+        currentImagePath = "file:" + videoFile.absolutePath
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+
+            val values = ContentValues().apply {
+                put(MediaStore.Video.Media.DISPLAY_NAME, videoFile.name)
+                put(MediaStore.Video.Media.MIME_TYPE, "video/mp4")
+            }
+            val collection =
+                MediaStore.Video.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
+            return appContext.contentResolver.insert(collection, values)
+        }
+        return UriUtils.uriForFile(appContext, videoFile)
+    }
+
     override fun getImage(
         context: Context,
         intent: Intent?,

imagepicker/src/main/java/com/esafirm/imagepicker/features/cameraonly/CameraOnlyConfig.kt

@@ -10,5 +10,6 @@ import kotlinx.android.parcel.Parcelize
 class CameraOnlyConfig(
     override var savePath: ImagePickerSavePath = ImagePickerSavePath.DEFAULT,
     override var returnMode: ReturnMode = ReturnMode.ALL,
-    override var isSaveImage: Boolean = true
+    override var isSaveImage: Boolean = true,
+    override var isSaveVideo: Boolean = true
 ) : BaseConfig(), Parcelable

imagepicker/src/main/java/com/esafirm/imagepicker/features/common/BaseConfig.kt

@@ -7,4 +7,5 @@ abstract class BaseConfig {
     abstract var savePath: ImagePickerSavePath
     abstract var returnMode: ReturnMode
     abstract var isSaveImage: Boolean
+    abstract var isSaveVideo: Boolean
 }

imagepicker/src/main/java/com/esafirm/imagepicker/helper/ImagePickerUtils.kt

@@ -48,6 +48,27 @@ object ImagePickerUtils {
         return mediaStorageDir
     }
 
+    private fun createFileInDirectoryVideo(savePath: ImagePickerSavePath, context: Context): File? {
+        val path = savePath.path
+        val mediaStorageDir: File = if (savePath.isRelative) {
+            val parent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                context.getExternalFilesDir(Environment.DIRECTORY_MOVIES)
+            } else {
+                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES)
+            }
+            File(parent, path)
+        } else {
+            File(path)
+        }
+        if (!mediaStorageDir.exists()) {
+            if (!mediaStorageDir.mkdirs()) {
+                d("Oops! Failed create $path")
+                return null
+            }
+        }
+        return mediaStorageDir
+    }
+
     fun createImageFile(savePath: ImagePickerSavePath, context: Context): File? {
         val mediaStorageDir = createFileInDirectory(savePath, context) ?: return null
 
@@ -62,6 +83,18 @@ object ImagePickerUtils {
         return result
     }
 
+    fun createVideoFile(savePath: ImagePickerSavePath, context: Context): File? {
+        val mediaStorageDir = createFileInDirectoryVideo(savePath, context) ?: return null
+        val timeStamp = SimpleDateFormat("yyyyMMdd_HHmmss_SSS", Locale.getDefault()).format(Date())
+        var result = File(mediaStorageDir, "VID_$timeStamp.mp4")
+        var counter = 0
+        while (result.exists()) {
+            counter++
+            result = File(mediaStorageDir, "VID_$timeStamp($counter).mp4")
+        }
+        return result
+    }
+
     fun getNameFromFilePath(path: String): String {
         return if (path.contains(File.separator)) {
             path.substring(path.lastIndexOf(File.separator) + 1)