Fix: separate top title and bottom content in merge image - bottom content now dynamically positioned

2026-03-06 22:55:26 +08:00
parent a4d2e67fd6
commit 9f1c6052e5
67 changed files with 33 additions and 29 deletions
--- a/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex
+++ b/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex
--- a/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex
+++ b/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Fri Mar 06 22:42:09 CST 2026
+#Fri Mar 06 22:54:40 CST 2026
 path.4=14/classes.dex
 path.3=12/classes.dex
 path.2=10/classes.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/util/ImageProcessor.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/util/ImageProcessor.dex
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s
@@ -1 +1 @@
-פ8מ)ת*ר'‗&ט%<EFBFBD>!ר
+פ8מ)ת*ר'‗&ט%<EFBFBD>!רש#
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-37
+39
 0
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-ëXè¾ú¹Ñ~Ì>Å‡ôï`ý¿ÄJùÉïNÔ›î×úbå4å²×?Í#à“À2
+ëXè¾ú¹Ñ~Ì>Å‡ôï`ý¿ÄJùÉïNÔ›î×úbå4å²×?Í#à“À2èjÓ*ú3
--- a/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin
--- a/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin
+++ b/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin
--- a/app/build/outputs/apk/debug/app-debug.apk
+++ b/app/build/outputs/apk/debug/app-debug.apk
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/util/ImageProcessor.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/util/ImageProcessor.class