Account Tab Decimal Formatting Added(Detekt issues Fixed + Paparazzi …

…snapshots updated)
Ivy-Apps · Oct 6, 2024 · 2064dbd · 2064dbd
1 parent 7af02ae
commit 2064dbd
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 41 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/screen/categories/src/main/java/com/ivy/categories/CategoriesScreen.kt b/screen/categories/src/main/java/com/ivy/categories/CategoriesScreen.kt
@@ -549,9 +549,7 @@ private fun CategoryHeader(
 
             balanceFontSize = 30.sp,
             currencyFontSize = 30.sp,
-
-            currencyUpfront = false,
-            balanceAmountPrefix = balancePrefixValue
+            currencyUpfront = false
         )
 
         Spacer(Modifier.height(16.dp))

diff --git a/screen/home/src/main/java/com/ivy/home/HomeHeader.kt b/screen/home/src/main/java/com/ivy/home/HomeHeader.kt
@@ -174,7 +174,6 @@ private fun HeaderStickyRow(
                         },
                     currency = currency,
                     balance = balance,
-                    shortenBigNumbers = true,
                     hiddenMode = hideBalance,
                     doubleRowDisplay = true,
                 )
@@ -249,7 +248,6 @@ fun CashFlowInfo(
                 .testTag("home_balance"),
             currency = currency,
             balance = balance,
-            shortenBigNumbers = true,
             hiddenMode = hideBalance
         )
 
@@ -416,7 +414,6 @@ private fun RowScope.HeaderCard(
                 currency = currency,
                 textColor = textColor,
                 hideIncome = hideIncome,
-                shortenBigNumbers = true,
             )
 
             Spacer(Modifier.width(4.dp))

diff --git a/screen/reports/src/main/java/com/ivy/reports/ReportScreen.kt b/screen/reports/src/main/java/com/ivy/reports/ReportScreen.kt
@@ -158,11 +158,7 @@ private fun BoxWithConstraintsScope.UI(
                     .padding(start = 32.dp),
                 textColor = UI.colors.pureInverse,
                 currency = state.baseCurrency,
-                balance = state.balance,
-                balanceAmountPrefix = when {
-                    state.balance > 0 -> "+"
-                    else -> null
-                }
+                balance = state.balance
             )
 
             Spacer(Modifier.height(20.dp))

diff --git a/screen/transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt b/screen/transactions/src/main/java/com/ivy/transactions/TransactionsScreen.kt
@@ -57,7 +57,6 @@ import com.ivy.legacy.ivyWalletCtx
 import com.ivy.legacy.ui.component.IncomeExpensesCards
 import com.ivy.legacy.ui.component.ItemStatisticToolbar
 import com.ivy.legacy.ui.component.transaction.transactions
-import com.ivy.legacy.utils.balancePrefix
 import com.ivy.legacy.utils.clickableNoIndication
 import com.ivy.legacy.utils.horizontalSwipeListener
 import com.ivy.legacy.utils.rememberInteractionSource
@@ -641,15 +640,7 @@ private fun Header(
                 },
             textColor = contrastColor,
             currency = currency,
-            balance = balance,
-            balanceAmountPrefix = if (category != null) {
-                balancePrefix(
-                    income = income,
-                    expenses = expenses
-                )
-            } else {
-                null
-            }
+            balance = balance
         )
 
         if (currency != baseCurrency && balanceBaseCurrency != null) {
@@ -661,15 +652,7 @@ private fun Header(
                     },
                 textColor = itemColor.dynamicContrast(),
                 currency = baseCurrency,
-                balance = balanceBaseCurrency,
-                balanceAmountPrefix = if (category != null) {
-                    balancePrefix(
-                        income = income,
-                        expenses = expenses
-                    )
-                } else {
-                    null
-                }
+                balance = balanceBaseCurrency
             )
         }
 

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
@@ -36,9 +36,7 @@ fun BalanceRowMedium(
     balance: Double,
     modifier: Modifier = Modifier,
     textColor: Color = UI.colors.pureInverse,
-    balanceAmountPrefix: String? = null,
     currencyUpfront: Boolean = true,
-    shortenBigNumbers: Boolean = false,
     hiddenMode: Boolean = false,
 ) {
     BalanceRow(
@@ -61,9 +59,7 @@ fun BalanceRowMini(
     balance: Double,
     modifier: Modifier = Modifier,
     textColor: Color = UI.colors.pureInverse,
-    balanceAmountPrefix: String? = null,
     currencyUpfront: Boolean = true,
-    shortenBigNumbers: Boolean = false,
     hiddenMode: Boolean = false,
     doubleRowDisplay: Boolean = false,
 ) {
@@ -99,7 +95,7 @@ fun BalanceRow(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     var formattedBalance by remember {
-        mutableStateOf("")
+        mutableStateOf("$balance")
     }
     scope.launch {
         formattedBalance = balance.toDecimalFormat(context)
@@ -218,8 +214,7 @@ private fun Preview_Medium() {
         BalanceRowMedium(
             textColor = UI.colors.pureInverse,
             currency = "BGN",
-            balance = 3520.60,
-            balanceAmountPrefix = null
+            balance = 3520.60
         )
     }
 }
@@ -231,9 +226,7 @@ private fun Preview_Mini() {
         BalanceRowMini(
             textColor = UI.colors.pureInverse,
             currency = "BGN",
-            balance = 3520.60,
-            balanceAmountPrefix = null,
-            shortenBigNumbers = true
+            balance = 3520.60
         )
     }
 }
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
@@ -83,7 +83,7 @@ fun AmountCurrencyB1(
 ) {
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
-    var formattedAmount by remember { mutableStateOf("") }
+    var formattedAmount by remember { mutableStateOf("$amount") }
     scope.launch {
         formattedAmount = amount.toDecimalFormat(context)
     }