Develop (#67)

Allow setting background color from lassi builder.

Author: sanjay-mi

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

@@ -56,6 +56,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                     .setToolbarColor(R.color.colorPrimary)
                     .setToolbarResourceColor(android.R.color.white)
                     .setProgressBarColor(R.color.colorAccent)
+                    .setGalleryBackgroundColor(R.color.colorGrey)
                     .setCropType(CropImageView.CropShape.OVAL)
                     .setCropAspectRatio(1, 1)
                     .setCompressionRation(10)
@@ -83,6 +84,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                     .setToolbarColor(R.color.colorPrimary)
                     .setToolbarResourceColor(android.R.color.white)
                     .setProgressBarColor(R.color.colorAccent)
+                    .setGalleryBackgroundColor(R.color.colorGrey)
                     .setPlaceHolder(R.drawable.ic_video_placeholder)
                     .setErrorDrawable(R.drawable.ic_video_placeholder)
                     .setSelectionDrawable(R.drawable.ic_checked_media)
@@ -103,6 +105,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                     .setToolbarColor(R.color.colorPrimary)
                     .setToolbarResourceColor(android.R.color.white)
                     .setProgressBarColor(R.color.colorAccent)
+                    .setGalleryBackgroundColor(R.color.colorGrey)
                     .build()
                 receiveData.launch(intent)
             }
@@ -153,6 +156,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
             .setStatusBarColor(R.color.colorPrimaryDark)
             .setToolbarColor(R.color.colorPrimary)
             .setToolbarResourceColor(android.R.color.white)
+            .setGalleryBackgroundColor(R.color.colorGrey)
             .setSupportedFileTypes(
                 "pdf",
                 "odt",
@@ -176,7 +180,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
             if (it.resultCode == Activity.RESULT_OK) {
                 val selectedMedia =
                     it.data?.getSerializableExtra(KeyUtils.SELECTED_MEDIA) as ArrayList<MiMedia>
-                if (!selectedMedia.isNullOrEmpty()) {
+                if (selectedMedia.isNotEmpty()) {
                     ivEmpty.isVisible = selectedMedia.isEmpty()
                     selectedMediaAdapter.setList(selectedMedia)
                 }

lassi/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 32
-        versionCode 22
-        versionName "1.0.0"
+        versionCode 23
+        versionName "1.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -47,9 +47,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation "androidx.recyclerview:recyclerview:1.2.1"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -61,7 +61,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
 
     // Google material
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.1'
 
     // glide
     implementation 'com.github.bumptech.glide:glide:4.12.0'
@@ -79,10 +79,10 @@ dependencies {
     implementation 'androidx.room:room-ktx:2.4.2'
 
     //Coroutine
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
 
     //Gson
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.9.0'
 }
 repositories {
     mavenCentral()

lassi/src/main/java/com/lassi/common/extenstions/ImageViewExts.kt

@@ -3,13 +3,16 @@ package com.lassi.common.extenstions
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.bumptech.glide.request.transition.DrawableCrossFadeFactory
 import com.lassi.domain.media.LassiConfig
 
+
 fun ImageView.loadImage(source: String?) {
+    val factory = DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build()
     Glide.with(context)
         .load(source ?: "")
         .error(LassiConfig.getConfig().errorDrawable)
         .placeholder(LassiConfig.getConfig().placeHolder)
-        .transition(DrawableTransitionOptions.withCrossFade())
+        .transition(DrawableTransitionOptions.withCrossFade(factory))
         .into(this)
 }

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

@@ -16,6 +16,7 @@ data class LassiConfig(
     var statusBarColor: Int = Color.BLACK,
     var toolbarResourceColor: Int = Color.WHITE,
     var progressBarColor: Int = Color.BLACK,
+    var galleryBackgroundColor: Int = Color.WHITE,
     @DrawableRes var placeHolder: Int = R.drawable.ic_image_placeholder,
     @DrawableRes var errorDrawable: Int = R.drawable.ic_image_placeholder,
     @DrawableRes var selectionDrawable: Int = R.drawable.ic_checked_media,
@@ -47,6 +48,7 @@ data class LassiConfig(
                 statusBarColor = lassiConfig.statusBarColor
                 toolbarResourceColor = lassiConfig.toolbarResourceColor
                 progressBarColor = lassiConfig.progressBarColor
+                galleryBackgroundColor = lassiConfig.galleryBackgroundColor
                 selectedMedias = lassiConfig.selectedMedias
                 mediaType = lassiConfig.mediaType
                 maxCount = lassiConfig.maxCount

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

@@ -149,6 +149,14 @@ class Lassi(private val context: Context) {
         return this
     }
 
+    /**
+     * Set gallery background color resource
+     */
+    fun setGalleryBackgroundColor(@ColorRes color: Int): Lassi {
+        lassiConfig.galleryBackgroundColor = ContextCompat.getColor(context, color)
+        return this
+    }
+
     /**
      * Set progressbar color hex
      */

lassi/src/main/java/com/lassi/presentation/docs/DocsViewModelFactory.kt

@@ -10,7 +10,7 @@ import com.lassi.domain.media.MediaRepository
 class DocsViewModelFactory(val context: Context) : ViewModelProvider.Factory {
     private val mediaRepository: MediaRepository = MediaRepositoryImpl(context)
 
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
         return DocsViewModel(mediaRepository) as T
     }
 }

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

@@ -48,6 +48,7 @@ class MediaFragment : LassiBaseViewModelFragment<SelectedMediaViewModel>() {
 
     override fun initViews() {
         super.initViews()
+        rvMedia.setBackgroundColor(LassiConfig.getConfig().galleryBackgroundColor)
         bucket?.let {
             it.bucketName?.let { bucketName ->
                 viewModel.getSelectedMediaData(bucket = bucketName)
@@ -104,7 +105,7 @@ class MediaFragment : LassiBaseViewModelFragment<SelectedMediaViewModel>() {
         when (LassiConfig.getConfig().mediaType) {
             MediaType.IMAGE -> {
                 if (LassiConfig.getConfig().maxCount == 1 && LassiConfig.getConfig().isCrop) {
-                    val uri = Uri.fromFile(File(selectedMedias[0].path))
+                    val uri = Uri.fromFile(selectedMedias[0].path?.let { File(it) })
                     CropUtils.beginCrop(requireActivity(), uri)
                 } else if (LassiConfig.getConfig().maxCount > 1) {
                     viewModel.addAllSelectedMedia(selectedMedias)

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

@@ -65,6 +65,7 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel>() {
 
     override fun initViews() {
         super.initViews()
+        rvMedia.setBackgroundColor(LassiConfig.getConfig().galleryBackgroundColor)
         rvMedia.layoutManager = GridLayoutManager(context, LassiConfig.getConfig().gridSize)
         rvMedia.adapter = folderAdapter
         rvMedia.addItemDecoration(GridSpacingItemDecoration(LassiConfig.getConfig().gridSize, 10))

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

@@ -193,7 +193,7 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
         return super.onCreateOptionsMenu(menu)
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
         menuDone?.isVisible = !viewModel.selectedMediaLiveData.value.isNullOrEmpty()
         return super.onPrepareOptionsMenu(menu)
     }
@@ -244,7 +244,7 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
 
     private fun handleSelectedMedia(selectedMedias: ArrayList<MiMedia>) {
         setToolbarTitle(selectedMedias)
-        menuDone?.isVisible = !selectedMedias.isNullOrEmpty()
+        menuDone?.isVisible = selectedMedias.isNotEmpty()
     }