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

Clear input after "evaluation"

Browse Source
This commit is contained in:
Sad Ellie 2023-10-15 18:55:50 +03:00
parent f3442fe304
commit dad3e93fdb
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
View File

@ -77,6 +77,7 @@ internal class CalculatorViewModel @Inject constructor(
private val _output: MutableStateFlow<CalculationResult> = private val _output: MutableStateFlow<CalculationResult> =
MutableStateFlow(CalculationResult.Default()) MutableStateFlow(CalculationResult.Default())
private val _history = calculatorHistoryRepository.historyFlow private val _history = calculatorHistoryRepository.historyFlow
private val _equalClicked = MutableStateFlow(false)
val uiState = combine( val uiState = combine(
_input, _output, _history, _prefs _input, _output, _history, _prefs
@ -97,9 +98,30 @@ internal class CalculatorViewModel @Inject constructor(
viewModelScope, SharingStarted.WhileSubscribed(5000L), CalculatorUIState.Loading viewModelScope, SharingStarted.WhileSubscribed(5000L), CalculatorUIState.Loading
) )
fun addTokens(tokens: String) = _input.update { it.addTokens(tokens) } fun addTokens(tokens: String) = _input.update {
fun addBracket() = _input.update { it.addBracket() } if (_equalClicked.value) {
fun deleteTokens() = _input.update { it.deleteTokens() } _equalClicked.update { false }
TextFieldValue().addTokens(tokens)
} else {
it.addTokens(tokens)
}
}
fun addBracket() = _input.update {
if (_equalClicked.value) {
_equalClicked.update { false }
TextFieldValue().addBracket()
} else {
it.addBracket()
}
}
fun deleteTokens() = _input.update {
if (_equalClicked.value) {
_equalClicked.update { false }
TextFieldValue().deleteTokens()
} else {
it.deleteTokens()
}
}
fun clearInput() = _input.update { TextFieldValue() } fun clearInput() = _input.update { TextFieldValue() }
fun onCursorChange(selection: TextRange) = _input.update { it.copy(selection = selection) } fun onCursorChange(selection: TextRange) = _input.update { it.copy(selection = selection) }
@ -120,6 +142,7 @@ internal class CalculatorViewModel @Inject constructor(
TextFieldValue(calculationText, TextRange(calculationText.length)) TextFieldValue(calculationText, TextRange(calculationText.length))
} }
_output.update { CalculationResult.Default() } _output.update { CalculationResult.Default() }
_equalClicked.update { true }
} }
// Show the error // Show the error
else -> _output.update { calculationResult } else -> _output.update { calculationResult }