Add completely functional. Home mostly working
This commit is contained in:
parent
b0511a0596
commit
3ea6ef626e
@ -43,7 +43,7 @@ fun Add(
|
|||||||
|
|
||||||
var spending by remember { mutableStateOf("") }
|
var spending by remember { mutableStateOf("") }
|
||||||
|
|
||||||
var selectedDate by remember { mutableStateOf<Long?>(null) }
|
var selectedDate by remember { mutableStateOf<Long>(0) }
|
||||||
var expanded by remember { mutableStateOf(false) }
|
var expanded by remember { mutableStateOf(false) }
|
||||||
var selectedItem by remember { mutableStateOf("") }
|
var selectedItem by remember { mutableStateOf("") }
|
||||||
var selectedCategory by remember { mutableIntStateOf(-1) }
|
var selectedCategory by remember { mutableIntStateOf(-1) }
|
||||||
@ -136,13 +136,13 @@ fun Add(
|
|||||||
Log.d("Kraushosdsdddad", "category " +category)
|
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")
|
Log.d("Kraushosdsdddad", "BITTTTEEEEEE")
|
||||||
val newEntry = Entry(
|
val newEntry = Entry(
|
||||||
id = 0,
|
id = 0,
|
||||||
name = entryName,
|
name = name,
|
||||||
amount = entryAmount,
|
amount = spending.toFloat(),
|
||||||
date = entryDate,
|
date = selectedDate,
|
||||||
categoryID = selectedCategory
|
categoryID = selectedCategory
|
||||||
)
|
)
|
||||||
addViewModel.addEntryToDB(newEntry)
|
addViewModel.addEntryToDB(newEntry)
|
||||||
|
@ -39,16 +39,16 @@ fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClic
|
|||||||
stickyHeader {
|
stickyHeader {
|
||||||
HeaderCard(modifier = modifier, "-13563.00€")
|
HeaderCard(modifier = modifier, "-13563.00€")
|
||||||
}
|
}
|
||||||
items(items) { index ->
|
items(state) { item ->
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier.padding(vertical = 4.dp)
|
modifier = Modifier.padding(vertical = 4.dp)
|
||||||
) {
|
) {
|
||||||
HorizontalCard(
|
HorizontalCard(
|
||||||
modifier = modifier,
|
modifier = modifier,
|
||||||
name = "McDonald's $index",
|
name = item.name,
|
||||||
date = "12th Feb, 23:32",
|
date = item.date.toString(),
|
||||||
amount = "-12.99",
|
amount = item.amount.toString()+"€",
|
||||||
onClick = { onCardClick(index) }
|
onClick = { onCardClick(item.id) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user