diff --git a/app/src/main/java/com/lassi/app/MainActivity.kt b/app/src/main/java/com/lassi/app/MainActivity.kt
index b62477d..d14b259 100644
--- a/app/src/main/java/com/lassi/app/MainActivity.kt
+++ b/app/src/main/java/com/lassi/app/MainActivity.kt
@@ -8,7 +8,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Environment
 import android.provider.Settings
-import android.util.Log
 import android.view.View
 import android.webkit.MimeTypeMap
 import androidx.activity.result.contract.ActivityResultContracts
@@ -21,7 +20,6 @@ import com.lassi.common.utils.KeyUtils
 import com.lassi.data.media.MiMedia
 import com.lassi.domain.media.LassiOption
 import com.lassi.domain.media.MediaType
-import com.lassi.domain.media.MultiLangConfig
 import com.lassi.domain.media.SortingOption
 import com.lassi.presentation.builder.Lassi
 import com.lassi.presentation.common.decoration.GridSpacingItemDecoration
@@ -31,9 +29,9 @@ import java.util.Locale
 
 class MainActivity : AppCompatActivity(), View.OnClickListener {
     private var _binding: ActivityMainBinding? = null
-    protected val binding get() = _binding!!
+    private val binding get() = _binding!!
     private val selectedMediaAdapter by lazy { SelectedMediaAdapter(this::onItemClicked) }
-    lateinit var lassi: Lassi
+    private lateinit var lassi: Lassi
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -47,7 +45,9 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
             it.btnImageCapture.setOnClickListener(this)
             it.btnVideoCapture.setOnClickListener(this)
             it.btnDocumentSystemIntent.setOnClickListener(this)
+            it.btnPhotoVideoPicker.setOnClickListener(this)
             it.btnPhotoPicker.setOnClickListener(this)
+            it.btnVideoMediaPicker.setOnClickListener(this)
             it.rvSelectedMedia.adapter = selectedMediaAdapter
             it.rvSelectedMedia.addItemDecoration(GridSpacingItemDecoration(2, 10))
         }
@@ -72,13 +72,13 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                 setSortByDateLbl = "Trier par date"
             )
         }
