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

Fixed crash when batch converting

Browse Source 
Will clean later.
This commit is contained in:
Sad Ellie 2022-12-17 13:31:22 +04:00
parent 5cd2b3b205
commit 67ace59469
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/sadellie/unitto/screens/main/MainViewModel.kt
View File

@ -500,7 +500,13 @@ class MainViewModel @Inject constructor(
/** /**
* Returns value to be used when converting value on the right side screen (unit selection) * Returns value to be used when converting value on the right side screen (unit selection)
*/ */
fun inputValue() = (mainFlow.value.calculatedValue ?: mainFlow.value.inputValue).toBigDecimal() fun inputValue(): BigDecimal? {
return try {
(mainFlow.value.calculatedValue ?: mainFlow.value.inputValue).toBigDecimal()
} catch (e: NumberFormatException) {
null
}
}
/** /**
* Returns True if can be placed. * Returns True if can be placed.

10
app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
View File

@ -174,7 +174,7 @@ fun RightSideScreen(
navigateUp: () -> Unit, navigateUp: () -> Unit,
navigateToSettingsAction: () -> Unit, navigateToSettingsAction: () -> Unit,
selectAction: (AbstractUnit) -> Unit, selectAction: (AbstractUnit) -> Unit,
inputValue: BigDecimal, inputValue: BigDecimal?,
unitFrom: AbstractUnit unitFrom: AbstractUnit
) { ) {
val uiState = viewModel.mainFlow.collectAsStateWithLifecycle() val uiState = viewModel.mainFlow.collectAsStateWithLifecycle()
@ -225,9 +225,11 @@ fun RightSideScreen(
}, },
favoriteAction = { viewModel.favoriteUnit(it) }, favoriteAction = { viewModel.favoriteUnit(it) },
convertValue = { convertValue = {
Formatter.format( inputValue?.let {
unitFrom.convert(unit, inputValue, 3).toPlainString() Formatter.format(
) unitFrom.convert(unit, it, 3).toPlainString()
) + " "
} ?: ""
} }
) )
} }

2
app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt
View File

@ -183,5 +183,5 @@ fun UnitListItem(
isSelected = isSelected, isSelected = isSelected,
selectAction = selectAction, selectAction = selectAction,
favoriteAction = favoriteAction, favoriteAction = favoriteAction,
shortNameLabel = "${convertValue(unit)} ${stringResource(unit.shortName)}" shortNameLabel = "${convertValue(unit)}${stringResource(unit.shortName)}"
) )