Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix delayed clear history button

Browse Source
This commit is contained in:
Sad Ellie 2023-05-16 09:59:43 +03:00
parent f25af1caad
commit c838d0f32d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
View File

@ -46,6 +46,7 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
@ -113,16 +114,18 @@ private fun CalculatorScreen(
evaluate: () -> Unit, evaluate: () -> Unit,
clearHistory: () -> Unit clearHistory: () -> Unit
) { ) {
var showClearHistoryButton by rememberSaveable { mutableStateOf(false) }
var showClearHistoryDialog by rememberSaveable { mutableStateOf(false) }
val dragAmount = remember { Animatable(0f) } val dragAmount = remember { Animatable(0f) }
val dragCoroutineScope = rememberCoroutineScope() val dragCoroutineScope = rememberCoroutineScope()
val dragAnimDecay = rememberSplineBasedDecay<Float>() val dragAnimSpec = rememberSplineBasedDecay<Float>()
var textThingyHeight by remember { mutableStateOf(0) } var textThingyHeight by remember { mutableStateOf(0) }
var historyItemHeight by remember { mutableStateOf(0) } var historyItemHeight by remember { mutableStateOf(0) }
var showClearHistoryDialog by rememberSaveable { mutableStateOf(false) }
val showClearHistoryButton by remember(dragAmount.value, historyItemHeight) {
derivedStateOf { dragAmount.value > historyItemHeight }
}
UnittoScreenWithTopBar( UnittoScreenWithTopBar(
title = { Text(stringResource(R.string.calculator)) }, title = { Text(stringResource(R.string.calculator)) },
navigationIcon = { MenuButton { navigateToMenu() } }, navigationIcon = { MenuButton { navigateToMenu() } },
@ -187,15 +190,11 @@ private fun CalculatorScreen(
}, },
onDragStopped = { velocity -> onDragStopped = { velocity ->
dragCoroutineScope.launch { dragCoroutineScope.launch {
dragAmount.animateDecay(velocity, dragAnimDecay) dragAmount.animateDecay(velocity, dragAnimSpec)
// Snap to closest anchor (0, one history item, all history items) // Snap to closest anchor (0, one history item, all history items)
val draggedAmount = listOf(0, historyItemHeight, maxDragAmount) val draggedAmount = listOf(0, historyItemHeight, maxDragAmount)
.minBy { abs(dragAmount.value.roundToInt() - it) } .minBy { abs(dragAmount.value.roundToInt() - it) }
.also {
// Show button only when fully history view is fully expanded
showClearHistoryButton = it == maxDragAmount
}
.toFloat() .toFloat()
dragAmount.animateTo(draggedAmount) dragAmount.animateTo(draggedAmount)
} }