-        binding.btnPhotoPicker.visibility = View.VISIBLE
+        binding.btnPhotoVideoPicker.visibility = View.VISIBLE
     }
 
     override fun onClick(v: View?) {
         when (v?.id) {
             R.id.btnImagePicker -> {
-                val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMaxCount(1)
+                val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMaxCount(4)
                     .setAscSort(SortingOption.ASCENDING).setGridSize(2)
                     .setMediaType(MediaType.IMAGE)
                     .setPlaceHolder(R.drawable.ic_image_placeholder)
@@ -94,6 +94,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                     .setCropType(CropImageView.CropShape.OVAL).setCropAspectRatio(1, 1)
                     .setCompressionRatio(10).setMinFileSize(0).setMaxFileSize(Int.MAX_VALUE.toLong())
                     .enableActualCircleCrop()
+                    .disableCrop()
                     .setSupportedFileTypes("jpg", "jpeg", "png", "webp", "gif").enableFlip()
                     .enableRotate().build()
                 receiveData.launch(intent)
@@ -214,9 +215,42 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                 receiveData.launch(intent)
             }
 
+            R.id.btnPhotoVideoPicker -> {
+                val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMaxCount(4)
+                    .setMediaType(MediaType.PHOTO_VIDEO_PICKER)
+                    .setStatusBarColor(R.color.colorPrimaryDark)
+                    .setToolbarColor(R.color.colorPrimary)
+                    .setToolbarResourceColor(android.R.color.white)
+                    .setProgressBarColor(R.color.colorAccent)
+                    .setGalleryBackgroundColor(R.color.colorGrey)
+                    .setCustomLimitExceedingErrorMessage("Selected item exceeded the limit!")
+                    .build()
+                receiveData.launch(intent)
+            }
+
             R.id.btnPhotoPicker -> {
                 val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMaxCount(4)
+                    .setAscSort(SortingOption.ASCENDING).setGridSize(2)
                     .setMediaType(MediaType.PHOTO_PICKER)
+                    .setPlaceHolder(R.drawable.ic_image_placeholder)
+                    .setErrorDrawable(R.drawable.ic_image_placeholder)
+                    .setSelectionDrawable(R.drawable.ic_checked_media)
+                    .setStatusBarColor(R.color.colorPrimaryDark)
+                    .setToolbarColor(R.color.colorPrimary)
+                    .setToolbarResourceColor(android.R.color.white)
+                    .setAlertDialogNegativeButtonColor(R.color.cherry_red)
+                    .setAlertDialogPositiveButtonColor(R.color.emerald_green)
+                    .setProgressBarColor(R.color.colorAccent)
+                    .setGalleryBackgroundColor(R.color.colorGrey)
+                    .enableMultiSelection()
+                    .setCustomLimitExceedingErrorMessage("Selected item exceeded the limit!")
+                    .build()
+                receiveData.launch(intent)
+            }
+
+            R.id.btnVideoMediaPicker -> {
+                val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMaxCount(4)
+                    .setMediaType(MediaType.VIDEO_PICKER)
                     .setStatusBarColor(R.color.colorPrimaryDark)
                     .setToolbarColor(R.color.colorPrimary)
                     .setToolbarResourceColor(android.R.color.white)
@@ -247,9 +281,14 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
     private val receiveData =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             if (it.resultCode == Activity.RESULT_OK) {
-                val selectedMedia =
-                    it.data?.getSerializableExtra(KeyUtils.SELECTED_MEDIA) as ArrayList<MiMedia>
-                if (selectedMedia.isNotEmpty()) {
+                val selectedMedia = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    it.data?.getParcelableArrayListExtra(KeyUtils.SELECTED_MEDIA, MiMedia::class.java)
+                } else {
+                    @Suppress("DEPRECATION")
+                    it.data?.getParcelableArrayListExtra(KeyUtils.SELECTED_MEDIA)
+                }
+
+                if (!selectedMedia.isNullOrEmpty()) {
                     binding.ivEmpty.isVisible = selectedMedia.isEmpty()
                     selectedMediaAdapter.setList(selectedMedia)
                 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f620172..08e7ad4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -152,14 +152,14 @@
             app:layout_constraintTop_toBottomOf="@+id/btnDocumentSystemIntent" />
 
         <Button
-            android:id="@+id/btnPhotoPicker"
+            android:id="@+id/btnPhotoVideoPicker"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:background="@drawable/bg_rounded_button"
             android:drawableStart="@drawable/ic_document"
             android:padding="10dp"
-            android:text="@string/photo_picker"
+            android:text="@string/photo_video_picker"
             android:textAllCaps="false"
             android:textColor="@android:color/white"
             android:textSize="16sp"
@@ -169,6 +169,47 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/btnVideoCapture" />
+
+        <Button
+            android:id="@+id/btnPhotoPicker"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/bg_rounded_button"
+            android:drawableStart="@drawable/ic_camera_white"
+            android:padding="10dp"
+            android:text="@string/photo_picker"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@+id/btnVideoMediaPicker"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btnPhotoVideoPicker" />
+
+        <Button
+            android:id="@+id/btnVideoMediaPicker"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="32dp"
+            android:background="@drawable/bg_rounded_button"
+            android:drawableStart="@drawable/ic_video_cam_white"
+            android:padding="10dp"
+            android:text="Video Picker"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/btnPhotoPicker"
+            app:layout_constraintTop_toBottomOf="@+id/btnPhotoVideoPicker" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f4954c8..c87a20a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -16,4 +16,5 @@
     <string name="sort_descending">Descendente</string>
     <string name="camera_permission_rational">No se concede el permiso de la cámara. Por favor, permita que se configure.</string>
     <string name="crop_image_menu_crop">Cultivo</string>
+    <string name="photo_video_picker">Fotos y videos</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d5cb6ab..3905639 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,4 +15,5 @@
     <string name="sort_descending">Descending</string>
     <string name="camera_permission_rational">Camera permission is not granted. Please allow it from setting.</string>
     <string name="crop_image_menu_crop">Crop</string>
+    <string name="photo_video_picker">Photo &amp; Video Picker</string>
 </resources>
diff --git a/lassi/build.gradle b/lassi/build.gradle
index dac135d..353e6c5 100644
--- a/lassi/build.gradle
+++ b/lassi/build.gradle
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 34
-        versionCode 27
-        versionName "1.4.0"
+        versionCode 30
+        versionName "1.4.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
diff --git a/lassi/src/main/java/com/lassi/common/utils/UriHelper.kt b/lassi/src/main/java/com/lassi/common/utils/UriHelper.kt
new file mode 100644
index 0000000..e14ea83
--- /dev/null
+++ b/lassi/src/main/java/com/lassi/common/utils/UriHelper.kt
@@ -0,0 +1,54 @@
+package com.lassi.common.utils
+
+import android.content.ContentResolver
+import android.content.Context
+import android.graphics.Bitmap.CompressFormat
+import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
+import android.webkit.MimeTypeMap
+
+object UriHelper {
+    private fun getMediaType(uri: Uri, contentResolver: ContentResolver): String? {
+        // Columns to retrieve from the media store
+        val projection = arrayOf(MediaStore.MediaColumns.MIME_TYPE)
+
+        // Query the content resolver for the media information
+        contentResolver.query(uri, projection, null, null, null)?.use { cursor ->
+            if (cursor.moveToFirst()) {
+                val mimeTypeColumnIndex = cursor.getColumnIndex(MediaStore.MediaColumns.MIME_TYPE)
+                if (mimeTypeColumnIndex >= 0) {
+                    return cursor.getString(mimeTypeColumnIndex)
+                }
+            }
+        }
+        return null
+    }
+
+    fun isVideo(uri: Uri, contentResolver: ContentResolver): Boolean {
+        val mimeType = getMediaType(uri, contentResolver)
+        return mimeType?.startsWith("video/") == true
+    }
+
+    fun isPhoto(uri: Uri, contentResolver: ContentResolver): Boolean {
+        val mimeType: String? = if (uri.scheme == ContentResolver.SCHEME_CONTENT) {
+            contentResolver.getType(uri)
+        } else {
+            // For file:// URIs, manually get the MIME type based on the file extension
+            val extension = MimeTypeMap.getFileExtensionFromUrl(uri.toString())
+            MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+        }
+        val t = mimeType?.startsWith("image/") == true
+        return t
+    }
+
+    fun getCompressFormatForUri(uri: Uri, context: Context): CompressFormat {
+        val mimeType = context.contentResolver?.getType(uri)
+        return when (mimeType) {
+            "image/png" -> CompressFormat.PNG
+            "image/jpeg" -> CompressFormat.JPEG
+            "image/webp" -> if (Build.VERSION.SDK_INT >= 30) CompressFormat.WEBP_LOSSLESS else CompressFormat.WEBP
+            else -> CompressFormat.JPEG
+        }
+    }
+}
\ No newline at end of file
diff --git a/lassi/src/main/java/com/lassi/data/media/entity/MediaFileDao.kt b/lassi/src/main/java/com/lassi/data/media/entity/MediaFileDao.kt
index 645a0fa..22e3406 100644
--- a/lassi/src/main/java/com/lassi/data/media/entity/MediaFileDao.kt
+++ b/lassi/src/main/java/com/lassi/data/media/entity/MediaFileDao.kt
@@ -72,8 +72,13 @@ interface MediaFileDao {
                 " ON $MEDIA_FILE_ENTITY.$MEDIA_ID = $DURATION_ENTITY.duration_media_id" +
                 " INNER JOIN  $ALBUM_COVER_ENTITY" +
                 " ON $MEDIA_FILE_ENTITY.$MEDIA_ID = $ALBUM_COVER_ENTITY.$ALBUM_COVER_MEDIA_ID" +
-                " WHERE $MEDIA_BUCKET = :bucket AND $MEDIA_TYPE = :mediaType ORDER BY CASE WHEN :isAsc = 1 THEN $MEDIA_DATE_ADDED END ASC, CASE WHEN :isAsc = 0 THEN $MEDIA_DATE_ADDED END DESC")
-    fun getSelectedSortedMediaFile(bucket: String, isAsc: Int, mediaType: Int): List<SelectedMediaModel>
+                " WHERE $MEDIA_BUCKET = :bucket AND $MEDIA_TYPE = :mediaType ORDER BY CASE WHEN :isAsc = 1 THEN $MEDIA_DATE_ADDED END ASC, CASE WHEN :isAsc = 0 THEN $MEDIA_DATE_ADDED END DESC"
+    )
+    fun getSelectedSortedMediaFile(
+        bucket: String,
+        isAsc: Int,
+        mediaType: Int,
+    ): List<SelectedMediaModel>
 
     @Query("SELECT * FROM $MEDIA_FILE_ENTITY WHERE $MEDIA_BUCKET = :bucket AND $MEDIA_TYPE = :mediaType")
     fun getSelectedImageMediaFile(bucket: String, mediaType: Int): List<MediaFileEntity>
@@ -82,7 +87,7 @@ interface MediaFileDao {
     fun getSelectedSortedImageMediaFile(
         bucket: String,
         isAsc: Int,
-        mediaType: Int
+        mediaType: Int,
     ): List<MediaFileEntity>
 
     @Query("SELECT * FROM $MEDIA_FILE_ENTITY WHERE $MEDIA_TYPE = 1 OR $MEDIA_TYPE = 2 OR $MEDIA_TYPE = 3")
@@ -90,4 +95,7 @@ interface MediaFileDao {
 
     @Query("DELETE FROM $MEDIA_FILE_ENTITY WHERE $MEDIA_PATH = :mediaPath")
     fun deleteByMediaPath(mediaPath: String)
+
+    @Query("DELETE FROM $MEDIA_FILE_ENTITY")
+    fun deleteMediaFiles()
 }
\ No newline at end of file
diff --git a/lassi/src/main/java/com/lassi/data/media/repository/MediaRepositoryImpl.kt b/lassi/src/main/java/com/lassi/data/media/repository/MediaRepositoryImpl.kt
index 41a10ad..c590b36 100644
--- a/lassi/src/main/java/com/lassi/data/media/repository/MediaRepositoryImpl.kt
+++ b/lassi/src/main/java/com/lassi/data/media/repository/MediaRepositoryImpl.kt
@@ -32,7 +32,6 @@ import kotlinx.coroutines.launch
 import java.io.File
 
 class MediaRepositoryImpl(private val context: Context) : MediaRepository {
-    private var mediaPathToRemove: ArrayList<MediaFileEntity>? = null
     val TAG = MediaRepositoryImpl::class.java.simpleName
     private val minTimeInMillis = LassiConfig.getConfig().minTime * 1000L
     private val maxTimeInMillis = LassiConfig.getConfig().maxTime * 1000L
@@ -84,6 +83,12 @@ class MediaRepositoryImpl(private val context: Context) : MediaRepository {
         return resultDeferred.await()
     }
 
+    override suspend fun deleteMediaFiles() {
+        CoroutineScope(IO).launch {
+            mediaDatabase.mediaFileDao().deleteMediaFiles()
+        }
+    }
+
     override suspend fun removeMediaData(allDataList: List<MediaFileEntity>?) {
         CoroutineScope(IO).launch {
             if (allDataList != null) {
@@ -164,7 +169,7 @@ class MediaRepositoryImpl(private val context: Context) : MediaRepository {
         }.catch().flowOn(IO)
     }
 
-    private suspend fun checkDurationAndAddFileToDatabase(
+    private fun checkDurationAndAddFileToDatabase(
         bucket: String?,
         id: Long,
         name: String,
@@ -173,7 +178,7 @@ class MediaRepositoryImpl(private val context: Context) : MediaRepository {
         albumCoverPath: String,
         size: Long,
         dateAdded: Long,
-        mediaType: MediaType
+        mediaType: MediaType,
     ) {
         if (isValidDuration(duration) && isValidFileSize(size)) {
             addFileToDatabase(
@@ -218,7 +223,7 @@ class MediaRepositoryImpl(private val context: Context) : MediaRepository {
     /**
      * Add file to database
      */
-    private suspend fun addFileToDatabase(
+    private fun addFileToDatabase(
         bucket: String?,
         miMedia: MiMedia,
         dateAdded: Long,
diff --git a/lassi/src/main/java/com/lassi/domain/media/LassiConfig.kt b/lassi/src/main/java/com/lassi/domain/media/LassiConfig.kt
index ff7a78b..3d1eeef 100644
--- a/lassi/src/main/java/com/lassi/domain/media/LassiConfig.kt
+++ b/lassi/src/main/java/com/lassi/domain/media/LassiConfig.kt
@@ -40,13 +40,14 @@ data class LassiConfig(
     var enableFlipImage: Boolean = false,
     var enableRotateImage: Boolean = false,
     var enableActualCircleCrop: Boolean = false,
-    var compressionRation: Int = 0,
+    var compressionRatio: Int = 0,
     var minFileSize: Long = KeyUtils.DEFAULT_FILE_SIZE,
     var maxFileSize: Long = KeyUtils.DEFAULT_FILE_SIZE,
     var isCrop: Boolean = true,
     var alertDialogNegativeButtonColor: Int = Color.BLACK,
     var alertDialogPositiveButtonColor: Int = Color.BLACK,
-    var customLimitExceedingErrorMessage: String = ERROR_EXCEEDING_MSG
+    var customLimitExceedingErrorMessage: String = ERROR_EXCEEDING_MSG,
+    var isMultiPicker : Boolean = false
 ) : Parcelable {
     companion object {
 
@@ -80,13 +81,14 @@ data class LassiConfig(
                 enableFlipImage = lassiConfig.enableFlipImage
                 enableRotateImage = lassiConfig.enableRotateImage
                 enableActualCircleCrop = lassiConfig.enableActualCircleCrop
-                compressionRation = lassiConfig.compressionRation
+                compressionRatio = lassiConfig.compressionRatio
                 minFileSize = lassiConfig.minFileSize
                 maxFileSize = lassiConfig.maxFileSize
                 isCrop = lassiConfig.isCrop
                 alertDialogNegativeButtonColor = lassiConfig.alertDialogNegativeButtonColor
                 alertDialogPositiveButtonColor = lassiConfig.alertDialogPositiveButtonColor
                 customLimitExceedingErrorMessage = lassiConfig.customLimitExceedingErrorMessage
+                isMultiPicker = lassiConfig.isMultiPicker
             }
         }
 
diff --git a/lassi/src/main/java/com/lassi/domain/media/MediaRepository.kt b/lassi/src/main/java/com/lassi/domain/media/MediaRepository.kt
index 39d6bea..71ba687 100644
--- a/lassi/src/main/java/com/lassi/domain/media/MediaRepository.kt
+++ b/lassi/src/main/java/com/lassi/domain/media/MediaRepository.kt
@@ -14,4 +14,5 @@ interface MediaRepository {
     suspend fun insertMediaData(): Result<Boolean>
     suspend fun insertAllMediaData(): Result<Boolean>
     suspend fun removeMediaData(allDataList: List<MediaFileEntity>?)
+    suspend fun deleteMediaFiles()
 }
\ No newline at end of file
diff --git a/lassi/src/main/java/com/lassi/domain/media/MediaType.kt b/lassi/src/main/java/com/lassi/domain/media/MediaType.kt
index 077ece1..0da66dc 100644
--- a/lassi/src/main/java/com/lassi/domain/media/MediaType.kt
+++ b/lassi/src/main/java/com/lassi/domain/media/MediaType.kt
@@ -6,5 +6,7 @@ enum class MediaType(val value: Int) {
     AUDIO(3),
     DOC(4),
     FILE_TYPE_WITH_SYSTEM_VIEW(5),
-    PHOTO_PICKER(6)
+    PHOTO_PICKER(6),
+    VIDEO_PICKER(7),
+    PHOTO_VIDEO_PICKER(8),
 }
\ No newline at end of file
diff --git a/lassi/src/main/java/com/lassi/presentation/builder/Lassi.kt b/lassi/src/main/java/com/lassi/presentation/builder/Lassi.kt
index b44013b..23821c4 100644
--- a/lassi/src/main/java/com/lassi/presentation/builder/Lassi.kt
+++ b/lassi/src/main/java/com/lassi/presentation/builder/Lassi.kt
@@ -383,6 +383,11 @@ class Lassi(private val context: Context) {
         return this
     }
 
+    fun enableMultiSelection(): Lassi {
+        lassiConfig.isMultiPicker = true
+        return this
+    }
+
     /**
      * Set crop Aspect ratio
      */
@@ -426,7 +431,7 @@ class Lassi(private val context: Context) {
         } else {
             compressionRation
         }
-        lassiConfig.compressionRation = compression
+        lassiConfig.compressionRatio = compression
         return this
     }
 
diff --git a/lassi/src/main/java/com/lassi/presentation/camera/CameraFragment.kt b/lassi/src/main/java/com/lassi/presentation/camera/CameraFragment.kt
index f2fe9b6..26ee293 100644
--- a/lassi/src/main/java/com/lassi/presentation/camera/CameraFragment.kt
+++ b/lassi/src/main/java/com/lassi/presentation/camera/CameraFragment.kt
@@ -8,7 +8,6 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.provider.Settings
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
@@ -23,6 +22,7 @@ import com.lassi.common.extenstions.invisible
 import com.lassi.common.extenstions.show
 import com.lassi.common.utils.KeyUtils
 import com.lassi.common.utils.ToastUtils
+import com.lassi.common.utils.UriHelper.getCompressFormatForUri
 import com.lassi.data.common.StartVideoContract
 import com.lassi.data.common.VideoRecord
 import com.lassi.data.media.MiMedia
@@ -40,6 +40,8 @@ import com.lassi.presentation.cameraview.controls.CameraOptions
 import com.lassi.presentation.cameraview.controls.PictureResult
 import com.lassi.presentation.cameraview.controls.VideoResult
 import com.lassi.presentation.common.LassiBaseViewModelFragment
+import com.lassi.presentation.cropper.BitmapUtils.decodeUriToBitmap
+import com.lassi.presentation.cropper.BitmapUtils.writeBitmapToUri
 import com.lassi.presentation.cropper.CropImageContract
 import com.lassi.presentation.cropper.CropImageContractOptions
 import com.lassi.presentation.cropper.CropImageOptions
@@ -75,7 +77,7 @@ class CameraFragment : LassiBaseViewModelFragment<CameraViewModel, FragmentCamer
             cameraViewModel.addSelectedMedia(miMedia)
             folderViewModel.checkInsert()
             if (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY || LassiConfig.getConfig().lassiOption == LassiOption.GALLERY) {
-                miMedia?.let { setResultOk(arrayListOf(it)) }
+                setResultOk(arrayListOf(miMedia))
             }
         }
     }
@@ -167,20 +169,43 @@ class CameraFragment : LassiBaseViewModelFragment<CameraViewModel, FragmentCamer
         super.initLiveDataObservers()
         viewModel.startVideoRecord.observe(this, SafeObserver(this::handleVideoRecord))
         viewModel.cropImageLiveData.observe(this, SafeObserver { uri ->
-            if (LassiConfig.getConfig().isCrop && LassiConfig.getConfig().maxCount <= 1) {
-                croppingOptions(uri = uri)
+            val config = LassiConfig.getConfig()
+            if (config.isCrop && config.maxCount <= 1) {
+                croppingOptions(uri)
             } else {
-                ArrayList<MiMedia>().also {
-                    MiMedia().apply {
-                        this.path = uri.path
-                        it.add(this)
-                    }
-                    setResultOk(it)
+                val mediaList = arrayListOf(createMiMedia(uri.path))
+                if (config.compressionRatio > 0) {
+                    compressMedia(mediaList)
+                } else {
+                    setResultOk(mediaList)
                 }
             }
         })
     }
 
+    // Helper function to create MiMedia object
+    private fun createMiMedia(path: String?): MiMedia {
+        return MiMedia().apply { this.path = path }
+    }
+
+    private fun compressMedia(mediaPaths: ArrayList<MiMedia>) {
+        mediaPaths.forEachIndexed { index, miMedia ->
+            miMedia.path?.let { path ->
+                val uri = Uri.fromFile(File(path))
+                val compressFormat = getCompressFormatForUri(uri, requireContext())
+                val newUri = writeBitmapToUri(
+                    requireContext(),
+                    decodeUriToBitmap(requireContext(), uri),
+                    compressQuality = LassiConfig.getConfig().compressionRatio,
+                    customOutputUri = null,
+                    compressFormat = compressFormat
+                )
+                mediaPaths[index] = miMedia.copy(path = newUri.path)
+            }
+        }
+        setResultOk(mediaPaths)
+    }
+
     private fun croppingOptions(
         uri: Uri? = null,
         includeCamera: Boolean? = false,
@@ -190,15 +215,16 @@ class CameraFragment : LassiBaseViewModelFragment<CameraViewModel, FragmentCamer
          * Start picker to get image for cropping and then use the image in cropping activity.
          */
         cropImage.launch(
-            includeCamera?.let { includeCamera ->
+            includeCamera?.let {
                 includeGallery?.let { includeGallery ->
                     CropImageOptions(
-                        imageSourceIncludeCamera = includeCamera,
+                        imageSourceIncludeCamera = it,
                         imageSourceIncludeGallery = includeGallery,
                         cropShape = CropImageView.CropShape.RECTANGLE,
                         showCropOverlay = true,
                         guidelines = CropImageView.Guidelines.ON,
                         multiTouchEnabled = false,
+                        outputCompressQuality = LassiConfig.getConfig().compressionRatio
                     )
                 }
             }?.let {
@@ -352,7 +378,7 @@ class CameraFragment : LassiBaseViewModelFragment<CameraViewModel, FragmentCamer
                 permissionSettingResult.launch(intent)
             }
             .setNegativeButton(MultiLangConfig.getConfig().cancel) { _, _ ->
-                activity?.onBackPressed()
+                activity?.onBackPressedDispatcher?.onBackPressed()
             }
         val permissionDialog = alertDialog.create()
         permissionDialog.setCancelable(false)
@@ -384,20 +410,18 @@ class CameraFragment : LassiBaseViewModelFragment<CameraViewModel, FragmentCamer
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
 
             needsStorage =
-                needsStorage && ActivityCompat.checkSelfPermission(
+                ActivityCompat.checkSelfPermission(
                     requireContext(),
                     Manifest.permission.WRITE_EXTERNAL_STORAGE
                 ) != PackageManager.PERMISSION_GRANTED
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            //Storage permission is not required for Tiramisu
-        }
-
-        if (needsAudio)
-            needsAudio =
-                needsAudio && ActivityCompat.checkSelfPermission(
-                    requireContext(),
-                    Manifest.permission.RECORD_AUDIO
-                ) != PackageManager.PERMISSION_GRANTED
+        } else
+
+            if (needsAudio)
+                needsAudio =
+                    ActivityCompat.checkSelfPermission(
+                        requireContext(),
+                        Manifest.permission.RECORD_AUDIO
+                    ) != PackageManager.PERMISSION_GRANTED
 
         return !needsCamera && !needsAudio && !needsStorage
     }
diff --git a/lassi/src/main/java/com/lassi/presentation/cropper/BitmapUtils.kt b/lassi/src/main/java/com/lassi/presentation/cropper/BitmapUtils.kt
index 4ce0eaa..a4b7772 100644
--- a/lassi/src/main/java/com/lassi/presentation/cropper/BitmapUtils.kt
+++ b/lassi/src/main/java/com/lassi/presentation/cropper/BitmapUtils.kt
@@ -459,12 +459,22 @@ internal object BitmapUtils {
     ): Uri {
         val newUri = customOutputUri ?: buildUri(context, compressFormat)
 
-        return context.contentResolver.openOutputStream(newUri, WRITE_AND_TRUNCATE).use {
-            it?.let {
-                it1 -> bitmap.compress(compressFormat, compressQuality, it1)
+        context.contentResolver.openOutputStream(newUri, WRITE_AND_TRUNCATE).use { outputStream ->
+            if (compressQuality > 0) {
+                outputStream?.let { bitmap.compress(compressFormat, compressQuality, it) }
+            } else {
+                // Save the bitmap without compression to ensure the URI is populated
+                outputStream?.let { bitmap.compress(compressFormat, 100, it) }
             }
-            newUri
         }
+        return newUri
+    }
+
+    fun decodeUriToBitmap(context: Context, uri: Uri): Bitmap {
+        // Decode the Uri into a Bitmap
+        return context.contentResolver.openInputStream(uri)?.use { inputStream ->
+            BitmapFactory.decodeStream(inputStream)
+        } ?: throw FileNotFoundException("Unable to decode bitmap from URI")
     }
 
     private fun buildUri(
diff --git a/lassi/src/main/java/com/lassi/presentation/media/MediaFragment.kt b/lassi/src/main/java/com/lassi/presentation/media/MediaFragment.kt
index 6c29fc0..4850b87 100644
--- a/lassi/src/main/java/com/lassi/presentation/media/MediaFragment.kt
+++ b/lassi/src/main/java/com/lassi/presentation/media/MediaFragment.kt
@@ -42,6 +42,7 @@ import com.lassi.presentation.cropper.CropImageView
 import com.lassi.presentation.media.adapter.MediaAdapter
 import com.lassi.presentation.mediadirectory.FolderViewModel
 import com.lassi.presentation.mediadirectory.FolderViewModelFactory
+import com.lassi.presentation.mediadirectory.LassiMediaPickerActivity
 import com.lassi.presentation.mediadirectory.SelectedMediaViewModelFactory
 import java.io.File
 
@@ -174,7 +175,8 @@ class MediaFragment :
                             multiTouchEnabled = false,
                             aspectRatioX = x,
                             aspectRatioY = y,
-                            fixAspectRatio = LassiConfig.getConfig().enableActualCircleCrop
+                            fixAspectRatio = LassiConfig.getConfig().enableActualCircleCrop,
+                            outputCompressQuality = LassiConfig.getConfig().compressionRatio
                         )
                     }
                 }
@@ -227,8 +229,14 @@ class MediaFragment :
                 } else if (LassiConfig.getConfig().maxCount > 1) {
                     viewModel.addAllSelectedMedia(selectedMedias)
                 } else {
-                    viewModel.addAllSelectedMedia(selectedMedias)
-                    setResultOk(selectedMedias)
+                    if (LassiConfig.getConfig().compressionRatio > 0) {
+                        (context as LassiMediaPickerActivity).compressMedia(
+                            selectedMedias,
+                        )
+                    }else{
+                        viewModel.addAllSelectedMedia(selectedMedias)
+                        setResultOk(selectedMedias)
+                    }
                 }
             }
 
diff --git a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
index 5d8e3f9..d0818fd 100644
--- a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
+++ b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
@@ -8,7 +8,6 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.database.Cursor
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
@@ -18,6 +17,8 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.View
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
@@ -25,6 +26,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import com.lassi.R
 import com.lassi.common.extenstions.hide
@@ -32,6 +34,9 @@ import com.lassi.common.extenstions.safeObserve
 import com.lassi.common.extenstions.show
 import com.lassi.common.utils.KeyUtils
 import com.lassi.common.utils.ToastUtils
+import com.lassi.common.utils.UriHelper.getCompressFormatForUri
+import com.lassi.common.utils.UriHelper.isPhoto
+import com.lassi.common.utils.UriHelper.isVideo
 import com.lassi.data.common.Response
 import com.lassi.data.media.MiItemMedia
 import com.lassi.data.media.MiMedia
@@ -42,13 +47,23 @@ import com.lassi.domain.media.MediaType
 import com.lassi.domain.media.MultiLangConfig
 import com.lassi.presentation.common.LassiBaseViewModelFragment
 import com.lassi.presentation.common.decoration.GridSpacingItemDecoration
+import com.lassi.presentation.cropper.BitmapUtils.decodeUriToBitmap
+import com.lassi.presentation.cropper.BitmapUtils.writeBitmapToUri
+import com.lassi.presentation.cropper.CropImageContract
+import com.lassi.presentation.cropper.CropImageContractOptions
+import com.lassi.presentation.cropper.CropImageOptions
+import com.lassi.presentation.cropper.CropImageView
 import com.lassi.presentation.media.MediaFragment
 import com.lassi.presentation.mediadirectory.adapter.FolderAdapter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
 
-class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMediaPickerBinding>() {
+class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMediaPickerBinding>(),
+    CropImageView.OnSetImageUriCompleteListener, CropImageView.OnCropImageCompleteListener {
 
     companion object {
         fun newInstance(): FolderFragment {
@@ -56,29 +71,92 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
         }
     }
 
-    var needsStorage = true
+    private val pickerTypes =
+        setOf(MediaType.PHOTO_PICKER, MediaType.VIDEO_PICKER, MediaType.PHOTO_VIDEO_PICKER)
+    private var needsStorage = true
 
-    private val photoPermission = mutableListOf(
-        Manifest.permission.READ_MEDIA_IMAGES
-    )
+    private val list = ArrayList<Uri>()
+    private var count = 0
+    private val croppedImages = ArrayList<MiMedia>()
 
-    private val photoPermissionAnd14 = mutableListOf(
-        Manifest.permission.READ_MEDIA_IMAGES,
-        Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-    )
+    private val cropImage = registerForActivityResult(CropImageContract()) { miMedia ->
 
-    private val vidPermission = mutableListOf(
-        Manifest.permission.READ_MEDIA_VIDEO
-    )
+        val mediaType = LassiConfig.getConfig().mediaType
+        if (miMedia != null) {
+            croppedImages.add(miMedia)
+            if (++count == list.size) {
+                /// called when all the cropping was done.
+                setResultOk(croppedImages)
+            } else {
+                lifecycleScope.launch {
+                    val isPhoto = withContext(Dispatchers.IO) {
+                        mediaType != MediaType.VIDEO_PICKER && (mediaType != MediaType.PHOTO_VIDEO_PICKER || list.subList(
+                            count, list.size
+                        ).any { uri ->
+                            val result = !isVideo(uri, requireContext().contentResolver)
+                            if (!result) {
+                                getMediaPathFromURI(requireContext(), uri)?.let {
+                                    croppedImages.add(MiMedia(path = it))
+                                }
+                                count++
+                            }
+                            result
+                        })
+                    }
+
+                    if (isPhoto) {
+                        withContext(Dispatchers.IO) {
+                            getMediaPathFromURI(requireContext(), list[count])?.let { path ->
+                                Uri.fromFile(File(path))?.let { uri ->
+                                    withContext(Dispatchers.Main) {
+                                        croppingOptions(uri)
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        // all the cropping was done
+                        setResultOk(croppedImages)
+                    }
+                }
+            }
+        } else {
 
-    private val vidPermissionAnd14 = mutableListOf(
-        Manifest.permission.READ_MEDIA_VIDEO,
-        Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
-    )
+            /// when user back from the cropping.
+            pickMedia(mediaType = LassiConfig.getConfig().mediaType, mediaPickerLauncher)
+        }
+    }
 
-    private val audioPermission = mutableListOf(
-        Manifest.permission.READ_MEDIA_AUDIO
-    )
+    private val photoPermissionAnd14 = buildList {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            add(Manifest.permission.READ_MEDIA_IMAGES)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                add(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
+            }
+            // You don't need to add READ_MEDIA_VISUAL_USER_SELECTED as it doesn't exist
+        } else {
+            add(Manifest.permission.READ_EXTERNAL_STORAGE) // For Android 12 and lower
+        }
+    }
+
+    private val vidPermissionAnd14 = buildList {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            add(Manifest.permission.READ_MEDIA_VIDEO)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                add(Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED)
+            }
+        } else {
+            add(Manifest.permission.READ_EXTERNAL_STORAGE) // For older versions
+        }
+    }
+
+    private val audioPermission = buildList {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            add(Manifest.permission.READ_MEDIA_AUDIO)
+        } else {
+            add(Manifest.permission.READ_EXTERNAL_STORAGE)
+        }
+    }
 
     private val permissionSettingResult =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -101,8 +179,12 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
     private val requestPhotoPickerPermission =
         registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { map ->
             // Specifically check for android.permission.READ_MEDIA_VISUAL_USER_SELECTED permission for Android 14 case
-            if (map[Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED] == true) {
+            if (map[Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED] == true && map[Manifest.permission.READ_MEDIA_IMAGES] == true) {
                 viewModel.addPhotoPickerDataInDatabase()
+            } else if (map[Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED] == true && map[Manifest.permission.READ_MEDIA_IMAGES] == false) {
+                viewModel.deleteMediaFilesFromDB()
+                viewModel.addPhotoPickerDataInDatabase()
+                pickMedia(mediaType = LassiConfig.getConfig().mediaType, mediaPickerLauncher)
             } else {
                 showPermissionDisableAlert()
             }
@@ -112,25 +194,105 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
      * Video picker in case of Android 14 will be handled here
      * Need to modifty for handling multp
      */
-    private val mediaPickerLauncher =
+
+    private val multiPicker =
         registerForActivityResult(ActivityResultContracts.PickMultipleVisualMedia()) { uris ->
-            if (uris.size > LassiConfig.getConfig().maxCount) {
-                ToastUtils.showToast(
-                    requireContext(), LassiConfig.getConfig().customLimitExceedingErrorMessage
-                )
-            } else {
-                if (uris.isNotEmpty()) {
-                    val mediaPaths = ArrayList(uris.mapNotNull { uri ->
-                        MiMedia(path = context?.let { getMediaPathFromURI(it, uri) })
-                    })
-                    Log.d("PhotoPicker", "!@# PHOTO-PICKER:: Media paths: $mediaPaths")
-                    setResultOk(mediaPaths)
-                } else {
-                    Log.d("PhotoPicker", "!@# PHOTO-PICKER:: No media selected")
+            updateMediaList(uris)
+        }
+
+    private val singlePicker =
+        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+            uri?.let { updateMediaList(listOf(it)) } ?: handleEmptySelection()
+        }
+
+    private fun updateMediaList(uris: List<Uri>) {
+        list.clear()
+        croppedImages.clear()
+        list.addAll(uris)
+        handleMediaPickerResult(uris)
+    }
+
+    private fun handleEmptySelection() {
+        Log.d("PhotoPicker", "!@# PHOTO-PICKER:: No media selected")
+        activity?.finish()
+    }
+
+    private fun handleMediaPickerResult(uris: List<Uri>) {
+        val config = LassiConfig.getConfig()
+        if (uris.isEmpty()) return handleEmptySelection()
+
+        if (uris.size > config.maxCount) {
+            ToastUtils.showToast(requireContext(), config.customLimitExceedingErrorMessage)
+            activity?.finish()
+            return
+        }
+
+        val mediaPaths = uris.mapNotNull { uri ->
+            getMediaPathFromURI(requireContext(), uri)?.let { MiMedia(path = it) }
+        }
+
+        val isPhoto = determineIfPhoto(uris, mediaPaths, config)
+
+        if (config.isCrop && isPhoto) {
+            cropMedia(mediaPaths)
+        } else {
+            handleCompressionAndResult(ArrayList(mediaPaths), config)
+        }
+    }
+
+    private fun determineIfPhoto(
+        uris: List<Uri>,
+        mediaPaths: List<MiMedia>,
+        config: LassiConfig,
+    ): Boolean {
+        val mediaType = config.mediaType
+        return mediaType != MediaType.VIDEO_PICKER && (mediaType != MediaType.PHOTO_VIDEO_PICKER || uris.any { uri ->
+            val isPhoto = !isVideo(uri, requireContext().contentResolver)
+            if (!isPhoto) croppedImages.add(mediaPaths[count++])
+            isPhoto
+        })
+    }
+
+    private fun cropMedia(mediaPaths: List<MiMedia>) {
+        mediaPaths[count].path?.let { path ->
+            Uri.fromFile(File(path))?.let { uri ->
+                croppingOptions(uri)
+            }
+        }
+    }
+
+    private fun handleCompressionAndResult(mediaPaths: ArrayList<MiMedia>, config: LassiConfig) {
+        if (config.compressionRatio != 0) {
+            compressMedia(mediaPaths, config)
+        } else {
+            Log.d("PhotoPicker", "!@# PHOTO-PICKER:: Media paths: $mediaPaths")
+            setResultOk(mediaPaths)
+        }
+    }
+
+    private fun compressMedia(mediaPaths: ArrayList<MiMedia>, config: LassiConfig) {
+        mediaPaths.forEachIndexed { index, miMedia ->
+            miMedia.path?.let { path ->
+                val uri = Uri.fromFile(File(path))
+                // Check if the media is a photo before compression
+                if (isPhoto(uri, requireContext().contentResolver)) {
+                    val compressFormat = getCompressFormatForUri(uri, requireContext())
+                    val newUri = writeBitmapToUri(
+                        requireContext(),
+                        decodeUriToBitmap(requireContext(), uri),
+                        compressQuality = config.compressionRatio,
+                        customOutputUri = null,
+                        compressFormat = compressFormat
+                    )
+                    mediaPaths[index] = miMedia.copy(path = newUri.path)
                 }
             }
-            activity?.finish()  // To finish host activity when user closes photo picker dialog
         }
+        setResultOk(mediaPaths)
+    }
+
+    private val mediaPickerLauncher =
+        if (LassiConfig.getConfig().isMultiPicker) multiPicker else singlePicker
 
     private fun setResultOk(selectedMedia: ArrayList<MiMedia>?) {
         val intent = Intent().apply {
@@ -220,7 +382,7 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
                     needsStorage = needsStorage && ActivityCompat.checkSelfPermission(
                         requireContext(), Manifest.permission.READ_MEDIA_IMAGES
                     ) != PackageManager.PERMISSION_GRANTED
-                    requestPermission.launch(photoPermission.toTypedArray())
+                    requestPermission.launch(photoPermissionAnd14.toTypedArray())
                 }
             } else if (LassiConfig.getConfig().mediaType == MediaType.VIDEO) {
                 Log.d("TAG", "!@# PHOTO-PICKER:: mediaType == MediaType.VIDEO")
@@ -234,16 +396,16 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
                     needsStorage = needsStorage && ActivityCompat.checkSelfPermission(
                         requireContext(), Manifest.permission.READ_MEDIA_VIDEO
                     ) != PackageManager.PERMISSION_GRANTED
-                    requestPermission.launch(vidPermission.toTypedArray())
+                    requestPermission.launch(vidPermissionAnd14.toTypedArray())
                 }
-            } else if (LassiConfig.getConfig().mediaType == MediaType.PHOTO_PICKER) {
+            } else if (LassiConfig.getConfig().mediaType in pickerTypes) {
                 Log.d("TAG", "!@# PHOTO-PICKER:: mediaType == MediaType.PHOTOPICKER")
                 needsStorage = needsStorage && ActivityCompat.checkSelfPermission(
                     requireContext(), Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
                 ) != PackageManager.PERMISSION_GRANTED
                 Log.d("TAG", "!@# PHOTO-PICKER:: PickVisualMedia.VideoOnly")
                 binding.progressBar.show()
-                mediaPickerLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageAndVideo))
+                pickMedia(mediaType = LassiConfig.getConfig().mediaType, mediaPickerLauncher)
             } else {
                 if (LassiConfig.getConfig().mediaType == MediaType.AUDIO) {
                     needsStorage = needsStorage && ActivityCompat.checkSelfPermission(
@@ -253,26 +415,26 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
                 }
             }
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            if (LassiConfig.getConfig().mediaType == MediaType.PHOTO_PICKER) {
+            if (LassiConfig.getConfig().mediaType in pickerTypes) {
                 needsStorage = needsStorage && ActivityCompat.checkSelfPermission(
                     requireContext(), Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
                 ) != PackageManager.PERMISSION_GRANTED
                 Log.d("TAG", "!@# PHOTO-PICKER:: PickVisualMedia.VideoOnly")
                 binding.progressBar.show()
-                mediaPickerLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageAndVideo))
+                pickMedia(mediaType = LassiConfig.getConfig().mediaType, mediaPickerLauncher)
             } else {
                 requestPermission.launch(
                     arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)
                 )
             }
         } else {
-            if (LassiConfig.getConfig().mediaType == MediaType.PHOTO_PICKER) {
+            if (LassiConfig.getConfig().mediaType in pickerTypes) {
                 needsStorage = needsStorage && ActivityCompat.checkSelfPermission(
                     requireContext(), Manifest.permission.READ_MEDIA_VISUAL_USER_SELECTED
                 ) != PackageManager.PERMISSION_GRANTED
                 Log.d("TAG", "!@# PHOTO-PICKER:: PickVisualMedia.VideoOnly")
                 binding.progressBar.show()
-                mediaPickerLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageAndVideo))
+                pickMedia(mediaType = LassiConfig.getConfig().mediaType, mediaPickerLauncher)
             } else {
                 requestPermission.launch(
                     arrayOf(
@@ -284,6 +446,22 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
         }
     }
 
+    private fun pickMedia(
+        mediaType: MediaType,
+        launcher: ActivityResultLauncher<PickVisualMediaRequest>,
+    ) {
+        val mediaTypeToPick = when (mediaType) {
+            MediaType.PHOTO_PICKER -> ActivityResultContracts.PickVisualMedia.ImageOnly
+            MediaType.VIDEO_PICKER -> ActivityResultContracts.PickVisualMedia.VideoOnly
+            MediaType.PHOTO_VIDEO_PICKER -> ActivityResultContracts.PickVisualMedia.ImageAndVideo
+            else -> null
+        }
+
+        if (mediaTypeToPick != null) {
+            launcher.launch(PickVisualMediaRequest(mediaTypeToPick))
+        }
+    }
+
     private fun getMediaPathFromURI(context: Context, uri: Uri): String? {
         val inputStream: InputStream? = context.contentResolver.openInputStream(uri)
         val fileName = getFileName(context.contentResolver, uri)
@@ -369,11 +547,8 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
 
     override fun onPrepareOptionsMenu(menu: Menu) {
         menu.findItem(R.id.menuCamera)?.isVisible =
-            if (LassiConfig.getConfig().mediaType == MediaType.IMAGE
-                || LassiConfig.getConfig().mediaType == MediaType.VIDEO
-            ) {
-                (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY
-                        || LassiConfig.getConfig().lassiOption == LassiOption.CAMERA)
+            if (LassiConfig.getConfig().mediaType == MediaType.IMAGE || LassiConfig.getConfig().mediaType == MediaType.VIDEO) {
+                (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY || LassiConfig.getConfig().lassiOption == LassiOption.CAMERA)
             } else {
                 false
             }
@@ -382,5 +557,50 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
     }
 
     override fun hasOptionMenu(): Boolean = true
+
+    private fun croppingOptions(
+        uri: Uri? = null, includeCamera: Boolean? = false, includeGallery: Boolean? = false,
+    ) {
+        // Start picker to get image for cropping and then use the image in cropping activity.
+        cropImage.launch(includeCamera?.let { includeCamera ->
+            includeGallery?.let { includeGallery ->
+                LassiConfig.getConfig().cropAspectRatio?.x?.let { x ->
+                    LassiConfig.getConfig().cropAspectRatio?.y?.let { y ->
+                        CropImageOptions(
+                            imageSourceIncludeCamera = includeCamera,
+                            imageSourceIncludeGallery = includeGallery,
+                            cropShape = LassiConfig.getConfig().cropType,
+                            showCropOverlay = true,
+                            guidelines = CropImageView.Guidelines.ON,
+                            multiTouchEnabled = false,
+                            aspectRatioX = x,
+                            aspectRatioY = y,
+                            fixAspectRatio = LassiConfig.getConfig().enableActualCircleCrop,
+                            outputCompressQuality = LassiConfig.getConfig().compressionRatio
+                        )
+                    }
+                }
+            }
+        }?.let {
+            CropImageContractOptions(
+                uri = uri,
+                cropImageOptions = it,
+            )
+        })
+    }
+
+    override fun onSetImageUriComplete(view: CropImageView, uri: Uri, error: Exception?) {
+        if (error != null) {
+            Toast.makeText(activity, "Image load failed: " + error.message, Toast.LENGTH_LONG)
+                .show()
+        }
+    }
+
+    override fun onCropImageComplete(view: CropImageView, result: CropImageView.CropResult) {
+        if (result.error != null) {
+            Toast.makeText(activity, "Crop failed: ${result.error.message}", Toast.LENGTH_SHORT)
+                .show()
+        }
+    }
 }
 
diff --git a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderViewModel.kt b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderViewModel.kt
index c56cbf4..c7aa113 100644
--- a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderViewModel.kt
+++ b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderViewModel.kt
@@ -20,7 +20,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class FolderViewModel(
-    private val mediaRepository: MediaRepository
+    private val mediaRepository: MediaRepository,
 ) : LassiBaseViewModel() {
     private var _fetchMediaFolderLiveData = SingleLiveEvent<Response<ArrayList<MiItemMedia>>>()
     var fetchMediaFolderLiveData: LiveData<Response<ArrayList<MiItemMedia>>> =
@@ -74,9 +74,11 @@ class FolderViewModel(
             is Result.Loading -> {
                 this._fetchMediaFolderLiveData.setLoading()
             }
+
             is Result.Success -> {
                 getDataFromDatabase()
             }
+
             is Result.Error -> {
                 this._fetchMediaFolderLiveData.setError(result.throwable)
             }
@@ -88,10 +90,12 @@ class FolderViewModel(
             is Result.Loading -> {
                 this._fetchMediaFolderLiveData.setLoading()
             }
+
             is Result.Success -> {
-                Logger.d("FolderViewModel", "Insert completed")
+                Logger.d("FolderViewModel", "Insert completed-->>>${result.data}")
                 getDataFromDatabase()
             }
+
             is Result.Error -> {
                 this._fetchMediaFolderLiveData.setError(result.throwable)
             }
@@ -111,13 +115,19 @@ class FolderViewModel(
                 val mediaItemList = (result as Result.Success).data.filter {
                     !it.bucketName.isNullOrEmpty()
                 } as ArrayList<MiItemMedia>
-                list.postValue(mediaItemList as ArrayList<MiItemMedia>)
+                list.postValue(mediaItemList)
                 if (mediaItemList.isEmpty()) {
                     emptyList.postValue(true)
                 }
             }
     }
 
+    fun deleteMediaFilesFromDB() {
+        viewModelScope.launch {
+            mediaRepository.deleteMediaFiles()
+        }
+    }
+
     private suspend fun getAllPhotoVidDataFromDatabase() {
         mediaRepository.getAllImgVidMediaFile()
             .takeWhile { it is Result.Success }
diff --git a/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt b/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt
index f099920..dcb577e 100644
--- a/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt
+++ b/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt
@@ -3,7 +3,7 @@ package com.lassi.presentation.mediadirectory
 import android.app.Activity
 import android.content.Intent
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
+import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -25,6 +25,7 @@ import com.lassi.common.utils.FilePickerUtils.getFilePathFromUri
 import com.lassi.common.utils.KeyUtils
 import com.lassi.common.utils.Logger
 import com.lassi.common.utils.ToastUtils
+import com.lassi.common.utils.UriHelper.getCompressFormatForUri
 import com.lassi.data.media.MiMedia
 import com.lassi.databinding.ActivityMediaPickerBinding
 import com.lassi.domain.common.SafeObserver
@@ -34,35 +35,55 @@ import com.lassi.domain.media.MediaType
 import com.lassi.domain.media.MultiLangConfig
 import com.lassi.presentation.camera.CameraFragment
 import com.lassi.presentation.common.LassiBaseViewModelActivity
+import com.lassi.presentation.cropper.BitmapUtils.decodeUriToBitmap
+import com.lassi.presentation.cropper.BitmapUtils.writeBitmapToUri
+import com.lassi.presentation.cropper.CropImageContract
+import com.lassi.presentation.cropper.CropImageContractOptions
+import com.lassi.presentation.cropper.CropImageOptions
+import com.lassi.presentation.cropper.CropImageView
 import com.lassi.presentation.docs.DocsFragment
 import com.lassi.presentation.media.SelectedMediaViewModel
 import com.livefront.bridge.Bridge
 import com.livefront.bridge.SavedStateHandler
-import io.reactivex.annotations.NonNull
-import io.reactivex.annotations.Nullable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.io.File
 
 class LassiMediaPickerActivity :
     LassiBaseViewModelActivity<SelectedMediaViewModel, ActivityMediaPickerBinding>() {
     private var menuDone: MenuItem? = null
     private var menuCamera: MenuItem? = null
     private var menuSort: MenuItem? = null
+    private var croppedMediaList: ArrayList<MiMedia> = ArrayList()
+    private val config = LassiConfig.getConfig()
+
+    private val cropImage = registerForActivityResult(CropImageContract()) { miMedia ->
+        miMedia?.let {
+            croppedMediaList.add(miMedia)
+            if (croppedMediaList.size == config.selectedMedias.size) {
+                setResultOk(croppedMediaList)
+            } else {
+                val nextMediaIndex = croppedMediaList.size
+                val uri = Uri.fromFile(config.selectedMedias[nextMediaIndex].path?.let { File(it) })
+                uri?.let { croppingOptions(uri = uri) }
+            }
+        }
+    }
 
     private val getContent =
         registerForActivityResult(ActivityResultContracts.OpenMultipleDocuments()) { uri ->
             uri?.let { uris ->
-                if (LassiConfig.getConfig().mediaType == MediaType.FILE_TYPE_WITH_SYSTEM_VIEW && uris.size > LassiConfig.getConfig().maxCount) {
+                if (config.mediaType == MediaType.FILE_TYPE_WITH_SYSTEM_VIEW && uris.size > config.maxCount) {
                     ToastUtils.showToast(
                         this@LassiMediaPickerActivity,
-                        LassiConfig.getConfig().customLimitExceedingErrorMessage
+                        config.customLimitExceedingErrorMessage
                     )
                     finish()
                 } else {
                     binding.progressBar.indeterminateDrawable.colorFilter =
                         BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-                            LassiConfig.getConfig().progressBarColor, BlendModeCompat.SRC_ATOP
+                            config.progressBarColor, BlendModeCompat.SRC_ATOP
                         )
                     binding.progressBar.show()
 
@@ -73,7 +94,8 @@ class LassiMediaPickerActivity :
                                     name = getFileName(uri)
                                     doesUri = false
                                     fileSize = getFileSize(uri)
-                                    path = getFilePathFromUri(this@LassiMediaPickerActivity, uri, true)
+                                    path =
+                                        getFilePathFromUri(this@LassiMediaPickerActivity, uri, true)
                                     Log.d("TAG", "!@# SLOWER MEDIA ITEM: $name")
                                 }
                             } as ArrayList<MiMedia>
@@ -105,14 +127,15 @@ class LassiMediaPickerActivity :
 
     override fun initViews() {
         super.initViews()
+        config.selectedMedias.clear()
         Bridge.initialize(applicationContext, object : SavedStateHandler {
-            override fun saveInstanceState(@NonNull target: Any, @NonNull state: Bundle) {
+            override fun saveInstanceState(target: Any, state: Bundle) {
             }
 
-            override fun restoreInstanceState(@NonNull target: Any, @Nullable state: Bundle?) {
+            override fun restoreInstanceState(target: Any, state: Bundle?) {
             }
         })
-        setToolbarTitle(LassiConfig.getConfig().selectedMedias)
+        setToolbarTitle(config.selectedMedias)
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setThemeAttributes()
@@ -120,12 +143,12 @@ class LassiMediaPickerActivity :
     }
 
     private fun setToolbarTitle(selectedMedias: ArrayList<MiMedia>) {
-        val maxCount = LassiConfig.getConfig().maxCount
+        val maxCount = config.maxCount
         if (maxCount > 1) {
             binding.toolbar.title = String.format(
                 getString(R.string.selected_items),
-                selectedMedias.size,
-                maxCount
+                selectedMedias.size.toString(),
+                maxCount.toString()
             )
         } else {
             binding.toolbar.title = ""
@@ -133,7 +156,7 @@ class LassiMediaPickerActivity :
     }
 
     private fun initiateFragment() {
-        if (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA) {
+        if (config.lassiOption == LassiOption.CAMERA) {
             supportFragmentManager.beginTransaction()
                 .replace(
                     R.id.ftContainer,
@@ -141,7 +164,7 @@ class LassiMediaPickerActivity :
                 )
                 .commitAllowingStateLoss()
         } else {
-            LassiConfig.getConfig().mediaType.let { mediaType ->
+            config.mediaType.let { mediaType ->
                 when (mediaType) {
                     MediaType.DOC -> {
                         supportFragmentManager.beginTransaction()
@@ -171,7 +194,7 @@ class LassiMediaPickerActivity :
 
     private fun browseFile() {
         val mimeTypesList = ArrayList<String>()
-        LassiConfig.getConfig().supportedFileType.forEach { mimeType ->
+        config.supportedFileType.forEach { mimeType ->
             MimeTypeMap
                 .getSingleton()
                 .getMimeTypeFromExtension(mimeType)?.let {
@@ -184,7 +207,7 @@ class LassiMediaPickerActivity :
     }
 
     private fun setThemeAttributes() {
-        with(LassiConfig.getConfig()) {
+        with(config) {
             binding.toolbar.background =
                 ColorDrawable(toolbarColor)
             binding.toolbar.setTitleTextColor(toolbarResourceColor)
@@ -195,10 +218,8 @@ class LassiMediaPickerActivity :
                     toolbarResourceColor
                 )
             )
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-                window.statusBarColor = statusBarColor
-            }
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+            window.statusBarColor = statusBarColor
         }
     }
 
@@ -210,29 +231,27 @@ class LassiMediaPickerActivity :
         menuDone?.isVisible = false
         menuCamera?.isVisible = false
         menuSort?.isVisible = true
-
-        menuDone?.icon = changeIconColor(
-            this@LassiMediaPickerActivity,
-            R.drawable.ic_done_white,
-            LassiConfig.getConfig().toolbarResourceColor
-        )
-        menuCamera?.icon = changeIconColor(
-            this@LassiMediaPickerActivity,
-            R.drawable.ic_camera_white,
-            LassiConfig.getConfig().toolbarResourceColor
-        )
-        menuSort?.icon = changeIconColor(
-            this@LassiMediaPickerActivity,
-            R.drawable.ic_sorting_foreground,
-            LassiConfig.getConfig().toolbarResourceColor
-        )
-        return super.onCreateOptionsMenu(menu)
+        with(config) {
+            menuDone?.icon = changeIconColor(
+                this@LassiMediaPickerActivity,
+                R.drawable.ic_done_white, toolbarResourceColor
+            )
+            menuCamera?.icon = changeIconColor(
+                this@LassiMediaPickerActivity,
+                R.drawable.ic_camera_white, toolbarResourceColor
+            )
+            menuSort?.icon = changeIconColor(
+                this@LassiMediaPickerActivity,
+                R.drawable.ic_sorting_foreground, toolbarResourceColor
+            )
+            return super.onCreateOptionsMenu(menu)
+        }
     }
 
     override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
         menuCamera?.isVisible =
-            (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA ||
-                    LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY)
+            (config.lassiOption == LassiOption.CAMERA ||
+                    config.lassiOption == LassiOption.CAMERA_AND_GALLERY)
         menuDone?.isVisible = !viewModel.selectedMediaLiveData.value.isNullOrEmpty()
         return super.onPrepareOptionsMenu(menu)
     }
@@ -241,25 +260,59 @@ class LassiMediaPickerActivity :
         when (item.itemId) {
             R.id.menuCamera -> initCamera()
             R.id.menuDone -> setSelectedMediaResult()
-            android.R.id.home -> onBackPressed()
+            android.R.id.home -> onBackPressedDispatcher.onBackPressed()
         }
         return super.onOptionsItemSelected(item)
     }
 
     private fun setSelectedMediaResult() {
         // Allow crop for single image
-        when (LassiConfig.getConfig().mediaType) {
-            MediaType.IMAGE, MediaType.VIDEO, MediaType.AUDIO, MediaType.DOC -> {
-                setResultOk(viewModel.selectedMediaLiveData.value)
+        config.apply {
+            when (mediaType) {
+                MediaType.IMAGE, MediaType.VIDEO, MediaType.AUDIO, MediaType.DOC -> {
+                    if (mediaType == MediaType.IMAGE && isCrop) {
+                        val uri = Uri.fromFile(selectedMedias.first().path?.let { File(it) })
+                        uri?.let {
+                            croppingOptions(uri = uri)
+                        }
+                    } else {
+                        viewModel.selectedMediaLiveData.value?.let {
+                            if (MediaType.IMAGE == mediaType && compressionRatio != 0) {
+                                compressMedia(it)
+                            } else {
+                                setResultOk(it)
+                            }
+                        }
+                    }
+                }
+
+                else -> {
+                }
             }
+        }
+    }
 
-            else -> {
+    fun compressMedia(mediaPaths: ArrayList<MiMedia>) {
+        mediaPaths.forEachIndexed { index, miMedia ->
+            miMedia.path?.let { path ->
+                val uri = Uri.fromFile(File(path))
+                val compressFormat = getCompressFormatForUri(uri, this)
+                val newUri = writeBitmapToUri(
+                    this,
+                    decodeUriToBitmap(this, uri),
+                    compressQuality = config.compressionRatio,
+                    customOutputUri = null,
+                    compressFormat = compressFormat
+                )
+                mediaPaths[index] = miMedia.copy(path = newUri.path)
             }
         }
+        setResultOk(mediaPaths)
     }
 
+
     private fun initCamera() {
-        if (viewModel.selectedMediaLiveData.value?.size == LassiConfig.getConfig().maxCount) {
+        if (viewModel.selectedMediaLiveData.value?.size == config.maxCount) {
             ToastUtils.showToast(this, MultiLangConfig.getConfig().alreadySelectedMaxItems)
         } else {
             supportFragmentManager.beginTransaction()
@@ -271,7 +324,7 @@ class LassiMediaPickerActivity :
 
     private fun handleSelectedMedia(selectedMedias: ArrayList<MiMedia>) {
         setToolbarTitle(selectedMedias)
-        menuDone?.isVisible = !selectedMedias.isNullOrEmpty()
+        menuDone?.isVisible = selectedMedias.isNotEmpty()
     }
 
     private fun setResultOk(selectedMedia: ArrayList<MiMedia>?) {
@@ -282,7 +335,39 @@ class LassiMediaPickerActivity :
             "LASSI",
             "!@# LassiMediaPickerActivity selectedMedia size 417 => ${selectedMedia?.size}"
         )
+        config.selectedMedias.clear()
         setResult(Activity.RESULT_OK, intent)
         finish()
     }
+
+    private fun croppingOptions(
+        uri: Uri? = null, includeCamera: Boolean? = false, includeGallery: Boolean? = false,
+    ) {
+        // Start picker to get image for cropping and then use the image in cropping activity.
+        cropImage.launch(includeCamera?.let {
+            includeGallery?.let { includeGallery ->
+                config.cropAspectRatio?.x?.let { x ->
+                    config.cropAspectRatio?.y?.let { y ->
+                        CropImageOptions(
+                            imageSourceIncludeCamera = includeCamera,
+                            imageSourceIncludeGallery = includeGallery,
+                            cropShape = config.cropType,
+                            showCropOverlay = true,
+                            guidelines = CropImageView.Guidelines.ON,
+                            multiTouchEnabled = false,
+                            aspectRatioX = x,
+                            aspectRatioY = y,
+                            fixAspectRatio = config.enableActualCircleCrop,
+                            outputCompressQuality = LassiConfig.getConfig().compressionRatio
+                        )
+                    }
+                }
+            }
+        }?.let {
+            CropImageContractOptions(
+                uri = uri,
+                cropImageOptions = it,
+            )
+        })
+    }
 }