changed result in camera intent and added intent for only camera to t…

…ake pictures and video
Nishith4545 · Jan 2, 2025 · fe1f495 · fe1f495
1 parent dcd047a
commit fe1f495
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/app/src/main/java/com/nishith/mediaselectorapp/MainActivity.kt b/app/src/main/java/com/nishith/mediaselectorapp/MainActivity.kt
@@ -11,6 +11,7 @@ import com.nishith.mediapicker.extention.hide
 import com.nishith.mediapicker.extention.loadImagefromServerAny
 import com.nishith.mediapicker.extention.show
 import com.nishith.mediapicker.fileselector.MediaSelectHelper
+import com.nishith.mediapicker.fileselector.MediaSelectHelper.Constant.CROP_SQUARE
 import com.nishith.mediapicker.fileselector.MediaSelector
 import com.nishith.mediapicker.utils.FileHelperKit.getPath
 import com.nishith.mediaselectorapp.databinding.ActivityMainBinding
@@ -45,13 +46,15 @@ class MainActivity : BaseActivity() {
 
     private fun setClickListener() = with(binding) {
         btnLaunchPicker.setOnClickListener {
-            mediaSelectHelper.canSelectMultipleImages(false)
-            mediaSelectHelper.selectOptionsForImagePicker(true)
+            //mediaSelectHelper.canSelectMultipleImages(false)
+            //mediaSelectHelper.selectOptionsForImagePicker(true)
+            mediaSelectHelper.openCameraPictureIntent(true,CROP_SQUARE)
         }
 
         btnLaunchVideoPicker.setOnClickListener {
-            mediaSelectHelper.canSelectMultipleVideo(false)
-            mediaSelectHelper.selectOptionsForVideoPicker()
+            //mediaSelectHelper.canSelectMultipleVideo(false)
+            //mediaSelectHelper.selectOptionsForVideoPicker()
+            mediaSelectHelper.openCameraVideoIntent()
         }
     }
 

diff --git a/mediapicker/src/main/java/com/nishith/mediapicker/fileselector/MediaSelectHelper.kt b/mediapicker/src/main/java/com/nishith/mediapicker/fileselector/MediaSelectHelper.kt
@@ -235,9 +235,13 @@ class MediaSelectHelper (private var mActivity: AppCompatActivity) :
         cameraResult =
             mActivity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
                 if (result.resultCode == RESULT_OK) {
-                    mMediaSelector?.onCameraVideoUri(Uri.fromFile(File(fileForCameraIntent)))
-                } else {
-                    //Log.e("++++cam_video", result.resultCode.toString())
+                    if (isSelectingVideo) {
+                        mMediaSelector?.onCameraVideoUri(Uri.fromFile(File(fileForCameraIntent)))
+                    } else {/*compressImage(fileForCameraIntent).apply {
+                            openCropViewOrNot(Uri.fromFile(File(this)))
+                        }*/
+                        openCropViewOrNot(Uri.fromFile(File(fileForCameraIntent)))
+                    }
                 }
             }
 
@@ -787,6 +791,21 @@ class MediaSelectHelper (private var mActivity: AppCompatActivity) :
         }.show()
     }
 
+    override fun openCameraPictureIntent(isCrop1: Boolean, cropType: String) {
+        this.cropType = cropType
+        this.isCrop = isCrop1
+        isSelectingVideo = false
+        isSelectAnyFile = false
+        openCamera()
+    }
+
+    override fun openCameraVideoIntent() {
+        isSelectAnyFile = false
+        isSelectingVideo = true
+        this.isCrop = false
+        dispatchTakeVideoIntent()
+    }
+
     override fun selectVideoFromGallery(extraMimeType: Array<String>) {
         extraMimeTypeVideo = extraMimeType
         canSelectMultipleVideo(canSelectMultipleVideo, extraMimeType)
@@ -1298,6 +1317,8 @@ interface FileSelectorMethods {
     fun canSelectMultipleImages(canSelect: Boolean)
     fun canSelectMultipleVideo(canSelect: Boolean, extraMimeType: Array<String> = arrayOf())
     fun openAnyIntent()
+    fun openCameraPictureIntent(isCrop1: Boolean, cropType: String)
+    fun openCameraVideoIntent()
     fun openPdfIntent()
     fun getThumbnailFromVideo(uri: Uri): File
     fun checkSelfStorageAndOpenPhotoPickerWindowForSelection(type: String) {