Account Tab Decimal Formatting Added(Paparazzi snaps updated)

Ivy-Apps · Oct 6, 2024 · d801d81 · d801d81
1 parent 040b94f
commit d801d81
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 3 deletions.
diff --git a/...ounts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Dark].png b/...ounts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Dark].png
diff --git a/...unts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Light].png b/...unts_AccountsTabPaparazziTest_snapshot accountTab compact composable[Light].png
diff --git a/...ts_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Dark].png b/...ts_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Dark].png
diff --git a/...s_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Light].png b/...s_AccountsTabPaparazziTest_snapshot accountTab nonCompact composable[Light].png
diff --git a/...enPaparazziTest_snapshot Categories nonCompact Screen with search bar[Dark].png b/...enPaparazziTest_snapshot Categories nonCompact Screen with search bar[Dark].png
diff --git a/...nPaparazziTest_snapshot Categories nonCompact Screen with search bar[Light].png b/...nPaparazziTest_snapshot Categories nonCompact Screen with search bar[Light].png
diff --git a/...s_CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Dark].png b/...s_CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Dark].png
diff --git a/..._CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Light].png b/..._CategoriesScreenPaparazziTest_snapshot Categories nonCompact Screen[Light].png
diff --git a/shared/ui/core/src/main/java/com/ivy/ui/FormatMoneyUseCase.kt b/shared/ui/core/src/main/java/com/ivy/ui/FormatMoneyUseCase.kt
@@ -38,8 +38,11 @@ class FormatMoneyUseCaseImpl @Inject constructor(
             false -> withoutDecimalFormatter.format(value)
         }
     }
+
+    override fun formatWithDecimalPlaces(value: Double): String = withDecimalFormatter.format(value)
 }
 
 interface FormatMoneyUseCase {
     suspend fun format(value: Double): String
+    fun formatWithDecimalPlaces(value: Double): String
 }
diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BalanceRow.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/components/BalanceRow.kt
@@ -27,6 +27,7 @@ import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.legacy.IvyWalletComponentPreview
 import com.ivy.legacy.utils.toDecimalFormat
+import com.ivy.legacy.utils.toDecimalFormatWithDecimalPlaces
 import kotlinx.coroutines.launch
 
 @Deprecated("Old design system. Use `:ivy-design` and Material3")
@@ -95,7 +96,7 @@ fun BalanceRow(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     var formattedBalance by remember {
-        mutableStateOf("$balance")
+        mutableStateOf(balance.toDecimalFormatWithDecimalPlaces(context))
     }
     scope.launch {
         formattedBalance = balance.toDecimalFormat(context)

diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/legacy/ui/theme/wallet/AmountCurrency.kt
@@ -22,6 +22,7 @@ import com.ivy.design.l0_system.UI
 import com.ivy.design.l0_system.style
 import com.ivy.legacy.utils.format
 import com.ivy.legacy.utils.toDecimalFormat
+import com.ivy.legacy.utils.toDecimalFormatWithDecimalPlaces
 import kotlinx.coroutines.launch
 
 @Deprecated("Old design system. Use `:ivy-design` and Material3")
@@ -72,7 +73,7 @@ fun AmountCurrencyB1Row(
     }
 }
 
-@SuppressLint("ComposeContentEmitterReturningValues","CoroutineCreationDuringComposition")
+@SuppressLint("ComposeContentEmitterReturningValues", "CoroutineCreationDuringComposition")
 @Composable
 fun AmountCurrencyB1(
     amount: Double,
@@ -83,7 +84,7 @@ fun AmountCurrencyB1(
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
-    var formattedAmount by remember { mutableStateOf("$amount") }
+    var formattedAmount by remember { mutableStateOf(amount.toDecimalFormatWithDecimalPlaces(context)) }
     scope.launch {
         formattedAmount = amount.toDecimalFormat(context)
     }

diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/utils/AmountFormatting.kt
@@ -206,6 +206,14 @@ suspend fun Double.toDecimalFormat(context: Context): String {
     return useCase.format(this)
 }
 
+fun Double.toDecimalFormatWithDecimalPlaces(context: Context): String {
+    val appContext = context.applicationContext ?: error("Application Context Not Found")
+    val entryPoint =
+        EntryPoints.get(appContext, FormatMoneyUseCaseImpl.FormatMoneyUseCaseEntryPoint::class.java)
+    val useCase = entryPoint.FormatMoneyUseCase()
+    return useCase.formatWithDecimalPlaces(this)
+}
+
 /**
 toInt on numbers in the range (-1.0, 0.0) (exclusive of boundaries) will produce a positive int 0
 So, this function append negative sign in that case