Develop (#69)

- Added option to use media from Gallery only.

Co-authored-by: AKASH PATEL <[email protected]>

Author: sanjay-mi

README.md

@@ -64,7 +64,7 @@ Lassi is simplest way to pick media (either image, video, audio or doc)
     
     ```kotlin
             val intent = Lassi(this)
-                .with(LassiOption.CAMERA_AND_GALLERY) // choose Option CAMERA or CAMERA_AND_GALLERY
+                .with(LassiOption.CAMERA_AND_GALLERY) // choose Option CAMERA, GALLERY or CAMERA_AND_GALLERY
                 .setMaxCount(5)
                 .setGridSize(3)
                 .setMediaType(MediaType.VIDEO) // MediaType : VIDEO IMAGE, AUDIO OR DOC

app/build.gradle

@@ -45,9 +45,8 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
 
-    // glide
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    kapt 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation 'com.github.bumptech.glide:glide:4.13.2'
+    kapt 'com.github.bumptech.glide:compiler:4.13.2'
 
     implementation "androidx.multidex:multidex:2.0.1"
 

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()

lassi/build.gradle

@@ -64,8 +64,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.6.1'
 
     // glide
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    kapt 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation 'com.github.bumptech.glide:glide:4.13.2'
+    kapt 'com.github.bumptech.glide:compiler:4.13.2'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
 
     implementation "androidx.activity:activity-ktx:1.4.0"
@@ -74,15 +74,15 @@ dependencies {
     implementation "androidx.multidex:multidex:2.0.1"
 
     // Room DB
-    implementation 'androidx.room:room-runtime:2.4.2'
-    kapt 'androidx.room:room-compiler:2.4.2'
-    implementation 'androidx.room:room-ktx:2.4.2'
+    implementation 'androidx.room:room-runtime:2.4.3'
+    kapt 'androidx.room:room-compiler:2.4.3'
+    implementation 'androidx.room:room-ktx:2.4.3'
 
     //Coroutine
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
 
     //Gson
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
 }
 repositories {
     mavenCentral()

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

@@ -2,5 +2,6 @@ package com.lassi.domain.media
 
 enum class LassiOption {
     CAMERA,
+    GALLERY,
     CAMERA_AND_GALLERY
 }

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

@@ -19,7 +19,6 @@ import com.lassi.R
 import com.lassi.common.extenstions.hide
 import com.lassi.common.extenstions.safeObserve
 import com.lassi.common.extenstions.show
-import com.lassi.common.utils.Logger
 import com.lassi.data.common.Response
 import com.lassi.data.media.MiItemMedia
 import com.lassi.domain.media.LassiConfig
@@ -161,7 +160,7 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel>() {
             if (LassiConfig.getConfig().mediaType == MediaType.IMAGE
                 || LassiConfig.getConfig().mediaType == MediaType.VIDEO
             ) {
-                (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY)
+                (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY || LassiConfig.getConfig().lassiOption == LassiOption.CAMERA)
             } else {
                 false
             }

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

@@ -179,6 +179,7 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
         menuDone = menu.findItem(R.id.menuDone)
         menuCamera = menu.findItem(R.id.menuCamera)
         menuDone?.isVisible = false
+        menuCamera?.isVisible = false
 
         menuDone?.icon = changeIconColor(
             this@LassiMediaPickerActivity,
@@ -194,6 +195,8 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
     }
 
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
+        menuCamera?.isVisible =
+            (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA || LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY)
         menuDone?.isVisible = !viewModel.selectedMediaLiveData.value.isNullOrEmpty()
         return super.onPrepareOptionsMenu(menu)
     }
@@ -228,6 +231,8 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
                     setResultOk(viewModel.selectedMediaLiveData.value)
                 }
             }
+            else -> {
+            }
         }
     }
 
@@ -260,7 +265,7 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
                     LassiConfig.getConfig().selectedMedias.addAll(selectedMedia)
                     viewModel.addAllSelectedMedia(selectedMedia)
                     folderViewModel.checkInsert()
-                    if (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY) {
+                    if (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY || LassiConfig.getConfig().lassiOption == LassiOption.GALLERY) {
                         supportFragmentManager.popBackStack()
                     }
                 } else if (data.hasExtra(KeyUtils.MEDIA_PREVIEW)) {
@@ -271,7 +276,7 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
                         LassiConfig.getConfig().selectedMedias.add(selectedMedia!!)
                         viewModel.addSelectedMedia(selectedMedia)
                         folderViewModel.checkInsert()
-                        if (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY) {
+                        if (LassiConfig.getConfig().lassiOption == LassiOption.CAMERA_AND_GALLERY || LassiConfig.getConfig().lassiOption == LassiOption.GALLERY) {
                             supportFragmentManager.popBackStack()
                         }
                     }