fix: 重构拼图界面布局，使用权重布局确保底部按钮始终可见

- 将内容区域包装在可滚动的Column中 - 使用weight(1f)让内容区域占据剩余空间 - 底部按钮固定在屏幕底部 - 保持内容输入框高度为200dp以显示5行文字
2026-03-06 23:59:06 +08:00
parent 150e259205
commit 306e479764
95 changed files with 176 additions and 166 deletions
--- 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