From 3ea6ef626ebfb86726eaab56307ffbf921c18131 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 14 Jan 2025 15:46:49 +0100 Subject: [PATCH] Add completely functional. Home mostly working --- .../app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt | 10 +++++----- .../app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt index 7fc70dd..f08e978 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddUI.kt @@ -43,7 +43,7 @@ fun Add( var spending by remember { mutableStateOf("") } - var selectedDate by remember { mutableStateOf(null) } + var selectedDate by remember { mutableStateOf(0) } var expanded by remember { mutableStateOf(false) } var selectedItem by remember { mutableStateOf("") } var selectedCategory by remember { mutableIntStateOf(-1) } @@ -136,13 +136,13 @@ fun Add( Log.d("Kraushosdsdddad", "category " +category) - if (name.isNotBlank() && spending.toFloat() != 0f && entryDate != 0L && selectedCategory != -1) { + if (name.isNotBlank() && spending.toFloat() != 0f && selectedDate != 0L && selectedCategory != -1) { Log.d("Kraushosdsdddad", "BITTTTEEEEEE") val newEntry = Entry( id = 0, - name = entryName, - amount = entryAmount, - date = entryDate, + name = name, + amount = spending.toFloat(), + date = selectedDate, categoryID = selectedCategory ) addViewModel.addEntryToDB(newEntry) diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt index c92a0ce..5b4b11f 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt @@ -39,16 +39,16 @@ fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClic stickyHeader { HeaderCard(modifier = modifier, "-13563.00€") } - items(items) { index -> + items(state) { item -> Column( modifier = Modifier.padding(vertical = 4.dp) ) { HorizontalCard( modifier = modifier, - name = "McDonald's $index", - date = "12th Feb, 23:32", - amount = "-12.99", - onClick = { onCardClick(index) } + name = item.name, + date = item.date.toString(), + amount = item.amount.toString()+"€", + onClick = { onCardClick(item.id) } ) } }