Merge pull request #2 from Mindinventory/develop

Improvise single media selection and added Flip and Rotate image option

Author: akashmi

README.md

@@ -41,7 +41,7 @@ Lassi is simplest way to pick media (either image or video)
     ```groovy
         dependencies {
             ...
-            implementation 'com.github.Mindinventory:Lassi:0.0.3'
+            implementation 'com.github.Mindinventory:Lassi:0.0.4'
         }
     ``` 
 
@@ -69,6 +69,8 @@ Lassi is simplest way to pick media (either image or video)
                 .setErrorDrawable(R.drawable.ic_image_placeholder)
                 .setCropType(CropImageView.CropShape.RECTANGLE) // choose shape for cropping after capturing an image from camera (for MediaType.IMAGE only)
                 .setCropAspectRatio(1, 1) // define crop aspect ratio for cropping after capturing an image from camera (for MediaType.IMAGE only)
+                .enableFlip(true) // Enable flip image option while image cropping (for MediaType.IMAGE only)
+                .enableRotate(true) // Enable rotate image option while image cropping (for MediaType.IMAGE only)
                 .build()
             startActivityForResult(intent, MEDIA_REQUEST_CODE)
     ```
@@ -107,7 +109,7 @@ Lassi is simplest way to pick media (either image or video)
 
 # LICENSE!
 
-MiMediaPicker is [MIT-licensed](/LICENSE).
+Lassi is [MIT-licensed](/LICENSE).
 
 # Let us know!
 We’d be really happy if you send us links to your projects where you use our component. Just send an email to sales@mindinventory.com And do let us know if you have any questions or suggestion regarding our work.

app/src/main/java/com/lassi/app/MainActivity.kt

@@ -34,7 +34,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
             R.id.btnImagePicker -> {
                 val intent = Lassi(this)
                     .with(LassiOption.CAMERA_AND_GALLERY)
-                    .setMaxCount(1)
+                    .setMaxCount(4)
                     .setGridSize(2)
                     .setPlaceHolder(R.drawable.ic_image_placeholder)
                     .setErrorDrawable(R.drawable.ic_image_placeholder)
@@ -45,14 +45,16 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                     .setCropType(CropImageView.CropShape.OVAL)
                     .setCropAspectRatio(1, 1)
                     .setSupportedFileTypes("jpg", "jpeg", "png", "webp", "gif")
+                    .enableFlip(true)
+                    .enableRotate(true)
                     .build()
                 startActivityForResult(intent, MEDIA_REQUEST_CODE)
 
             }
             R.id.btnVideoPicker -> {
                 val intent = Lassi(this)
                     .with(LassiOption.CAMERA_AND_GALLERY)
-                    .setMaxCount(1)
+                    .setMaxCount(4)
                     .setGridSize(3)
                     .setMinTime(15)
                     .setMaxTime(30)

lassi/build.gradle

@@ -13,7 +13,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 28
         versionCode 1
-        versionName "0.0.3"
+        versionName "0.0.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

lassi/src/main/java/com/lassi/common/utils/CropUtils.kt

@@ -8,15 +8,18 @@ import com.lassi.presentation.cropper.CropImageView
 
 object CropUtils {
     fun beginCrop(activity: FragmentActivity, source: Uri) {
-        val lassiConfig = LassiConfig.getConfig()
-        CropImage.activity(source)
-            .setGuidelines(CropImageView.Guidelines.ON)
-            .setAllowFlipping(false)
-            .setAllowRotation(false)
-            .setOutputCompressQuality(70)
-            .setCropShape(lassiConfig.cropType)
-            .setAspectRatio(lassiConfig.cropAspectRatio)
-            .setOutputUri(source)
-            .start(activity)
+        with(LassiConfig.getConfig()) {
+            CropImage.activity(source)
+                .setGuidelines(CropImageView.Guidelines.ON)
+                .setAllowFlipping(false)
+                .setAllowRotation(false)
+                .setOutputCompressQuality(70)
+                .setCropShape(cropType)
+                .setAspectRatio(cropAspectRatio)
+                .setOutputUri(source)
+                .setAllowRotation(enableRotateImage)
+                .setAllowFlipping(enableFlipImage)
+                .start(activity)
+        }
     }
 }

lassi/src/main/java/com/lassi/domain/media/LassiConfig.kt

@@ -27,7 +27,9 @@ data class LassiConfig(
     var maxTime: Long = KeyUtils.DEFAULT_VIDEO_DURATION,
     var cropType: CropImageView.CropShape = CropImageView.CropShape.RECTANGLE,
     var supportedFileType: MutableList<String> = mutableListOf(),
-    var cropAspectRatio: AspectRatio = AspectRatio.of(1, 1)
+    var cropAspectRatio: AspectRatio = AspectRatio.of(1, 1),
+    var enableFlipImage: Boolean = false,
+    var enableRotateImage: Boolean = false
 ) : Parcelable {
     companion object {
 
@@ -51,6 +53,8 @@ data class LassiConfig(
                 cropType = lassiConfig.cropType
                 supportedFileType = lassiConfig.supportedFileType
                 cropAspectRatio = lassiConfig.cropAspectRatio
+                enableFlipImage = lassiConfig.enableFlipImage
+                enableRotateImage = lassiConfig.enableRotateImage
             }
         }
 

lassi/src/main/java/com/lassi/presentation/builder/Lassi.kt

@@ -142,6 +142,22 @@ class Lassi(private val context: Context) {
         return this
     }
 
+    /**
+     * Enable flip image option while image cropping
+     */
+    fun enableFlip(enableFlipImage: Boolean): Lassi {
+        lassiConfig.enableFlipImage = enableFlipImage
+        return this
+    }
+
+    /**
+     * Enable rotate image option while image cropping
+     */
+    fun enableRotate(enableRotateImage: Boolean): Lassi {
+        lassiConfig.enableRotateImage = enableRotateImage
+        return this
+    }
+
     /**
      * Start LassiMediaPickerActivity with config
      */

lassi/src/main/java/com/lassi/presentation/cropper/CropImageActivity.kt

@@ -26,7 +26,6 @@ import com.lassi.data.media.MiMedia
 import com.lassi.domain.media.LassiConfig
 import com.lassi.presentation.mediadirectory.LassiMediaPickerActivity
 import kotlinx.android.synthetic.main.crop_image_activity.*
-import kotlinx.android.synthetic.main.toolbar.*
 import java.io.File
 import java.io.IOException
 

lassi/src/main/java/com/lassi/presentation/media/MediaFragment.kt

@@ -1,20 +1,25 @@
 package com.lassi.presentation.media
 
 import android.graphics.PorterDuff
+import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.GridLayoutManager
 import com.lassi.R
 import com.lassi.common.utils.ColorUtils
+import com.lassi.common.utils.CropUtils
 import com.lassi.common.utils.KeyUtils.SELECTED_FOLDER
 import com.lassi.data.media.MiMedia
 import com.lassi.data.mediadirectory.Folder
 import com.lassi.domain.media.LassiConfig
+import com.lassi.domain.media.MediaType
 import com.lassi.presentation.common.LassiBaseViewModelFragment
 import com.lassi.presentation.common.decoration.GridSpacingItemDecoration
 import com.lassi.presentation.media.adapter.MediaAdapter
+import com.lassi.presentation.videopreview.VideoPreviewActivity
 import kotlinx.android.synthetic.main.fragment_media_picker.*
+import java.io.File
 
 class MediaFragment : LassiBaseViewModelFragment<SelectedMediaViewModel>() {
     private val mediaAdapter by lazy { MediaAdapter(this::onItemClick) }
@@ -65,7 +70,19 @@ class MediaFragment : LassiBaseViewModelFragment<SelectedMediaViewModel>() {
     }
 
     private fun onItemClick(selectedMedias: ArrayList<MiMedia>) {
-        viewModel.addAllSelectedMedia(selectedMedias)
+        if (LassiConfig.getConfig().maxCount > 1) {
+            viewModel.addAllSelectedMedia(selectedMedias)
+        } else {
+            if (LassiConfig.getConfig().mediaType == MediaType.IMAGE) {
+                val uri = Uri.fromFile(File(selectedMedias[0].path))
+                CropUtils.beginCrop(requireActivity(), uri)
+            } else {
+                VideoPreviewActivity.startVideoPreview(
+                    activity,
+                    selectedMedias[0].path!!
+                )
+            }
+        }
     }
 
     override fun onPrepareOptionsMenu(menu: Menu) {

lassi/src/main/java/com/lassi/presentation/media/adapter/MediaAdapter.kt

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.item_media.*
 import java.util.*
 
 class MediaAdapter(
-    private val onImageClick: (selectedMedias: ArrayList<MiMedia>) -> Unit
+    private val onItemClick: (selectedMedias: ArrayList<MiMedia>) -> Unit
 ) : RecyclerView.Adapter<MediaAdapter.MyViewHolder>() {
     private val logTag = MediaAdapter::class.java.simpleName
     private val images = ArrayList<MiMedia>()
@@ -74,13 +74,23 @@ class MediaAdapter(
                 }
 
                 containerView.setOnClickListener {
-                    isSelect = !isSelect
-                    if (!isSelect) {
-                        removeSelected(miMedia, adapterPosition)
+                    if (LassiConfig.getConfig().maxCount > 1) {
+                        isSelect = !isSelect
+                        if (!isSelect) {
+                            removeSelected(miMedia, adapterPosition)
+                        } else {
+                            addSelected(miMedia, adapterPosition)
+                        }
                     } else {
-                        addSelected(miMedia, adapterPosition)
+                        with(LassiConfig.getConfig()) {
+                            if (selectedMedias.size != maxCount) {
+                                selectedMedias.add(0, miMedia)
+                            } else {
+                                selectedMedias[0] = miMedia
+                            }
+                        }
                     }
-                    onImageClick(LassiConfig.getConfig().selectedMedias)
+                    onItemClick(LassiConfig.getConfig().selectedMedias)
                 }
             }
         }

lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt

@@ -25,7 +25,7 @@ import com.lassi.presentation.common.LassiBaseViewModelActivity
 import com.lassi.presentation.cropper.CropImage
 import com.lassi.presentation.media.SelectedMediaViewModel
 import com.lassi.presentation.videopreview.VideoPreviewActivity
-import kotlinx.android.synthetic.main.toolbar.*
+import kotlinx.android.synthetic.main.activity_media_picker.*
 import java.io.File
 
 class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewModel>() {
@@ -51,20 +51,26 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
 
     override fun initViews() {
         super.initViews()
-        with(LassiConfig.getConfig()) {
-            toolbar.title =
-                String.format(
-                    getString(R.string.selected_items),
-                    selectedMedias.size,
-                    maxCount
-                )
-        }
+        setToolbarTitle(LassiConfig.getConfig().selectedMedias)
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         setThemeAttributes()
         initiateFragment()
     }
 
+    private fun setToolbarTitle(selectedMedias: ArrayList<MiMedia>) {
+        val maxCount = LassiConfig.getConfig().maxCount
+        if (maxCount > 1) {
+            toolbar.title = String.format(
+                getString(R.string.selected_items),
+                selectedMedias.size,
+                maxCount
+            )
+        } else {
+            toolbar.title = ""
+        }
+    }
+
     private fun initiateFragment() {
         if (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA) {
             supportFragmentManager.beginTransaction()
@@ -165,11 +171,7 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
     }
 
     private fun handleSelectedMedia(selectedMedias: ArrayList<MiMedia>) {
-        toolbar.title = String.format(
-            getString(R.string.selected_items),
-            selectedMedias.size,
-            LassiConfig.getConfig().maxCount
-        )
+        setToolbarTitle(selectedMedias)
         menuDone?.isVisible = !selectedMedias.isNullOrEmpty()
     }