Fix: properly load title and content from preferences

2026-03-05 21:50:30 +08:00
parent 20c29a9a57
commit 917b69e2aa
83 changed files with 6 additions and 8 deletions
--- a/.gradle/8.2/executionHistory/executionHistory.bin
+++ b/.gradle/8.2/executionHistory/executionHistory.bin
--- a/.gradle/8.2/executionHistory/executionHistory.lock
+++ b/.gradle/8.2/executionHistory/executionHistory.lock
--- a/.gradle/8.2/fileHashes/fileHashes.bin
+++ b/.gradle/8.2/fileHashes/fileHashes.bin
--- a/.gradle/8.2/fileHashes/fileHashes.lock
+++ b/.gradle/8.2/fileHashes/fileHashes.lock
--- a/.gradle/8.2/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.2/fileHashes/resourceHashesCache.bin
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex
+++ b/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/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 @@
-#Thu Mar 05 21:36:42 CST 2026
+#Thu Mar 05 21:47:12 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-1$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-1$1.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-2$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-2$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-4$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.dex
--- 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
--- 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$MergeScreen$11.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$11.dex
--- 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
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$6.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$6.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$7$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$7$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$8.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$8.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/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.at
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.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.keystream
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
--- 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/internal-name-to-source.tab_i
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
--- 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 @@
-20
+21
 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 @@
-<EFBFBD>霎
+<EFBFBD>霎彧
--- 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-1$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-1$1.class
--- 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-2$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-2$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-4$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/ComposableSingletons$MergeScreenKt$lambda-4$1.class
--- 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
--- 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$MergeScreen$11.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$11.class
--- 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
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$5.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$6.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$6.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$7$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$7$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$8.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$8.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/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt
+++ b/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt
@@ -161,10 +161,8 @@ fun MergeScreen(
        preferencesManager.contentStyle.collect { contentStyle = it }
    }
    LaunchedEffect(Unit) {
-        preferencesManager.mergeTitle.collect { title = it }
+        launch { preferencesManager.mergeTitle.collect { title = it } }
-    }
+        launch { preferencesManager.mergeContent.collect { content = it } }
    LaunchedEffect(Unit) {
        preferencesManager.mergeContent.collect { content = it }
    }
    // 保存标题和内容到偏好设置