fix: Fix issue #3244 (#3246)

* fix: Fix issue #3244 * feat: new Preview * feat: Test update * fix: changing maxPercentDifference on PaparazziScreenshotTest.kt * test:recorded new Screenshot * refactor: deleting paparazzi test transaction * refactor: rewrite of test image * fix: Fix Bugs due to local settings * fix: add screenshots changed --------- Co-authored-by: GIUSEPPE BARONE s332157 <s332157@studenti.polito.it>
Ivy-Apps · Jun 23, 2024 · d0225de · d0225de
1 parent 8f0360f
commit d0225de
Show file tree

Hide file tree

Showing 30 changed files with 57 additions and 5 deletions.
diff --git a/....ivy.accounts_AccountsTabPaparazziTest_snapshot accountTab composable[Dark].png b/....ivy.accounts_AccountsTabPaparazziTest_snapshot accountTab composable[Dark].png
diff --git a/...ivy.accounts_AccountsTabPaparazziTest_snapshot accountTab composable[Light].png b/...ivy.accounts_AccountsTabPaparazziTest_snapshot accountTab composable[Light].png
diff --git a/...ributions_AttributionsScreenPaparazziTest_snapshot Attribution Screen[Dark].png b/...ributions_AttributionsScreenPaparazziTest_snapshot Attribution Screen[Dark].png
diff --git a/...ibutions_AttributionsScreenPaparazziTest_snapshot Attribution Screen[Light].png b/...ibutions_AttributionsScreenPaparazziTest_snapshot Attribution Screen[Light].png
diff --git a/...y.categories_CategoriesScreenPaparazziTest_snapshot Categories Screen[Dark].png b/...y.categories_CategoriesScreenPaparazziTest_snapshot Categories Screen[Dark].png
diff --git a/....categories_CategoriesScreenPaparazziTest_snapshot Categories Screen[Light].png b/....categories_CategoriesScreenPaparazziTest_snapshot Categories Screen[Light].png
diff --git a/...tributors_ContributorsScreenPaparazziTest_snapshot Contributor Screen[Dark].png b/...tributors_ContributorsScreenPaparazziTest_snapshot Contributor Screen[Dark].png
diff --git a/...ributors_ContributorsScreenPaparazziTest_snapshot Contributor Screen[Light].png b/...ributors_ContributorsScreenPaparazziTest_snapshot Contributor Screen[Light].png
diff --git a/...s/images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_all checked[Dark].png b/...s/images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_all checked[Dark].png
diff --git a/.../images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_all checked[Light].png b/.../images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_all checked[Light].png
diff --git a/.../images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_none checked[Dark].png b/.../images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_none checked[Dark].png
diff --git a/...images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_none checked[Light].png b/...images/com.ivy.disclaimer_DisclaimerScreenPaparazziTest_none checked[Light].png
diff --git a/...rates_ExchangeRatesScreenPaparazziTest_snapshot Exchange Rates Screen[Dark].png b/...rates_ExchangeRatesScreenPaparazziTest_snapshot Exchange Rates Screen[Dark].png
diff --git a/...ates_ExchangeRatesScreenPaparazziTest_snapshot Exchange Rates Screen[Light].png b/...ates_ExchangeRatesScreenPaparazziTest_snapshot Exchange Rates 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/...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/...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/...hots/images/com.ivy.search_SearchPaparazziTest_snapshot Search Screen[Dark].png b/...hots/images/com.ivy.search_SearchPaparazziTest_snapshot Search Screen[Dark].png
diff --git a/...ots/images/com.ivy.search_SearchPaparazziTest_snapshot Search Screen[Light].png b/...ots/images/com.ivy.search_SearchPaparazziTest_snapshot Search 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/...images/com.ivy.ui.component_OpenSourceCardPaparazziTest_default state[Dark].png b/...images/com.ivy.ui.component_OpenSourceCardPaparazziTest_default state[Dark].png
diff --git a/...mages/com.ivy.ui.component_OpenSourceCardPaparazziTest_default state[Light].png b/...mages/com.ivy.ui.component_OpenSourceCardPaparazziTest_default state[Light].png
diff --git a/shared/ui/testing/src/main/java/com/ivy/ui/testing/PaparazziScreenshotTest.kt b/shared/ui/testing/src/main/java/com/ivy/ui/testing/PaparazziScreenshotTest.kt
@@ -4,14 +4,22 @@ import androidx.compose.runtime.Composable
 import app.cash.paparazzi.DeviceConfig
 import app.cash.paparazzi.Paparazzi
 import com.ivy.design.system.IvyMaterial3Theme
