diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt index 6ffcd53..b84f6bf 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/edit/EditUI.kt @@ -14,6 +14,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableLongStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -30,17 +31,16 @@ import at.xaxa.ledger.ui.DatePickerDocked @OptIn(ExperimentalMaterial3Api::class) @Composable -fun Edit(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, EditViewModel : EditViewModel = viewModel(factory = AppViewModelProvider.Factory)) { +fun Edit(modifier: Modifier = Modifier, onCardClick: () -> Unit, editViewModel : EditViewModel = viewModel(factory = AppViewModelProvider.Factory)) { val libraryEntity = editViewModel.editUiState.entry - var name by remember { mutableStateOf("") } - var spending by remember { mutableStateOf("") } + val categories by editViewModel.categoryUiState.categories.collectAsState(initial = emptyList()) var name by remember { mutableStateOf(libraryEntity.name) } var spending by remember { mutableStateOf(libraryEntity.amount.toString()) } var selectedDate by remember { mutableLongStateOf(libraryEntity.date) } var expanded by remember { mutableStateOf(false) } var selectedItem by remember { mutableStateOf("") } - val categories by editViewModel.categoryUiState.categories.collectAsState(initial = emptyList()) + var selectedCategory by remember { mutableIntStateOf(libraryEntity.categoryID) } Column( modifier = modifier.fillMaxSize() @@ -90,9 +90,10 @@ fun Edit(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, EditViewMode ) { categories.forEach { item -> DropdownMenuItem( - text = { Text(text = item) }, + text = { Text(text = item.categoryName) }, onClick = { - selectedItem = item + selectedItem = item.categoryName + selectedCategory = item._id expanded = false } )