fix ui artifact after deleting last item in page

ARK-Builders · May 23, 2024 · 067c490 · 067c490
1 parent 9b56ab2
commit 067c490
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 26 deletions.
diff --git a/app/src/main/java/dev/arkbuilders/rate/data/db/PairAlertRepo.kt b/app/src/main/java/dev/arkbuilders/rate/data/db/PairAlertRepo.kt
@@ -72,7 +72,7 @@ private fun RoomPairAlert.toCondition() = PairAlert(
     enabled,
     priceNotPercent,
     triggered,
-    OffsetDateTime.parse(lastDateTriggered),
+    lastDateTriggered?.let { OffsetDateTime.parse(lastDateTriggered) },
     group
 )
 

diff --git a/app/src/main/java/dev/arkbuilders/rate/presentation/pairalert/AddPairAlertScreen.kt b/app/src/main/java/dev/arkbuilders/rate/presentation/pairalert/AddPairAlertScreen.kt
@@ -356,7 +356,7 @@ private fun EditCondition(
             if (state.priceOrPercent.isRight() && !state.oneTimeNotRecurrent) {
                 Text(
                     modifier = Modifier.align(Alignment.CenterVertically),
-                    text = "every",
+                    text = "every ",
                     fontSize = 20.sp,
                     fontWeight = FontWeight.Medium,
                     color = ArkColor.TextPrimary

diff --git a/app/src/main/java/dev/arkbuilders/rate/presentation/portfolio/PortfolioScreen.kt b/app/src/main/java/dev/arkbuilders/rate/presentation/portfolio/PortfolioScreen.kt
@@ -12,6 +12,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.Button
@@ -139,25 +141,27 @@ private fun GroupPage(
     val total = amounts.fold(0.0) { acc, amount ->
         acc + amount.baseAmount.amount
     }
-    Column(
+    LazyColumn(
         modifier = Modifier.fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(
-            modifier = Modifier.padding(top = 32.dp),
-            text = "Total Assets",
-            color = ArkColor.TextTertiary,
-            fontWeight = FontWeight.Medium
-        )
-        Text(
-            modifier = Modifier.padding(top = 8.dp),
-            text = "${CurrUtils.prepareToDisplay(total)} $baseCode",
-            color = ArkColor.TextPrimary,
-            fontWeight = FontWeight.SemiBold,
-            fontSize = 36.sp
-        )
-        AppHorDiv16(Modifier.padding(top = 32.dp))
-        amounts.forEach {
+        item {
+            Text(
+                modifier = Modifier.padding(top = 32.dp),
+                text = "Total Assets",
+                color = ArkColor.TextTertiary,
+                fontWeight = FontWeight.Medium
+            )
+            Text(
+                modifier = Modifier.padding(top = 8.dp),
+                text = "${CurrUtils.prepareToDisplay(total)} $baseCode",
+                color = ArkColor.TextPrimary,
+                fontWeight = FontWeight.SemiBold,
+                fontSize = 36.sp
+            )
+            AppHorDiv16(Modifier.padding(top = 32.dp))
+        }
+        items(amounts) {
             AppSwipeToDismiss(
                 content = { CurrencyItem(it) },
                 onDelete = { onDelete(it.amount) }

diff --git a/app/src/main/java/dev/arkbuilders/rate/presentation/quick/QuickScreen.kt b/app/src/main/java/dev/arkbuilders/rate/presentation/quick/QuickScreen.kt
@@ -157,14 +157,16 @@ private fun GroupPage(
     quickPairs: List<DisplayQuickPair>,
     onDelete: (QuickPair) -> Unit
 ) {
-    Column(modifier = Modifier.fillMaxSize()) {
-        Text(
-            modifier = Modifier.padding(start = 16.dp, top = 24.dp),
-            text = "Pairs",
-            color = ArkColor.TextTertiary,
-            fontWeight = FontWeight.Medium
-        )
-        quickPairs.forEach {
+    LazyColumn(modifier = Modifier.fillMaxSize()) {
+        item {
+            Text(
+                modifier = Modifier.padding(start = 16.dp, top = 24.dp),
+                text = "Pairs",
+                color = ArkColor.TextTertiary,
+                fontWeight = FontWeight.Medium
+            )
+        }
+        items(quickPairs) {
             AppHorDiv16()
             AppSwipeToDismiss(
                 content = { QuickItem(it) },