diff --git a/.gradle/8.2/executionHistory/executionHistory.bin b/.gradle/8.2/executionHistory/executionHistory.bin index 2f28305..aecdf8d 100644 Binary files a/.gradle/8.2/executionHistory/executionHistory.bin and b/.gradle/8.2/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.2/executionHistory/executionHistory.lock b/.gradle/8.2/executionHistory/executionHistory.lock index 2894d47..c23d2b4 100644 Binary files a/.gradle/8.2/executionHistory/executionHistory.lock and b/.gradle/8.2/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.2/fileHashes/fileHashes.bin b/.gradle/8.2/fileHashes/fileHashes.bin index e49a975..9bfc313 100644 Binary files a/.gradle/8.2/fileHashes/fileHashes.bin and b/.gradle/8.2/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.2/fileHashes/fileHashes.lock b/.gradle/8.2/fileHashes/fileHashes.lock index e5e4014..9467cb2 100644 Binary files a/.gradle/8.2/fileHashes/fileHashes.lock and b/.gradle/8.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.2/fileHashes/resourceHashesCache.bin b/.gradle/8.2/fileHashes/resourceHashesCache.bin index 7d0ab0e..29b80f9 100644 Binary files a/.gradle/8.2/fileHashes/resourceHashesCache.bin and b/.gradle/8.2/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4356254..d1cf6eb 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex index 4d8f70a..9c5d22a 100644 Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex differ diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex index a5c355a..794b80a 100644 Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex differ diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 9d08cb6..d6575e5 100644 --- 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:14:48 CST 2026 +#Fri Mar 06 22:33:52 CST 2026 path.4=14/classes.dex path.3=12/classes.dex path.2=10/classes.dex diff --git 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 index e79f774..853f47d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.dex differ diff --git 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 index f12b67d..635c5f0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.dex differ diff --git 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 index dbb9d6f..f31e3ca 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.dex differ diff --git 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 index eb96185..96556b7 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.dex differ diff --git 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 index a834b1d..f43ccd3 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.dex b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.dex index d803409..99c298b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.dex b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.dex index 4b31dfe..338b721 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.dex differ diff --git 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 index 953b551..24bb12e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.dex differ diff --git 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 index c41e9a4..acd1b16 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.dex differ diff --git 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 index 02b49f8..7493914 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.dex differ diff --git 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 index 20fb506..c85bfcc 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.dex differ diff --git 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 index 149079e..9cb77a2 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.dex b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.dex index a94d3f2..06bde10 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.dex differ diff --git 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 index c5316f7..5adeb9d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt.dex differ diff --git 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 index f473836..020e8e0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/util/ImageProcessor.dex and b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/util/ImageProcessor.dex differ diff --git 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 index 4c9a6d2..832c8e2 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab differ diff --git 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 index 88c7a6d..04faf50 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values differ diff --git 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 index aabaf29..440e14a 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at differ diff --git 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 index 9244f4e..d345d7d 100644 --- 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)*'&% \ No newline at end of file +8)*'&%! \ No newline at end of file diff --git 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 index 2f2ddb5..12db336 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab differ diff --git 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 index 2e4b007..e36b4f4 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ diff --git 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 index a83b394..3216955 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ diff --git 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 index cf0666e..c00e9d2 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ diff --git 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 index 3f0af0c..088d7af 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ diff --git 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 index 6b097fc..0a454b3 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ diff --git 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 index 3241d99..16c5d04 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab differ diff --git 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 index a8fdb05..3e6e12d 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab index e65b255..055fa93 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab differ diff --git 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 index 44e270f..9193fcc 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at differ diff --git 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 index d7b896f..f58de27 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab differ diff --git 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 index 11f5a7c..85b1396 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab index 2dce5b8..409db64 100644 --- 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 @@ -34 +36 0 \ No newline at end of file diff --git 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 index 3795c9c..e2a4d93 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab differ diff --git 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 index 632ffbe..aada11f 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at differ diff --git 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 index b7b53e8..cfe5819 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab differ diff --git 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 index eee417c..2bae021 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream differ diff --git 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 index 4b05c55..8c81f1d 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len differ diff --git 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 index 1b7c1f8..c580238 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len differ diff --git 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 index 013dbaa..64cdb07 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at differ diff --git 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 index 3056823..de69198 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab index 2b69a4d..bfe60aa 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab differ diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values index a2fdc8e..07e2f92 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values differ diff --git 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 index f7bc707..3621959 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at and b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at differ diff --git 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 index 4609649..2fc4bd3 100644 --- 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~>Ň`JNԛb4 \ No newline at end of file +X~>Ň`JNԛb4?# \ No newline at end of file diff --git a/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin b/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin index b1ef681..e2fd07c 100644 Binary files a/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin and b/app/build/kotlin/compileDebugKotlin/cacheable/last-build.bin differ diff --git a/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin b/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin index 0e64887..7d1cdb9 100644 Binary files a/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin and b/app/build/kotlin/compileDebugKotlin/local-state/build-history.bin differ diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk index d2c633a..ad78db8 100644 Binary files a/app/build/outputs/apk/debug/app-debug.apk and b/app/build/outputs/apk/debug/app-debug.apk differ diff --git 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 index 1cb5512..d8f66bc 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-10$1.class differ diff --git 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 index 3a126fb..56a4be7 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-11$1.class differ diff --git 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 index 5d8a3f0..393e27f 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-12$1.class differ diff --git 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 index f1d4a40..cecce9a 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-13$1.class differ diff --git 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 index 6f0b7f9..1436577 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-3$1.class differ diff --git a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.class b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.class index ac03889..5c89067 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.class differ diff --git a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.class b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.class index d4fe39a..d624afa 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-5$1.class differ diff --git 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 index 17a98ae..199af5d 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.class differ diff --git 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 index 6401177..ac0c347 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-7$1.class differ diff --git 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 index fc35126..5ae5682 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-8$1.class differ diff --git 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 index d924509..45bc844 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-9$1.class differ diff --git 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 index 54f8f48..9198171 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt.class differ diff --git a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.class b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.class index 6bce218..52b379c 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$13.class differ diff --git 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 index 04fb74f..cbf21a2 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt.class differ diff --git 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 index 078c361..bd79199 100644 Binary files a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/util/ImageProcessor.class and b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/util/ImageProcessor.class differ diff --git a/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt b/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt index 1edc922..2b437aa 100644 --- a/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt +++ b/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt @@ -199,23 +199,6 @@ fun MergeScreen( .fillMaxSize() .padding(paddingValues) ) { - // 顶部标题区域(如果设置了默认拼图标题) - if (title.isNotBlank()) { - Box( - modifier = Modifier - .fillMaxWidth() - .background(Color.White) - .padding(16.dp) - ) { - Text( - text = title, - style = MaterialTheme.typography.headlineSmall, - color = Color(0xFF333333), - modifier = Modifier.align(Alignment.Center) - ) - } - } - // 布局选择 Row( modifier = Modifier diff --git a/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt b/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt index 71d240e..9b4e9b7 100644 --- a/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt +++ b/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt @@ -232,10 +232,18 @@ object ImageProcessor { 0f } + // 顶部标题区域高度 + val topTitleHeight = if (title.isNotBlank()) { + val titlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + textSize = outputWidth / 20f + } + titlePaint.fontMetrics.let { it.descent - it.ascent } + 40f + } else 0f + // 图片区域高度 val imageAreaHeight = cellHeight * rows + cellSpacing * (rows + 1) - val outputHeight = imageAreaHeight + textAreaHeight.toInt() + val outputHeight = topTitleHeight.toInt() + imageAreaHeight + textAreaHeight.toInt() val result = Bitmap.createBitmap(outputWidth, outputHeight, Bitmap.Config.ARGB_8888) val canvas = Canvas(result) @@ -243,6 +251,27 @@ object ImageProcessor { val paint = Paint(Paint.ANTI_ALIAS_FLAG) + // 绘制顶部标题(白色背景+深色文字) + if (title.isNotBlank()) { + // 白色背景 + canvas.drawRect( + 0f, 0f, + outputWidth.toFloat(), topTitleHeight, + Paint().apply { color = android.graphics.Color.WHITE } + ) + + // 深色标题文字 + val titlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + textSize = outputWidth / 20f + color = android.graphics.Color.argb(255, 51, 51, 51) // 深灰色文字 + typeface = Typeface.create("sans-serif", Typeface.BOLD) + textAlign = android.graphics.Paint.Align.CENTER + isAntiAlias = true + } + val titleY = topTitleHeight / 2 + titlePaint.fontMetrics.let { it.descent - it.ascent } / 2 + canvas.drawText(title, outputWidth / 2f, titleY, titlePaint) + } + // 绘制图片网格 images.forEachIndexed { index, imageItem -> if (index >= rows * cols) return@forEachIndexed @@ -251,7 +280,7 @@ object ImageProcessor { val row = index / cols val left = cellSpacing + col * (cellWidth + cellSpacing) - val top = cellSpacing + row * (cellHeight + cellSpacing) + val top = topTitleHeight + cellSpacing + row * (cellHeight + cellSpacing) try { val sourceBitmap = tryLoadBitmap(context, imageItem) @@ -259,7 +288,7 @@ object ImageProcessor { sourceBitmap ?: return@forEachIndexed val scaledBitmap = scaleAndCropBitmap(sourceBitmap, cellWidth, cellHeight) - val dstRect = Rect(left, top, left + cellWidth, top + cellHeight) + val dstRect = Rect(left.toInt(), top.toInt(), (left + cellWidth).toInt(), (top + cellHeight).toInt()) canvas.drawBitmap(scaledBitmap, null, dstRect, paint) if (scaledBitmap != sourceBitmap) { @@ -279,7 +308,7 @@ object ImageProcessor { // 绘制底部文字区域 if (textAreaHeight > 0f) { - val textTop = imageAreaHeight + val textTop = topTitleHeight + imageAreaHeight // 绘制统一的深灰色背景 val bgColor = android.graphics.Color.argb(255, 60, 60, 60) // 深灰色