Account Tab Decimal Formatting Added(Paparazzi snaps updated)

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

Hide file tree

Showing 20 changed files with 4 additions and 17 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/.../snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Dark].png b/.../snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Dark].png
diff --git a/...snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Light].png b/...snapshots/images/com.ivy.home_HomePaparazziTest_snapshot Home Screen[Light].png
diff --git a/.../com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Dark].png b/.../com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Dark].png
diff --git a/...com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Light].png b/...com.ivy.loans_LoanScreenPaparazziTest_snapshot loanScreen composable[Light].png
diff --git a/...s/com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Dark].png b/...s/com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Dark].png
diff --git a/.../com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Light].png b/.../com.ivy.report_ReportPaparazziTest_snapshot Report Screen no filter[Light].png
diff --git a/...y.transactions_TransactionsPaparazziTest_snapshot Transactions Screen[Dark].png b/...y.transactions_TransactionsPaparazziTest_snapshot Transactions Screen[Dark].png
diff --git a/....transactions_TransactionsPaparazziTest_snapshot Transactions Screen[Light].png b/....transactions_TransactionsPaparazziTest_snapshot Transactions 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,11 +38,8 @@ 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,7 +27,6 @@ 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")
@@ -79,7 +78,7 @@ fun BalanceRowMini(
     )
 }
 
-@SuppressLint("CoroutineCreationDuringComposition")
+@SuppressLint("CoroutineCreationDuringComposition", "DefaultLocale")
 @Composable
 fun BalanceRow(
     currency: String,
@@ -96,7 +95,7 @@ fun BalanceRow(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     var formattedBalance by remember {
-        mutableStateOf(balance.toDecimalFormatWithDecimalPlaces(context))
+        mutableStateOf(String.format("%.2f", balance))
     }
     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,7 +22,6 @@ 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")
@@ -73,7 +72,7 @@ fun AmountCurrencyB1Row(
     }
 }
 
-@SuppressLint("ComposeContentEmitterReturningValues", "CoroutineCreationDuringComposition")
+@SuppressLint("ComposeContentEmitterReturningValues", "CoroutineCreationDuringComposition", "DefaultLocale")
 @Composable
 fun AmountCurrencyB1(
     amount: Double,
@@ -84,7 +83,7 @@ fun AmountCurrencyB1(
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
-    var formattedAmount by remember { mutableStateOf(amount.toDecimalFormatWithDecimalPlaces(context)) }
+    var formattedAmount by remember { mutableStateOf(String.format("%.2f", amount)) }
     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,14 +206,6 @@ 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