Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref: Pad 回复面板高度

This commit is contained in:
HuanCheng65 2023-10-05 17:20:09 +08:00
parent 369f5e9394
commit 0e55b13d90
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/huanchengfly/tieba/post/ui/page/reply/ReplyPage.kt
View File

@ -92,6 +92,7 @@ import com.huanchengfly.tieba.post.pxToDpFloat
import com.huanchengfly.tieba.post.toMD5
import com.huanchengfly.tieba.post.toastShort
import com.huanchengfly.tieba.post.ui.common.theme.compose.ExtendedTheme
import com.huanchengfly.tieba.post.ui.page.destinations.ReplyPageDestination
import com.huanchengfly.tieba.post.ui.page.reply.ReplyPanelType.EMOJI
import com.huanchengfly.tieba.post.ui.page.reply.ReplyPanelType.IMAGE
import com.huanchengfly.tieba.post.ui.page.reply.ReplyPanelType.NONE
@ -99,6 +100,7 @@ import com.huanchengfly.tieba.post.ui.utils.imeNestedScroll
import com.huanchengfly.tieba.post.ui.widgets.compose.Dialog
import com.huanchengfly.tieba.post.ui.widgets.compose.DialogNegativeButton
import com.huanchengfly.tieba.post.ui.widgets.compose.DialogPositiveButton
import com.huanchengfly.tieba.post.ui.widgets.compose.MyBackHandler
import com.huanchengfly.tieba.post.ui.widgets.compose.VerticalDivider
import com.huanchengfly.tieba.post.ui.widgets.compose.rememberDialogState
import com.huanchengfly.tieba.post.ui.widgets.edittext.widget.UndoableEditText
@ -124,6 +126,7 @@ import org.litepal.extension.deleteAllAsync
import org.litepal.extension.findFirstAsync
import java.util.UUID
import kotlin.concurrent.thread
import kotlin.math.max
// TODO: 将软键盘状态相关逻辑抽离出来
@OptIn(
@ -296,6 +299,13 @@ fun ReplyPage(
}
}
MyBackHandler(
enabled = curKeyboardType != NONE,
currentScreen = ReplyPageDestination
) {
switchToPanel(NONE)
}
val density = LocalDensity.current
val imeInset = WindowInsets.ime
val imeAnimationTargetInset = WindowInsets.imeAnimationTarget
@ -315,7 +325,7 @@ fun ReplyPage(
.collect { value = it }
}
val imeAnimationEnd by remember { derivedStateOf { imeCurrentHeight == imeAnimationTargetHeight } }
val imeVisibleHeight by produceState(
val imeVisibleHeightPx by produceState(
initialValue = remember { context.appPreferences.imeHeight },
imeAnimationTargetInset,
density
@ -329,6 +339,10 @@ fun ReplyPage(
}
}
val panelHeight by remember {
derivedStateOf { max(imeVisibleHeightPx.pxToDpFloat(), 150f).dp }
}
val textMeasurer = rememberTextMeasurer()
val minResult = textMeasurer.measure(
@ -561,7 +575,7 @@ fun ReplyPage(
.windowInsetsBottomHeight(WindowInsets.ime)
)
if (curKeyboardType != NONE) {
Column(modifier = Modifier.height(imeVisibleHeight.pxToDpFloat().dp)) {
Column(modifier = Modifier.height(panelHeight)) {
when (curKeyboardType) {
EMOJI -> {
EmoticonPanel(
@ -600,7 +614,7 @@ fun ReplyPage(
Spacer(
modifier = Modifier
.fillMaxWidth()
.height(imeVisibleHeight.pxToDpFloat().dp)
.height(panelHeight)
)
}
}