Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-21 09:40:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix expression value is not used

Browse Source
This commit is contained in:
Sad Ellie 2023-04-02 20:20:41 +03:00
parent 3a620452c2
commit 931235deb0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
View File

@ -122,13 +122,13 @@ private fun HistoryListItem(
historyItem: HistoryItem, historyItem: HistoryItem,
) { ) {
val clipboardManager = LocalClipboardManager.current val clipboardManager = LocalClipboardManager.current
val expr = Formatter.format(historyItem.expression) val expression = Formatter.format(historyItem.expression)
var textFieldexpr by remember(expr) { var expressionValue by remember(expression) {
mutableStateOf(TextFieldValue(expr, selection = TextRange(expr.length))) mutableStateOf(TextFieldValue(expression, TextRange(expression.length)))
} }
val res = Formatter.format(historyItem.expression) val result = Formatter.format(historyItem.result)
var textFieldRes by remember(res) { var resultValue by remember(result) {
mutableStateOf(TextFieldValue(res, selection = TextRange(res.length))) mutableStateOf(TextFieldValue(result, TextRange(result.length)))
} }
Column(modifier = modifier) { Column(modifier = modifier) {
@ -136,12 +136,12 @@ private fun HistoryListItem(
LocalTextInputService provides null, LocalTextInputService provides null,
LocalTextToolbar provides UnittoTextToolbar( LocalTextToolbar provides UnittoTextToolbar(
view = LocalView.current, view = LocalView.current,
copyCallback = { clipboardManager.copyWithoutGrouping(textFieldexpr) } copyCallback = { clipboardManager.copyWithoutGrouping(expressionValue) }
) )
) { ) {
BasicTextField( BasicTextField(
value = textFieldexpr, value = expressionValue,
onValueChange = { textFieldexpr = it }, onValueChange = { expressionValue = it },
maxLines = 1, maxLines = 1,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@ -156,12 +156,12 @@ private fun HistoryListItem(
LocalTextInputService provides null, LocalTextInputService provides null,
LocalTextToolbar provides UnittoTextToolbar( LocalTextToolbar provides UnittoTextToolbar(
view = LocalView.current, view = LocalView.current,
copyCallback = { clipboardManager.copyWithoutGrouping(textFieldRes) } copyCallback = { clipboardManager.copyWithoutGrouping(resultValue) }
) )
) { ) {
BasicTextField( BasicTextField(
value = textFieldRes, value = resultValue,
onValueChange = { textFieldRes = it }, onValueChange = { resultValue = it },
maxLines = 1, maxLines = 1,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()