From 6b45eb7becd90092994cda85047707085df6c553 Mon Sep 17 00:00:00 2001
From: Sad Ellie <sadellie.dev@gmail.com>
Date: Wed, 22 Feb 2023 19:28:41 +0400
Subject: [PATCH] Format output in calculator

---
 .../sadellie/unitto/feature/calculator/CalculatorScreen.kt  | 3 ++-
 .../unitto/feature/calculator/components/HistoryList.kt     | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
index c26fb99f..90b56027 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
@@ -63,6 +63,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.sadellie.unitto.core.ui.common.MenuButton
 import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar
+import com.sadellie.unitto.core.ui.Formatter
 import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium
 import com.sadellie.unitto.data.model.HistoryItem
 import com.sadellie.unitto.feature.calculator.components.CalculatorKeyboard
@@ -215,7 +216,7 @@ private fun CalculatorScreen(
                         modifier = Modifier
                             .fillMaxWidth()
                             .padding(horizontal = 8.dp),
-                        text = uiState.output,
+                        text = Formatter.format(uiState.output),
                         textAlign = TextAlign.End,
                         softWrap = false,
                         color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
index 9cd1c009..3391fece 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
@@ -44,6 +44,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.sadellie.unitto.core.ui.Formatter
 import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium
 import com.sadellie.unitto.data.model.HistoryItem
 import com.sadellie.unitto.feature.calculator.R
@@ -96,7 +97,8 @@ internal fun HistoryList(
             items(historyItems.drop(1)) { historyItem ->
                 HistoryListItem(
                     modifier = Modifier.padding(horizontal = 8.dp),
-                    historyItem = historyItem)
+                    historyItem = historyItem
+                )
             }
         }
     }
@@ -119,7 +121,7 @@ private fun HistoryListItem(
             textAlign = TextAlign.End
         )
         Text(
-            text = historyItem.result,
+            text = Formatter.format(historyItem.result),
             maxLines = 1,
             modifier = Modifier
                 .fillMaxWidth()