diff --git a/.gradle/8.2/executionHistory/executionHistory.bin b/.gradle/8.2/executionHistory/executionHistory.bin index a95a701..fb333cf 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 df82f37..ada2ed7 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 9ce71cc..315ad06 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 98906d3..5eb0ddb 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 ba522b9..49f82aa 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 15c4a81..04528fb 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 af43a30..62cd71d 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 794b80a..3c546da 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 a201d2e..8351e0a 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: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 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 1987c5d..bff7f35 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 bc333e5..66f7813 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 3d1160e..35c74b9 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 13d0e5e..fc88f81 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 c5c2b5c..4b4671e 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-6$1.dex b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.dex index f4168e4..3e40518 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 5123906..d66a67f 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 81429af..0c48103 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 b59fe2b..ed17591 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 42d19c0..c09b0c1 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.dex b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt.dex index d78694c..52e30b7 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 020e8e0..79d5d3b 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 4fb3d9e..d07ba41 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 72b471f..a8859e2 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 00890b6..ca4fb88 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 880edb2..4a9eb11 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 12db336..fb9e607 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 e36b4f4..9cf2fbc 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 3216955..640f786 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 c00e9d2..8f77b79 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 0041f06..7a1710b 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 0a454b3..b02e6da 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 7ba9707..3820e01 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 81c405d..c8973a7 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 ce0fee0..32aeb48 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 f6038f1..472548c 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 7136d0c..3fdfe94 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 67f818f..dfe6678 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 fadbc77..d4e46c7 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 @@ -37 +39 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 75309e2..ca417f6 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 b5aefc3..0279d61 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 4325ecd..8d38c5d 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 d1c1369..a9e758f 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 beea674..11d24d5 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 6ed8337..8e95206 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 dcbcc82..7a5d0af 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 412f340..5bf5acb 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 a7b7ed6..da63c36 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 8faac99..8cff516 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 9ea331b..8c1a691 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 c81c6b3..aeae698 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?#2 \ No newline at end of file +X~>Ň`JNԛb4?#2j*3 \ 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 b13a46a..7f12a96 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 c15d0c1..e8fe01e 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 d3c2713..8eb3a3a 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 ebd9482..2ad64de 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 9f99233..1e65fca 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 e4e1a54..f53f976 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 1d17f7c..0a76f3a 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 a289023..f495c8d 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-6$1.class b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-6$1.class index 3c48aa6..afa7bb1 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 0d121ae..f006dea 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 cf40d82..d744a8b 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 bf0127e..15d33cd 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 a136280..6231c99 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.class b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt.class index 14f56b6..b1547dd 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 bd79199..d17564e 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 859fccd..49c9c40 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 @@ -401,7 +401,9 @@ fun MergeScreen( content, titleStyle, contentStyle, - recorderName + recorderName, + title, + content ) } showPreview = true @@ -469,7 +471,9 @@ fun MergeScreen( content, titleStyle, contentStyle, - recorderName + recorderName, + title, + content ) } 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 9b4e9b7..e11af47 100644 --- a/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt +++ b/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt @@ -190,9 +190,11 @@ object ImageProcessor { content: String = "", titleStyle: WatermarkStyle = WatermarkStyle.Default, contentStyle: WatermarkStyle = WatermarkStyle.Default, - recorderName: String = "" + recorderName: String = "", + bottomTitle: String = "", + bottomContent: String = "" ): Bitmap { - if (images.isEmpty() && title.isBlank() && content.isBlank() && recorderName.isBlank()) { + if (images.isEmpty() && title.isBlank() && content.isBlank() && recorderName.isBlank() && bottomTitle.isBlank() && bottomContent.isBlank()) { return Bitmap.createBitmap(1920, 1080, Bitmap.Config.ARGB_8888) } @@ -205,29 +207,29 @@ object ImageProcessor { val cellHeight = cellWidth // 保持正方形格子 // 底部文字区域高度 - 动态计算 - val textAreaHeight = if (title.isNotBlank() || content.isNotBlank()) { + val textAreaHeight = if (bottomTitle.isNotBlank() || bottomContent.isNotBlank()) { val padding = 30f - val titleHeight = if (title.isNotBlank()) { + val bTitleHeight = if (bottomTitle.isNotBlank()) { val titlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { textSize = outputWidth / 25f } titlePaint.fontMetrics.let { it.descent - it.ascent } } else 0f - val contentHeight = if (content.isNotBlank()) { + val bContentHeight = if (bottomContent.isNotBlank()) { val contentPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { textSize = outputWidth / 35f } val contentMaxWidth = outputWidth - padding * 2 - val contentLines = wrapText(content, contentPaint, contentMaxWidth).take(5) + val contentLines = wrapText(bottomContent, contentPaint, contentMaxWidth).take(5) val lineHeight = contentPaint.fontMetrics.let { it.descent - it.ascent } - val titleSpacing = if (title.isNotBlank()) titleHeight + lineHeight + 20 else lineHeight + val titleSpacing = if (bottomTitle.isNotBlank()) bTitleHeight + lineHeight + 20 else lineHeight titleSpacing + contentLines.size * lineHeight + padding } else { - padding + titleHeight + padding + padding + bTitleHeight + padding } - maxOf(150f, contentHeight) + maxOf(150f, bContentHeight) } else { 0f } @@ -319,39 +321,39 @@ object ImageProcessor { ) val padding = 30f - val titleHeight: Float + val bTitleHeight: Float // 绘制标题 - 粗体白色居中 - if (title.isNotBlank()) { + if (bottomTitle.isNotBlank()) { val titlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { textSize = outputWidth / 25f color = android.graphics.Color.WHITE - typeface = Typeface.create("sans-serif", Typeface.BOLD) // 粗体无衬线 + typeface = Typeface.create("sans-serif", Typeface.BOLD) textAlign = android.graphics.Paint.Align.CENTER } - titleHeight = titlePaint.fontMetrics.let { it.descent - it.ascent } - canvas.drawText(title, outputWidth / 2f, textTop + padding + titleHeight, titlePaint) + bTitleHeight = titlePaint.fontMetrics.let { it.descent - it.ascent } + canvas.drawText(bottomTitle, outputWidth / 2f, textTop + padding + bTitleHeight, titlePaint) } else { - titleHeight = 0f + bTitleHeight = 0f } // 绘制内容 - 细体白色靠左 - if (content.isNotBlank()) { + if (bottomContent.isNotBlank()) { val contentPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { textSize = outputWidth / 35f color = android.graphics.Color.WHITE - typeface = Typeface.create("sans-serif", Typeface.NORMAL) // 细体 + typeface = Typeface.create("sans-serif", Typeface.NORMAL) textAlign = android.graphics.Paint.Align.LEFT } val contentMaxWidth = outputWidth - padding * 2 - val contentLines = wrapText(content, contentPaint, contentMaxWidth) + val contentLines = wrapText(bottomContent, contentPaint, contentMaxWidth) val lineHeight = contentPaint.fontMetrics.let { it.descent - it.ascent } // 内容起始Y坐标 - 标题下方再往下移一行 - val contentStartY = if (title.isNotBlank()) { - textTop + padding + titleHeight + lineHeight + 20 + val contentStartY = if (bottomTitle.isNotBlank()) { + textTop + padding + bTitleHeight + lineHeight + 20 } else { textTop + padding + lineHeight * 2 } @@ -361,6 +363,7 @@ object ImageProcessor { contentLines.forEach { line -> canvas.drawText(line, padding, y, contentPaint) y += lineHeight + } } } @@ -379,9 +382,6 @@ object ImageProcessor { return result } - return result - } - /** * 缩放并居中裁剪Bitmap */