Fix image video preview

361292623 · Aug 10, 2023 · 995e54e · 995e54e
1 parent 2d71c8f
commit 995e54e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -55,14 +55,14 @@ android {
     }
 
     buildTypes {
-        debug {
-            isShrinkResources = true
-            isMinifyEnabled = true
-            ndk {
-                debugSymbolLevel = "SYMBOL_TABLE"
-            }
-            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
-        }
+//        debug {
+//            isShrinkResources = true
+//            isMinifyEnabled = true
+//            ndk {
+//                debugSymbolLevel = "SYMBOL_TABLE"
+//            }
+//            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
+//        }
         release {
             signingConfig = signingConfigs.getByName("release")
             isShrinkResources = true

diff --git a/app/src/main/java/com/ismartcoding/plain/ui/file/FilesDialog.kt b/app/src/main/java/com/ismartcoding/plain/ui/file/FilesDialog.kt
@@ -129,16 +129,10 @@ class FilesDialog : BaseDialog<DialogFilesBinding>() {
                 val m = getModel<FileModel>()
                 if (m.data.isDir) {
                     navigateTo(m.data.path)
-                } else if (m.data.path.isVideoFast()) {
+                } else if (m.data.path.isVideoFast() || m.data.path.isImageFast()) {
                     val items = getModelList<FileModel>()
                     PreviewDialog().show(
-                        items = items.filter { !it.data.isDir && it.data.path.isVideoFast() }.map { s -> PreviewItem(s.data.path, s.data.path) },
-                        initKey = m.data.path,
-                    )
-                } else if (m.data.path.isImageFast()) {
-                    val items = getModelList<FileModel>()
-                    PreviewDialog().show(
-                        items = items.filter { !it.data.isDir && it.data.path.isImageFast() }.map { s -> PreviewItem(s.data.path, s.data.path) },
+                        items = items.filter { !it.data.isDir && (it.data.path.isVideoFast() || it.data.path.isImageFast()) }.map { s -> PreviewItem(s.data.path, s.data.path) },
                         initKey = m.data.path,
                     )
                 } else if (m.data.path.isAudioFast()) {

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -14,10 +14,10 @@ android {
     }
 
     buildTypes {
-        debug {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
+//        debug {
+//            isMinifyEnabled = true
+//            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+//        }
         release {
             isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")