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

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

View File

@@ -1,4 +1,4 @@
#Fri Mar 06 23:51:37 CST 2026
#Fri Mar 06 23:58:06 CST 2026
path.4=14/classes.dex
path.3=12/classes.dex
path.2=10/classes.dex

View File

@@ -1 +1 @@
τ8ξ)ϊ*ψ'ί&θ%ή!ψω#ϋ#η#η#η#η#
τ8ξ)ϊ*ψ'ί&θ%ή!ψω#ϋ#η#η#η#η#η#

View File

@@ -1 +1 @@
ëXè¾ú¹Ñ~Ì>Åô­ï`ý¿ÄJùÉïNÔî×úbå4å²×?Í#àÀ2èjÓ*ú3ð²ÀÚëð2ã;Ñþñ/Éæ†À0ÉÅ€î*ËüíØ&ü
ëXè¾ú¹Ñ~Ì>Åô­ï`ý¿ÄJùÉïNÔî×úbå4å²×?Í#àÀ2èjÓ*ú3ð²ÀÚëð2ã;Ñþñ/Éæ†À0ÉÅ€î*ËüíØ&üËÅÉ$æ

View File

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
@@ -22,6 +23,8 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.itemsIndexed
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.activity.compose.rememberLauncherForActivityResult
@@ -209,6 +212,12 @@ fun MergeScreen(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues)
) {
// 可滚动的内容区域
Column(
modifier = Modifier
.weight(1f)
.verticalScroll(rememberScrollState())
) {
// 布局选择
Row(
@@ -378,8 +387,9 @@ fun MergeScreen(
maxLines = 5
)
}
}
// 底部按钮
// 底部按钮 - 固定在底部
Row(
modifier = Modifier
.fillMaxWidth()