delete working

This commit is contained in:
Xaver 2025-01-16 15:16:12 +01:00
parent 6c9c2117fe
commit a0860c85ba
4 changed files with 102 additions and 66 deletions

View File

@ -32,7 +32,6 @@ class EntryRepository(private val ledgerDao: LedgerDao){
) )
} }
suspend fun findCategoryById(id: Int): CategoryEntity { suspend fun findCategoryById(id: Int): CategoryEntity {
Log.w("xaver", id.toString())
val category = ledgerDao.findCategoryById(id) val category = ledgerDao.findCategoryById(id)
return CategoryEntity( return CategoryEntity(
category._id, category.categoryName, category.icon category._id, category.categoryName, category.icon

View File

@ -46,59 +46,62 @@ fun AddCategory(
.padding(16.dp, 0.dp), .padding(16.dp, 0.dp),
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
OutlinedTextField( Column(
value = name, Modifier.weight(1f)
onValueChange = { name = it },
label = { Text("Category Name") },
modifier = Modifier
.fillMaxWidth()
)
ExposedDropdownMenuBox(
expanded = expanded,
onExpandedChange = { expanded = it }
) { ) {
OutlinedTextField( OutlinedTextField(
value = iconNames[selectedIconIndex], // Show selected icon name value = name,
onValueChange = {}, onValueChange = { name = it },
label = { Text("Icon") }, label = { Text("Category Name") },
readOnly = true,
leadingIcon = {
Icon(
imageVector = icons[selectedIconIndex], // Replace with your desired icon
contentDescription = "Leading Icon"
)
},
trailingIcon = {
ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
},
modifier = Modifier modifier = Modifier
.menuAnchor()
.fillMaxWidth() .fillMaxWidth()
) )
ExposedDropdownMenu( ExposedDropdownMenuBox(
expanded = expanded, expanded = expanded,
onDismissRequest = { expanded = false } onExpandedChange = { expanded = it }
) { ) {
icons.forEachIndexed { index, icon -> OutlinedTextField(
DropdownMenuItem( value = iconNames[selectedIconIndex], // Show selected icon name
text = { Text(text = iconNames[index]) }, // Use name from iconNames onValueChange = {},
onClick = { label = { Text("Icon") },
selectedIconIndex = index // Update selected index readOnly = true,
expanded = false leadingIcon = {
}, Icon(
leadingIcon = { imageVector = icons[selectedIconIndex], // Replace with your desired icon
androidx.compose.material3.Icon( contentDescription = "Leading Icon"
imageVector = icon, )
contentDescription = iconNames[index] },
) trailingIcon = {
} ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
) },
modifier = Modifier
.menuAnchor()
.fillMaxWidth()
)
ExposedDropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false }
) {
icons.forEachIndexed { index, icon ->
DropdownMenuItem(
text = { Text(text = iconNames[index]) }, // Use name from iconNames
onClick = {
selectedIconIndex = index // Update selected index
expanded = false
},
leadingIcon = {
androidx.compose.material3.Icon(
imageVector = icon,
contentDescription = iconNames[index]
)
}
)
}
} }
} }
} }
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxWidth(), .fillMaxWidth(),

View File

@ -6,6 +6,9 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Info
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuBox
@ -13,6 +16,7 @@ import androidx.compose.material3.ExposedDropdownMenuDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@ -40,22 +44,55 @@ fun EditCategory(
editCategoryViewModel: EditCategoryViewModel = viewModel(factory = AppViewModelProvider.Factory) editCategoryViewModel: EditCategoryViewModel = viewModel(factory = AppViewModelProvider.Factory)
) { ) {
val category = editCategoryViewModel.categoryUi.category val category = editCategoryViewModel.categoryUi.category
var expanded by remember { mutableStateOf(false) } // Controls dropdown visibility var showError by remember { mutableStateOf(editCategoryViewModel.entryUIState) }
var selectedIconIndex by remember { mutableIntStateOf(category.icon) } // Store index of selected icon var deleteStarted by remember { mutableStateOf(false) }
var expanded by remember { mutableStateOf(false) }
var selectedIconIndex by remember { mutableIntStateOf(category.icon) }
LaunchedEffect(category) { LaunchedEffect(category) {
selectedIconIndex = category.icon selectedIconIndex = category.icon
} }
/* LaunchedEffect(deleteStarted) {
val categories by categoryViewModel.categoryUiState.categories.collectAsState(initial = emptyList()) if (deleteStarted) {
val category = categoryViewModel.categoryUi.category editCategoryViewModel.findEntryByCategoryId()
var expanded by remember { mutableStateOf(false) }*/ showError = editCategoryViewModel.entryUIState
}
}
if (deleteStarted && showError) {
AlertDialog(
icon = {
Icon(Icons.Default.Info, contentDescription = "Info Icon")
},
title = {
Text(text = "Category in use")
},
text = {
Text(text = "You are trying to delete a Category which is still in use. Please delete or change the Category in your entries which are in use.")
},
onDismissRequest = {
deleteStarted = false
showError = false
},
confirmButton = {
TextButton(
onClick = {
deleteStarted = false
showError = false
}
) {
Text("Okay")
}
}
)
}else if(deleteStarted && !showError){
Log.w("xaver", "delete")
editCategoryViewModel.deleteEntry()
onButtonClick()
}
Log.w("vm", category.categoryName.toString()) Log.w("xaver", "deleteStarted $deleteStarted : showError $showError" )
Log.w("vm", category.icon.toString())
Log.w("vm", selectedIconIndex.toString())
Column( Column(
modifier = modifier modifier = modifier
@ -79,13 +116,13 @@ fun EditCategory(
onExpandedChange = { expanded = it } onExpandedChange = { expanded = it }
) { ) {
OutlinedTextField( OutlinedTextField(
value = iconNames[selectedIconIndex], // Show selected icon name value = iconNames[selectedIconIndex],
onValueChange = {}, onValueChange = {},
label = { Text("Icon") }, label = { Text("Icon") },
readOnly = true, readOnly = true,
leadingIcon = { leadingIcon = {
Icon( Icon(
imageVector = icons[selectedIconIndex], // Replace with your desired icon imageVector = icons[selectedIconIndex],
contentDescription = "Leading Icon" contentDescription = "Leading Icon"
) )
}, },
@ -103,10 +140,9 @@ fun EditCategory(
) { ) {
icons.forEachIndexed { index, icon -> icons.forEachIndexed { index, icon ->
DropdownMenuItem( DropdownMenuItem(
text = { Text(text = iconNames[index]) }, // Use name from iconNames text = { Text(text = iconNames[index]) },
onClick = { onClick = {
selectedIconIndex = index // Update selected index selectedIconIndex = index
editCategoryViewModel.updateCategory(category.copy(icon = index)) editCategoryViewModel.updateCategory(category.copy(icon = index))
expanded = false expanded = false
}, },
@ -124,23 +160,21 @@ fun EditCategory(
Column( Column(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally // Center buttons horizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
ButtonDanger( ButtonDanger(
modifier = Modifier modifier = Modifier
.padding(bottom = 8.dp), .padding(bottom = 8.dp),
"Delete Category", "Delete Category",
onClick = { onClick = {
editCategoryViewModel.deleteEntry() deleteStarted = true
onButtonClick() editCategoryViewModel.findEntryByCategoryId()
} }
) )
ButtonSuccess( ButtonSuccess(
modifier = Modifier, modifier = Modifier,
"Save Category", "Save Category",
onClick = { onClick = {
editCategoryViewModel.findEntryByCategoryId()
Log.d("dsdsssee", editCategoryViewModel.entryUIState.toString())
editCategoryViewModel.saveCategory() editCategoryViewModel.saveCategory()
onButtonClick() onButtonClick()
} }

View File

@ -29,7 +29,7 @@ class EditCategoryViewModel(private val savedStateHandle: SavedStateHandle, priv
var categoryUi by mutableStateOf(CategoryUIState()) var categoryUi by mutableStateOf(CategoryUIState())
private set private set
var entryUIState by mutableStateOf(0) var entryUIState by mutableStateOf(false)
@ -71,10 +71,10 @@ class EditCategoryViewModel(private val savedStateHandle: SavedStateHandle, priv
val fetchedEntries = withContext(Dispatchers.IO) { val fetchedEntries = withContext(Dispatchers.IO) {
entryRepository.findEntryByCategoryId(categoryId) entryRepository.findEntryByCategoryId(categoryId)
} }
entryUIState = fetchedEntries
Log.w("ASASDADS", categoryId.toString()) if(fetchedEntries>0){
Log.w("ASASDADS", fetchedEntries.toString()) entryUIState = true
}
} }
//print("ASASDADS$categoryId") //print("ASASDADS$categoryId")
} }