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

Fixed batch conversion

Browse Source
This commit is contained in:
Sad Ellie 2023-01-29 12:53:29 +04:00
parent 541e13908b
commit 6fcb600ed2
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt
View File

@ -66,20 +66,16 @@ internal fun RightSideScreen(
val uiState = viewModel.mainFlow.collectAsStateWithLifecycle()
val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(rememberTopAppBarState())
val focusManager = LocalFocusManager.current
val inputAsBigDecimal: BigDecimal? = try {
inputValue.toBigDecimal()
} catch (e: NumberFormatException) {
null
}
val convertMethod: (AbstractUnit) -> String = when {
unitFrom.group == UnitGroup.NUMBER_BASE -> {{
convertForSecondaryNumberBase(inputValue, unitFrom as NumberBaseUnit, it as NumberBaseUnit)
}}
inputAsBigDecimal != null -> {{
convertForSecondary(inputAsBigDecimal, unitFrom, it)
}}
else -> {{""}}
val convertMethod: (AbstractUnit) -> String = try {
val inputAsBigDecimal = BigDecimal(inputValue)
if (unitFrom.group == UnitGroup.NUMBER_BASE) {
{ (convertForSecondaryNumberBase(inputValue, unitFrom, it)) }
} else {
{ convertForSecondary(inputAsBigDecimal, unitFrom, it) }
}
} catch(e: Exception) {
{ "" }
}
Scaffold(
@ -141,10 +137,12 @@ private fun convertForSecondary(inputValue: BigDecimal, unitFrom: AbstractUnit,
) + " "
}
private fun convertForSecondaryNumberBase(inputValue: String, unitFrom: NumberBaseUnit, unitTo: NumberBaseUnit): String {
private fun convertForSecondaryNumberBase(inputValue: String, unitFrom: AbstractUnit, unitTo: AbstractUnit): String {
return try {
unitFrom.convertToBase(inputValue, unitTo.base) + " "
(unitFrom as NumberBaseUnit).convertToBase(inputValue, (unitTo as NumberBaseUnit).base) + " "
} catch (e: NumberFormatException) {
""
} catch (e: ClassCastException) {
""
}
}