+import org.junit.Before
 import org.junit.Rule
+import java.util.Locale
 
 open class PaparazziScreenshotTest {
+
+    @Before
+    fun setup() {
+        Locale.setDefault(Locale.US)
+    }
+
     @get:Rule
     val paparazzi = Paparazzi(
         deviceConfig = DeviceConfig.PIXEL_6_PRO,
         showSystemUi = true,
-        maxPercentDifference = 0.001
+        maxPercentDifference = 0.005
     )
 
     protected fun snapshot(theme: PaparazziTheme, content: @Composable () -> Unit) {

diff --git a/.../images/com.ivy.ui.testing_DemoPaparazziTest_snapshot demo composable[Dark].png b/.../images/com.ivy.ui.testing_DemoPaparazziTest_snapshot demo composable[Dark].png
diff --git a/...images/com.ivy.ui.testing_DemoPaparazziTest_snapshot demo composable[Light].png b/...images/com.ivy.ui.testing_DemoPaparazziTest_snapshot demo composable[Light].png
diff --git a/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionCard.kt b/temp/legacy-code/src/main/java/com/ivy/legacy/ui/component/transaction/TransactionCard.kt
@@ -3,8 +3,11 @@ package com.ivy.legacy.ui.component.transaction
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -283,6 +286,7 @@ private fun ColumnScope.TransactionTags(tags: ImmutableList<LegacyTag>) {
     }
 }
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun TransactionHeaderRow(
     transaction: Transaction,
@@ -310,13 +314,13 @@ private fun TransactionHeaderRow(
             )
         }
     } else {
-        Row(
+        FlowRow(
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
             modifier = Modifier.padding(horizontal = 20.dp),
-            verticalAlignment = Alignment.CenterVertically
+            verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             if (category != null) {
                 CategoryBadgeDisplay(category, nav)
-                Spacer(Modifier.width(12.dp))
             }
 
             val account = account(
@@ -397,7 +401,7 @@ private fun TransactionBadge(
             .background(backgroundColor, UI.shapes.rFull)
             .clickable {
                 onClick()
-            },
+            }.padding(end = 10.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
         SpacerHor(width = 8.dp)
@@ -619,6 +623,46 @@ private fun PreviewUpcomingExpense() {
     }
 }
 
+@Preview
+@Composable
+private fun PreviewUpcomingExpenseBadgeSecondRow() {
+    IvyWalletPreview {
+        LazyColumn(Modifier.fillMaxSize()) {
+            val cash = Account(name = "Cash", Green.toArgb())
+            val food = Category(
+                name = NotBlankTrimmedString.unsafe("Food-Travel-Entertaiment-Food"),
+                color = ColorInt(Blue.toArgb()),
+                icon = null,
+                id = CategoryId(UUID.randomUUID()),
+                lastUpdated = Instant.EPOCH,
+                orderNum = 0.0,
+                removed = false,
+            )
+
+            item {
+                TransactionCard(
+                    baseData = AppBaseData(
+                        baseCurrency = "BGN",
+                        categories = persistentListOf(food),
+                        accounts = persistentListOf(cash)
+                    ),
+                    transaction = Transaction(
+                        accountId = cash.id,
+                        title = "Lidl pazar",
+                        categoryId = food.id.value,
+                        amount = 250.75.toBigDecimal(),
+                        dueDate = timeNowUTC().plusDays(5),
+                        dateTime = null,
+                        type = TransactionType.EXPENSE,
+                    ),
+                    onPayOrGet = {},
+                ) {
+                }
+            }
+        }
+    }
+}
+
 @Preview
 @Composable
 private fun PreviewOverdueExpense() {