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

Fix batch converter for negative values

Browse Source
This commit is contained in:
Sad Ellie 2023-09-15 10:28:54 +03:00
parent 47a8800206
commit 532931914e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterViewModel.kt
View File

@ -183,7 +183,7 @@ internal class ConverterViewModel @Inject constructor(
unitTo = unitTo, unitTo = unitTo,
sorting = prefs.unitConverterSorting, sorting = prefs.unitConverterSorting,
favorites = prefs.unitConverterFavoritesOnly, favorites = prefs.unitConverterFavoritesOnly,
input = calculation?.toPlainString() ?: input.text, input = (calculation?.toPlainString() ?: input.text).replace(Token.Operator.minus, "-"),
scale = prefs.precision, scale = prefs.precision,
outputFormat = prefs.outputFormat, outputFormat = prefs.outputFormat,
formatterSymbols = AllFormatterSymbols.getById(prefs.separator), formatterSymbols = AllFormatterSymbols.getById(prefs.separator),

8
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt
View File

@ -110,7 +110,6 @@ private fun RightSideScreen(
} }
items(units, { it.id }) { items(units, { it.id }) {
BasicUnitListItem( BasicUnitListItem(
modifier = Modifier.animateItemPlacement(), modifier = Modifier.animateItemPlacement(),
name = stringResource(it.displayName), name = stringResource(it.displayName),
@ -154,11 +153,10 @@ private fun formatUnitToSupportLabel(
formatterSymbols: FormatterSymbols, formatterSymbols: FormatterSymbols,
readyCurrencies: Boolean, readyCurrencies: Boolean,
): String { ): String {
try { if ((unitFrom?.group == UnitGroup.CURRENCY) and !readyCurrencies) return shortName
if ((unitFrom?.group == UnitGroup.CURRENCY) and !readyCurrencies) { if (input.isEmpty()) return shortName
return shortName
}
try {
if ((unitFrom is DefaultUnit) and (unitTo is DefaultUnit)) { if ((unitFrom is DefaultUnit) and (unitTo is DefaultUnit)) {
unitFrom as DefaultUnit unitFrom as DefaultUnit
unitTo as DefaultUnit unitTo as DefaultUnit