fix: 增加拼图界面内容输入框高度，从150dp改为200dp，确保能完整显示5行文字

2026-03-06 23:53:31 +08:00
parent 539b076fac
commit 150e259205
90 changed files with 5 additions and 5 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/.gradle/file-system.probe
+++ b/.gradle/file-system.probe
--- 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 @@
-#Fri Mar 06 23:09:36 CST 2026
+#Fri Mar 06 23:51:37 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$1$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$1$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4$1.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4$1.dex
--- a/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4.dex
+++ b/app/build/intermediates/project_dex_archive/debug/out/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4.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.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
+++ 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.s
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s
@@ -1 +1 @@
-פ8מ)ת*ר'‗&ט%<EFBFBD>!רש#<EFBFBD>#
+τ8ξ)ϊ*ψ'ί&θ%ή!ψω#ϋ#η#η#η#η#
--- 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/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/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/lookups/counters.tab
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-41
+45
 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.keystream
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
--- 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èjÓ*ú3ð²ÀÚëð2ã;
+ëXè¾ú¹Ñ~Ì>Å‡ôï`ý¿ÄJùÉïNÔ›î×úbå4å²×?Í#à“À2èjÓ*ú3ð²ÀÚëð2ã;Ñþñ/Éæ†À0ÉÅ€î*ËüíØ&ü
--- a/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
+++ b/app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
--- 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$1$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$1$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$2.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$3.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4$1.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4$1.class
--- a/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4.class
+++ b/app/build/tmp/kotlin-classes/debug/com/inspection/camera/ui/merge/MergeScreenKt$MergeScreen$4.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.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
@@ -373,7 +373,7 @@ fun MergeScreen(
                    label = { Text("内容（最多5行）") },
                    modifier = Modifier
                        .fillMaxWidth()
-                        .heightIn(min = 150.dp),
+                        .heightIn(min = 200.dp),
                    minLines = 5,
                    maxLines = 5
                )
		`@@ -1 +1 @@`
			`פ8מ)ת*ר'‗&ט%<EFBFBD>!רש#<EFBFBD>#`				`τ8ξ)ϊ*ψ'ί&θ%ή!ψω#ϋ#η#η#η#η#`
		`@@ -1 +1 @@`
			ëXè¾ú¹Ñ~Ì>Å‡ôï`ý¿ÄJùÉïNÔ›î×úbå4å²×?Í#à“À2èjÓ*ú3ð²ÀÚëð2ã;				ëXè¾ú¹Ñ~Ì>Å‡ôï`ý¿ÄJùÉïNÔ›î×úbå4å²×?Í#à“À2èjÓú3ð²ÀÚëð2ã;Ñþñ/Éæ†À0ÉÅ€îËüíØ&ü