WIP: CSV parser

Ivy-Apps · Apr 15, 2023 · f051ae3 · f051ae3
1 parent 27a578a
commit f051ae3
Show file tree

Hide file tree

Showing 5 changed files with 294 additions and 25 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
@@ -13,4 +13,14 @@ sealed interface CSVEvent {
     data class DataMetaChange(val meta: DateMetadata) : CSVEvent
     data class MapAccount(val index: Int, val name: String) : CSVEvent
     data class MapAccountCurrency(val index: Int, val name: String) : CSVEvent
+
+    data class MapToAccount(val index: Int, val name: String) : CSVEvent
+    data class MapToAccountCurrency(val index: Int, val name: String) : CSVEvent
+
+    data class MapCategory(val index: Int, val name: String) : CSVEvent
+    data class MapTitle(val index: Int, val name: String) : CSVEvent
+    data class MapDescription(val index: Int, val name: String) : CSVEvent
+
+    object Continue : 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
@@ -59,7 +59,13 @@ private fun UI(
             csvTable(state.csv)
         }
         if (state.columns != null && state.important != null) {
-            important(state.columns, importantFields = state.important, onEvent = onEvent)
+            importantFields(state.columns, importantFields = state.important, onEvent = onEvent)
+        }
+        if (state.columns != null && state.transfer != null) {
+            transferFields(state.columns, state.transfer, onEvent = onEvent)
+        }
+        if (state.columns != null && state.optional != null) {
+            optionalFields(state.columns, state.optional, onEvent = onEvent)
         }
     }
 }
@@ -225,14 +231,22 @@ private fun <M> LazyListScope.mappingRow(
 
 fun LazyListScope.sectionDivider(text: String) {
     item {
-        Spacer8()
-        Text(text = text, style = UI.typo.h2)
+        Spacer(modifier = Modifier.height(24.dp))
+        Text(text = text, style = UI.typo.b1)
+        Text(
+            text = """
+                Match the CSV column with the appropriate Ivy type.
+                If the parsing is successful the border will turn green.
+            """.trimIndent(),
+            style = UI.typo.nB2,
+            color = UI.colors.pureInverse
+        )
         Spacer8()
     }
 }
 
 // region Important
-fun LazyListScope.important(
+fun LazyListScope.importantFields(
     columns: CSVRow,
     importantFields: ImportantFields,
     onEvent: (CSVEvent) -> Unit
@@ -419,4 +433,53 @@ private fun EnabledButton(
         Text(text = text)
     }
 }
-// endregion
+// endregion
+
+fun LazyListScope.transferFields(
+    columns: CSVRow,
+    transferFields: TransferFields,
+    onEvent: (CSVEvent) -> Unit
+) {
+    sectionDivider("Transfer fields")
+    mappingRow(
+        columns = columns,
+        mapping = transferFields.toAccount,
+        status = transferFields.toAccountStatus,
+        onMapTo = { index, name -> onEvent(CSVEvent.MapToAccount(index, name)) },
+    )
+    mappingRow(
+        columns = columns,
+        mapping = transferFields.toAccountCurrency,
+        status = transferFields.toAccountCurrencyStatus,
+        onMapTo = { index, name -> onEvent(CSVEvent.MapToAccountCurrency(index, name)) },
+    )
+}
+
+fun LazyListScope.optionalFields(
+    columns: CSVRow,
+    optionalFields: OptionalFields,
+    onEvent: (CSVEvent) -> Unit
+) {
+    sectionDivider("Optional fields")
+    mappingRow(
+        columns = columns,
+        mapping = optionalFields.category,
+        status = optionalFields.categoryStatus,
+        onMapTo = { index, name -> onEvent(CSVEvent.MapCategory(index, name)) },
+    )
+    mappingRow(
+        columns = columns,
+        mapping = optionalFields.title,
+        status = optionalFields.titleStatus,
+        onMapTo = { index, name -> onEvent(CSVEvent.MapTitle(index, name)) },
+    )
+    mappingRow(
+        columns = columns,
+        mapping = optionalFields.description,
+        status = optionalFields.descriptionStatus,
+        onMapTo = { index, name -> onEvent(CSVEvent.MapDescription(index, name)) },
+    )
+}
+
+
+
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
@@ -6,9 +6,7 @@ data class CSVState(
     val important: ImportantFields?,
     val transfer: TransferFields?,
     val optional: OptionalFields?,
-
-    val successPercent: Double?,
-    val failedRows: List<CSVRow>?,
+    val continueEnabled: Boolean,
 )
 
 data class ImportantFields(
@@ -36,13 +34,18 @@ enum class DateMetadata {
 
 data class TransferFields(
     val toAccount: ColumnMapping<Unit>,
+    val toAccountStatus: MappingStatus,
     val toAccountCurrency: ColumnMapping<Unit>,
+    val toAccountCurrencyStatus: MappingStatus,
 )
 
 data class OptionalFields(
     val category: ColumnMapping<Unit>,
+    val categoryStatus: MappingStatus,
     val title: ColumnMapping<Unit>,
+    val titleStatus: MappingStatus,
     val description: ColumnMapping<Unit>,
+    val descriptionStatus: MappingStatus,
 )
 
 data class ColumnMapping<M>(