From c606328587168a82c0d1ae8e56e6ad6e6d01fe88 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Thu, 2 May 2024 23:09:29 +0200 Subject: [PATCH] fix(converter): Update output after conversion --- .../numberhub/data/converter/UnitsRepositoryImpl.kt | 4 +++- .../numberhub/feature/converter/ConverterViewModel.kt | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt b/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt index 8b897f9d..4931cb0a 100644 --- a/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt +++ b/data/converter/src/main/java/app/myzel394/numberhub/data/converter/UnitsRepositoryImpl.kt @@ -342,7 +342,9 @@ class UnitsRepositoryImpl @Inject constructor( val conversion = unitFrom.convert(unitTo, value) ConverterResult.NumberBase(conversion) - } catch (e: Exception) { + } catch (error: Exception) { + Log.e("UnitsRepositoryImpl", "Failed to convert number base $unitFromId -> $unitToId: $error") + error.printStackTrace() ConverterResult.Error.ConversionError } } diff --git a/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt b/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt index c8657388..1da86f37 100644 --- a/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt +++ b/feature/converter/src/main/java/app/myzel394/numberhub/feature/converter/ConverterViewModel.kt @@ -23,6 +23,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import app.myzel394.numberhub.core.base.OutputFormat +import app.myzel394.numberhub.core.base.Token import app.myzel394.numberhub.core.ui.common.textfield.getTextField import app.myzel394.numberhub.data.common.combine import app.myzel394.numberhub.data.common.stateIn @@ -175,11 +176,13 @@ internal class ConverterViewModel @Inject constructor( fun convertNumberBase() { conversionJob?.cancel() conversionJob = viewModelScope.launch { - unitsRepo.convertNumberBase( + val result = unitsRepo.convertNumberBase( unitFromId = unitFromId.value ?: return@launch, unitToId = unitToId.value ?: return@launch, - value = input1.value.text, + value = input1.value.text.ifEmpty { Token.Digit._0 } ) + + output.update { result } } }