From 8f8df3ce80e71b66b3e851d34e89b5d654451371 Mon Sep 17 00:00:00 2001
From: Thomas Andres Gomez <andres.gomez.thomas@gmail.com>
Date: Tue, 21 Oct 2025 11:39:53 +0200
Subject: [PATCH] Fix a small display issue.

---
 .../chocolate/ui/screen/MainScreen.kt         | 12 +++++------
 .../chocolate/ui/screen/MainViewModel.kt      | 20 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/pixelized/chocolate/ui/screen/MainScreen.kt b/app/src/main/java/com/pixelized/chocolate/ui/screen/MainScreen.kt
index b769f25..97223f2 100644
--- a/app/src/main/java/com/pixelized/chocolate/ui/screen/MainScreen.kt
+++ b/app/src/main/java/com/pixelized/chocolate/ui/screen/MainScreen.kt
@@ -313,7 +313,7 @@ private fun MainContent(
                                 withStyle(packageStyleSpan) {
                                     append("Forfait IS (")
                                     append(it.packageISInput)
-                                    append(") : ")
+                                    append("€) : ")
                                 }
                                 withStyle(amountStyleSpan) { append("${it.packageISValue}") }
                             },
@@ -324,7 +324,7 @@ private fun MainContent(
                                 withStyle(packageStyleSpan) {
                                     append("Forfait 2B (")
                                     append(it.package2BInput)
-                                    append(") : ")
+                                    append("€) : ")
                                 }
                                 withStyle(amountStyleSpan) { append("${it.package2BValue}") }
                             },
@@ -335,7 +335,7 @@ private fun MainContent(
                                 withStyle(packageStyleSpan) {
                                     append("Forfait IS (")
                                     append(it.packageISInput)
-                                    append(") : ")
+                                    append("€) : ")
                                 }
                                 withStyle(amountStyleSpan) { append("${it.packageISValue}") }
                             },
@@ -412,11 +412,11 @@ private fun MainContentPreview() {
                     listOf(
                         MainScreenResult(
                             id = "0-1",
-                            packageISInput = "77.29€",
+                            packageISInput = "77.29",
                             packageISValue = 3,
-                            package2BInput = "96.26€",
+                            package2BInput = "96.26",
                             package2BValue = 80,
-                            packageFAInput = "107.97€",
+                            packageFAInput = "107.97",
                             packageFAValue = 64,
                             result = 14841.52,
                             delta = 0.0,
diff --git a/app/src/main/java/com/pixelized/chocolate/ui/screen/MainViewModel.kt b/app/src/main/java/com/pixelized/chocolate/ui/screen/MainViewModel.kt
index 89cd2d7..167ead2 100644
--- a/app/src/main/java/com/pixelized/chocolate/ui/screen/MainViewModel.kt
+++ b/app/src/main/java/com/pixelized/chocolate/ui/screen/MainViewModel.kt
@@ -91,27 +91,27 @@ class MainViewModel @Inject constructor() : ViewModel() {
         precision: Double = 10.0.pow(DECIMALS),
     ) {
         val input = expected.value(precision)
-        if (input == null) {
+        if (input == null || input <= 0) {
             expected.errorFlow.value = true
             return
         }
 
         val valueIS = packageIS.value(precision)
-        if (valueIS == null) {
+        if (valueIS == null || valueIS <= 0) {
             packageIS.errorFlow.value = true
             return
         }
         val maxIS = (input / valueIS) + 1
 
         val value2B = package2B.value(precision)
-        if (value2B == null) {
+        if (value2B == null || value2B <= 0) {
             package2B.errorFlow.value = true
             return
         }
         val max2B = (input / value2B) + 1
 
         val valueFA = packageFA.value(precision)
-        if (valueFA == null) {
+        if (valueFA == null || valueFA <= 0) {
             packageFA.errorFlow.value = true
             return
         }
@@ -161,11 +161,11 @@ class MainViewModel @Inject constructor() : ViewModel() {
                                 _results.value = listOf(
                                     MainScreenResult(
                                         id = "$delta-0",
-                                        packageISInput = inputs.value.packageIS.labelFlow.value ?: "",
+                                        packageISInput = inputs.value.packageIS.valueFlow.value,
                                         packageISValue = indexIS,
-                                        package2BInput = inputs.value.package2B.labelFlow.value ?: "",
+                                        package2BInput = inputs.value.package2B.valueFlow.value,
                                         package2BValue = index2B,
-                                        packageFAInput = inputs.value.packageFA.labelFlow.value ?: "",
+                                        packageFAInput = inputs.value.packageFA.valueFlow.value,
                                         packageFAValue = indexFA,
                                         result = previousResult / precision,
                                         delta = delta,
@@ -179,11 +179,11 @@ class MainViewModel @Inject constructor() : ViewModel() {
                                     list.add(
                                         MainScreenResult(
                                             id = "$delta-${list.size}",
-                                            packageISInput = inputs.value.packageIS.labelFlow.value ?: "",
+                                            packageISInput = inputs.value.packageIS.valueFlow.value,
                                             packageISValue = indexIS,
-                                            package2BInput = inputs.value.package2B.labelFlow.value ?: "",
+                                            package2BInput = inputs.value.package2B.valueFlow.value,
                                             package2BValue = index2B,
-                                            packageFAInput = inputs.value.packageFA.labelFlow.value ?: "",
+                                            packageFAInput = inputs.value.packageFA.valueFlow.value,
                                             packageFAValue = indexFA,
                                             result = previousResult / precision,
                                             delta = delta,