Stowage/buckwheat
2
0
Fork 0
mirror of https://github.com/danilkinkin/buckwheat.git synced 2025-12-31 04:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #98 from pakka-papad/fix/ui-stutter-on-comment-edit

Browse source 
Fixed: UI animation stutter on comment editing
This commit is contained in:
Danil Зakhvatkin 2024-01-13 22:50:56 +06:00 • committed by GitHub
commit 20f8a25b57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

58
app/src/main/java/com/danilkinkin/buckwheat/home/MainScreen.kt
View file

@ -39,6 +39,7 @@ import androidx.compose.material3.Surface
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
@ -192,27 +193,38 @@ fun MainScreen(
.coerceAtMost(with(localDensity) { 500.dp.toPx() })
.coerceAtMost(contentHeight / 2)
val currentKeyboardHeight by animateFloatAsState(
targetValue = if (isShowSystemKeyboard) {
systemKeyboardHeight
} else {
keyboardHeight
},
)
val currentKeyboardHeight = if (isShowSystemKeyboard) {
systemKeyboardHeight
} else {
keyboardHeight
}
val editorHeight = contentHeight
.minus(
currentKeyboardHeight
.plus(with(localDensity) {
if (isShowSystemKeyboard) {
16.dp.toPx()
} else {
keyboardAdditionalOffset.toPx()
}
})
.coerceAtLeast(0f)
)
.coerceAtMost(contentHeight - with(localDensity) { navigationBarHeight.toPx() + 96.dp.toPx() })
val editorHeight by remember(
contentHeight,
currentKeyboardHeight,
isShowSystemKeyboard,
keyboardAdditionalOffset,
navigationBarHeight
) { derivedStateOf {
contentHeight
.minus(
currentKeyboardHeight
.plus(with(localDensity) {
if (isShowSystemKeyboard) {
16.dp.toPx()
} else {
keyboardAdditionalOffset.toPx()
}
})
.coerceAtLeast(0f)
)
.coerceAtMost(contentHeight - with(localDensity) { navigationBarHeight.toPx() + 96.dp.toPx() })
} }
val editorHeightAnimated by animateFloatAsState(
targetValue = editorHeight,
animationSpec = tween(durationMillis = 150)
)
Row {
if (windowSizeClass != WindowWidthSizeClass.Compact) {
@ -280,11 +292,11 @@ fun MainScreen(
if (windowSizeClass == WindowWidthSizeClass.Compact) {
TopSheetLayout(
swipeableState = topSheetState,
customHalfHeight = editorHeight,
customHalfHeight = editorHeightAnimated,
lockSwipeable = appViewModel.lockSwipeable,
sheetContentHalfExpand = {
Editor(
modifier = Modifier.height(with(localDensity) { editorHeight.toDp() }),
modifier = Modifier.height(with(localDensity) { editorHeightAnimated.toDp() }),
onOpenHistory = {
coroutineScope.launch {
topSheetState.animateTo(TopSheetValue.Expanded)
@ -310,7 +322,7 @@ fun MainScreen(
),
) {
Editor(
modifier = Modifier.height(with(localDensity) { editorHeight.toDp() }),
modifier = Modifier.height(with(localDensity) { editorHeightAnimated.toDp() }),
)
}
}