WIP: Prototype almost done (ugly code!)

Ivy-Apps · Apr 15, 2023 · 0b851db · 0b851db
1 parent d0d31cb
commit 0b851db
Show file tree

Hide file tree

Showing 6 changed files with 385 additions and 19 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/csv/CSVEvent.kt b/app/src/main/java/com/ivy/wallet/ui/csv/CSVEvent.kt
@@ -16,6 +16,8 @@ sealed interface CSVEvent {
 
     data class MapToAccount(val index: Int, val name: String) : CSVEvent
     data class MapToAccountCurrency(val index: Int, val name: String) : CSVEvent
+    data class MapToAmount(val index: Int, val name: String) : CSVEvent
+    data class ToAmountMetaChange(val multiplier: Int) : CSVEvent
 
     data class MapCategory(val index: Int, val name: String) : CSVEvent
     data class MapTitle(val index: Int, val name: String) : CSVEvent

diff --git a/app/src/main/java/com/ivy/wallet/ui/csv/CSVScreen.kt b/app/src/main/java/com/ivy/wallet/ui/csv/CSVScreen.kt
@@ -259,7 +259,9 @@ fun LazyListScope.importantFields(
         status = importantFields.amountStatus,
         onMapTo = { index, name -> onEvent(CSVEvent.MapAmount(index, name)) },
         metadataContent = { multiplier ->
-            AmountMetadata(multiplier = multiplier, onEvent = onEvent)
+            AmountMetadata(multiplier = multiplier, onMetaChange = {
+                onEvent(CSVEvent.AmountMultiplier(it))
+            })
         }
     )
     mappingRow(
@@ -297,18 +299,16 @@ fun LazyListScope.importantFields(
 @Composable
 private fun AmountMetadata(
     multiplier: Int,
-    onEvent: (CSVEvent) -> Unit,
+    onMetaChange: (Int) -> Unit,
 ) {
     Row(verticalAlignment = Alignment.CenterVertically) {
         Button(onClick = {
-            onEvent(
-                CSVEvent.AmountMultiplier(
-                    when {
-                        multiplier < 0 -> multiplier * 10
-                        multiplier == 1 -> -10
-                        else -> multiplier / 10
-                    }
-                )
+            onMetaChange(
+                when {
+                    multiplier < 0 -> multiplier * 10
+                    multiplier == 1 -> -10
+                    else -> multiplier / 10
+                }
             )
         }) {
             Text(text = "/10")
@@ -325,15 +325,13 @@ private fun AmountMetadata(
         )
         Spacer8(horizontal = true)
         Button(onClick = {
-            onEvent(
-                CSVEvent.AmountMultiplier(
-                    when {
-                        multiplier == -10 -> 1
-                        multiplier == -1 -> 10
-                        multiplier > 0 -> multiplier * 10
-                        else -> multiplier / 10
-                    }
-                )
+            onMetaChange(
+                when {
+                    multiplier == -10 -> 1
+                    multiplier == -1 -> 10
+                    multiplier > 0 -> multiplier * 10
+                    else -> multiplier / 10
+                }
             )
         }) {
             Text(text = "*10")
@@ -454,6 +452,17 @@ fun LazyListScope.transferFields(
         status = transferFields.toAccountCurrencyStatus,
         onMapTo = { index, name -> onEvent(CSVEvent.MapToAccountCurrency(index, name)) },
     )
+    mappingRow(
+        columns = columns,
+        mapping = transferFields.toAmount,
+        status = transferFields.toAmountStatus,
+        onMapTo = { index, name -> onEvent(CSVEvent.MapToAmount(index, name)) },
+        metadataContent = { multiplier ->
+            AmountMetadata(multiplier = multiplier, onMetaChange = {
+                onEvent(CSVEvent.ToAmountMetaChange(it))
+            })
+        }
+    )
 }
 
 fun LazyListScope.optionalFields(

diff --git a/app/src/main/java/com/ivy/wallet/ui/csv/CSVState.kt b/app/src/main/java/com/ivy/wallet/ui/csv/CSVState.kt
@@ -37,6 +37,8 @@ data class TransferFields(
     val toAccountStatus: MappingStatus,
     val toAccountCurrency: ColumnMapping<Unit>,
     val toAccountCurrencyStatus: MappingStatus,
+    val toAmount: ColumnMapping<Int>,
+    val toAmountStatus: MappingStatus,
 )
 
 data class OptionalFields(

diff --git a/app/src/main/java/com/ivy/wallet/ui/csv/CSVViewModel.kt b/app/src/main/java/com/ivy/wallet/ui/csv/CSVViewModel.kt
@@ -21,6 +21,7 @@ import javax.inject.Inject
 @HiltViewModel
 class CSVViewModel @Inject constructor(
     private val fileReader: IvyFileReader,
+    private val csvImporterV2: CSVImporterV2,
 ) : ViewModel() {
 
     private var columns by mutableStateOf<CSVRow?>(null)
@@ -124,6 +125,19 @@ class CSVViewModel @Inject constructor(
             metadata = Unit,
         )
     )
+    private var toAmount by mutableStateOf(
+        ColumnMapping(
+            ivyColumn = "To Amount",
+            helpInfo = """
+                The amount that the "To Account" will receive".
+                Skip it if there's no such.
+            """.trimIndent(),
+            name = "",
+            index = -1,
+            required = false,
+            metadata = 1,
+        )
+    )
     // endregion
 
     // region Optional fields
@@ -237,6 +251,8 @@ class CSVViewModel @Inject constructor(
                             toAccountCurrency,
                             ::parseToAccountCurrency
                         ),
+                        toAmount = toAmount,
+                        toAmountStatus = sampleCSV.parseStatus(toAmount, ::parseAmount)
                     )
                 } else null
             }
@@ -346,6 +362,17 @@ class CSVViewModel @Inject constructor(
                 )
             }
             CSVEvent.Continue -> handleContinue()
+            is CSVEvent.MapToAmount -> {
+                toAmount = toAmount.copy(
+                    index = event.index,
+                    name = event.name
+                )
+            }
+            is CSVEvent.ToAmountMetaChange -> {
+                toAmount = toAmount.copy(
+                    metadata = event.multiplier
+                )
+            }
         }
     }