Account Tab Decimal Formatting Added(detekt issue fixed)

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

Hide file tree

Showing 17 changed files with 18 additions and 4 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/.../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/...hots/images/com.ivy.report_ReportPaparazziTest_snapshot Report Screen[Dark].png b/...hots/images/com.ivy.report_ReportPaparazziTest_snapshot Report Screen[Dark].png
diff --git a/...ots/images/com.ivy.report_ReportPaparazziTest_snapshot Report Screen[Light].png b/...ots/images/com.ivy.report_ReportPaparazziTest_snapshot Report Screen[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/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.toDecimalFormatWithFraction
 import kotlinx.coroutines.launch
 
 @Deprecated("Old design system. Use `:ivy-design` and Material3")
@@ -78,7 +79,7 @@ fun BalanceRowMini(
     )
 }
 
-@SuppressLint("CoroutineCreationDuringComposition", "DefaultLocale")
+@SuppressLint("CoroutineCreationDuringComposition")
 @Composable
 fun BalanceRow(
     currency: String,
@@ -95,7 +96,7 @@ fun BalanceRow(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     var formattedBalance by remember {
-        mutableStateOf(String.format("%.2f", balance))
+        mutableStateOf(balance.toDecimalFormatWithFraction())
     }
     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.toDecimalFormatWithFraction
 import kotlinx.coroutines.launch
 
 @Deprecated("Old design system. Use `:ivy-design` and Material3")
@@ -72,7 +73,7 @@ fun AmountCurrencyB1Row(
     }
 }
 
-@SuppressLint("ComposeContentEmitterReturningValues", "CoroutineCreationDuringComposition", "DefaultLocale")
+@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(String.format("%.2f", amount)) }
+    var formattedAmount by remember { mutableStateOf(amount.toDecimalFormatWithFraction()) }
     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
@@ -6,6 +6,8 @@ import com.ivy.wallet.domain.data.IvyCurrency
 import dagger.hilt.EntryPoints
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
+import java.text.NumberFormat
+import java.util.Locale
 import kotlin.math.abs
 import kotlin.math.log10
 import kotlin.math.truncate
@@ -206,6 +208,16 @@ suspend fun Double.toDecimalFormat(context: Context): String {
     return useCase.format(this)
 }
 
+fun Double.toDecimalFormatWithFraction(fraction: Int = 2): String {
+    val defaultLocale: Locale = Locale.getDefault()
+
+    // Create a NumberFormat instance for the current locale
+    val numberFormat: NumberFormat = NumberFormat.getNumberInstance(defaultLocale)
+    numberFormat.minimumFractionDigits = fraction
+    numberFormat.maximumFractionDigits = fraction
+    return numberFormat.format(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