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 focus after equal click

Browse Source 
#165
This commit is contained in:
Sad Ellie 2024-01-19 00:30:36 +03:00
parent 9f8c5b8c36
commit c1dce24645
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@ private fun Ready(
clearSymbols = clearSymbols, clearSymbols = clearSymbols,
deleteSymbol = deleteSymbol, deleteSymbol = deleteSymbol,
toggleAngleMode = toggleAngleMode, toggleAngleMode = toggleAngleMode,
equal = equal, equal = { focusManager.clearFocus(); equal() },
middleZero = uiState.middleZero, middleZero = uiState.middleZero,
acButton = uiState.acButton, acButton = uiState.acButton,
addBracket = addBracket addBracket = addBracket

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

@ -116,16 +116,16 @@ internal class CalculatorViewModel @Inject constructor(
.stateIn(viewModelScope, CalculatorUIState.Loading) .stateIn(viewModelScope, CalculatorUIState.Loading)
fun addTokens(tokens: String) = _input.update { fun addTokens(tokens: String) = _input.update {
var newValue = if (_equalClicked.value and Token.Digit.allWithDot.contains(tokens)) { val isClearInputNeeded = _equalClicked.value and Token.Digit.allWithDot.contains(tokens)
var newValue = when {
// Clean input after clicking "=" and any token that is a Digit // Clean input after clicking "=" and any token that is a Digit
TextFieldValue().addTokens(tokens) isClearInputNeeded -> TextFieldValue()
} else { _equalClicked.value -> it.copy(selection = TextRange(it.text.length))
it.addTokens(tokens) else -> it
}
// Cursor is set to 0 when equal is clicked
if (_equalClicked.value) {
newValue = newValue.copy(selection = TextRange(it.text.length))
} }
newValue = newValue.addTokens(tokens)
_equalClicked.update { false } _equalClicked.update { false }
_fractionJob?.cancel() _fractionJob?.cancel()
savedStateHandle[_inputKey] = newValue.text savedStateHandle[_inputKey] = newValue.text
@ -133,11 +133,14 @@ internal class CalculatorViewModel @Inject constructor(
} }
fun addBracket() = _input.update { fun addBracket() = _input.update {
var newValue = it.addBracket() var newValue = if (_equalClicked.value) {
// Cursor is set to 0 when equal is clicked // Cursor is set to 0 when equal is clicked
if (_equalClicked.value) { it.copy(selection = TextRange(it.text.length))
newValue = newValue.copy(selection = TextRange(it.text.length)) } else {
it
} }
newValue = newValue.addBracket()
_equalClicked.update { false } _equalClicked.update { false }
_fractionJob?.cancel() _fractionJob?.cancel()
savedStateHandle[_inputKey] = newValue.text savedStateHandle[_inputKey] = newValue.text