diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt index 9253ad7..40b0c9e 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/edit/EditCategory.kt @@ -87,12 +87,10 @@ fun EditCategory( } ) }else if(deleteStarted && !showError){ - Log.w("xaver", "delete") editCategoryViewModel.deleteEntry() onButtonClick() } - Log.w("xaver", "deleteStarted $deleteStarted : showError $showError" ) Column( modifier = modifier diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt index 3c45955..148a123 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt @@ -105,7 +105,6 @@ fun Add( .fillMaxWidth() ) - ExposedDropdownMenuBox( expanded = expanded, onExpandedChange = { expanded = it } @@ -167,11 +166,8 @@ fun Add( modifier = Modifier, "Add Transaction", onClick = { - val isValidSpending = spending.matches(Regex("^[+-]?\\d*(\\.\\d+)?$")) - Log.w("xaxaxa", name.isNotBlank().toString() ) - Log.w("xaxaxa", isValidSpending.toString() ) - Log.w("xaxaxa", (selectedDate != 0L).toString() ) - Log.w("xaxaxa", (selectedCategory != -1).toString() ) + val isValidSpending = spending.matches(Regex("^[+-]?\\d*(\\.\\d{0,2})?$")) + if (name.isNotBlank() && isValidSpending && selectedDate != 0L && selectedCategory != -1) { val newEntry = Entry( id = 0, diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddViewModel.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddViewModel.kt index a28f3da..b1c63c7 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddViewModel.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddViewModel.kt @@ -41,7 +41,6 @@ class AddViewModel( } fun addEntryToDB(entry: Entry) { - //Log.d("KRAUSI", "WE ARE INNNN") viewModelScope.launch { try { val entryEntity = Entry(