release: v1.1.4

leavesCZY · Dec 31, 2023 · 90b553f · 90b553f
1 parent bd1373a
commit 90b553f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 20 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,15 +13,15 @@ androidx-lifecycle-runtime-ktx = "2.6.2"
 androidx-compose-bom = "2023.10.01"
 androidx-compose-compiler = "1.5.4"
 
-matisse-remote = "1.1.3"
-matisse-publishing = "1.1.3"
+matisse-remote = "1.1.4"
+matisse-publishing = "1.1.4"
 
 coil = "2.5.0"
 
 glide = "5.0.0-rc01"
 glide-compose = "1.0.0-beta01"
 
-zoom-image = "1.0.0-beta10"
+zoom-image = "1.0.0"
 
 zoomable-image = "0.7.1"
 

diff --git a/matisse/src/main/java/github/leavesczy/matisse/Matisse.kt b/matisse/src/main/java/github/leavesczy/matisse/Matisse.kt
@@ -14,7 +14,7 @@ import kotlinx.parcelize.Parcelize
  * @param maxSelectable 最多允许选择几个媒体资源
  * @param mediaFilter 用于定义媒体资源的加载和过滤规则
  * @param imageEngine 用于实现加载图片的逻辑
- * @param singleMediaType 用于设置是否允许同时选择图片和视频，为 true 则用户只能选择同一种媒体类型
+ * @param singleMediaType 用于设置是否允许用户同时选择图片和视频。为 true 则用户只能选择一种媒体类型，为 false 则允许同时选择图片和视频
  * @param captureStrategy 拍照策略。默认不开启拍照功能
  */
 @Stable

diff --git a/matisse/src/main/java/github/leavesczy/matisse/internal/MatisseActivity.kt b/matisse/src/main/java/github/leavesczy/matisse/internal/MatisseActivity.kt
@@ -136,7 +136,7 @@ internal class MatisseActivity : BaseCaptureActivity() {
             selectedResourcesMutable.add(element = mediaResource)
             onSure(resources = selectedResourcesMutable)
         } else {
-            onSure(resources = listOf(mediaResource))
+            onSure(resources = listOf(element = mediaResource))
         }
     }
 

diff --git a/matisse/src/main/java/github/leavesczy/matisse/internal/logic/MatisseViewModel.kt b/matisse/src/main/java/github/leavesczy/matisse/internal/logic/MatisseViewModel.kt
@@ -180,24 +180,30 @@ internal class MatisseViewModel(application: Application, matisse: Matisse) :
         if (alreadySelected) {
             selectedResourcesMutable.remove(element = mediaResource)
         } else {
-            if (maxSelectable == 1) {
-                selectedResourcesMutable.clear()
-            } else if (selectedResourcesMutable.size >= maxSelectable) {
-                showToast(
-                    message = String.format(
-                        getString(R.string.matisse_limit_the_number_of_pictures),
-                        maxSelectable
-                    )
-                )
-                return
-            } else if (singleMediaType) {
-                val illegalMediaType = selectedResourcesMutable.any {
-                    it.isImage != mediaResource.isImage
+            when {
+                maxSelectable == 1 -> {
+                    selectedResourcesMutable.clear()
                 }
-                if (illegalMediaType) {
-                    showToast(message = getString(R.string.matisse_cannot_select_both_picture_and_video_at_the_same_time))
+
+                selectedResourcesMutable.size >= maxSelectable -> {
+                    showToast(
+                        message = String.format(
+                            getString(R.string.matisse_limit_the_number_of_pictures),
+                            maxSelectable
+                        )
+                    )
                     return
                 }
+
+                singleMediaType -> {
+                    val illegalMediaType = selectedResourcesMutable.any {
+                        it.isImage != mediaResource.isImage
+                    }
+                    if (illegalMediaType) {
+                        showToast(message = getString(R.string.matisse_cannot_select_both_picture_and_video_at_the_same_time))
+                        return
+                    }
+                }
             }
             selectedResourcesMutable.add(element = mediaResource)
         }