edit screen ui

This commit is contained in:
Xaver 2025-01-14 16:14:59 +01:00
parent 3ea6ef626e
commit bb30679348
4 changed files with 23 additions and 15 deletions

View File

@ -1,5 +1,6 @@
package at.xaxa.ledger.ui package at.xaxa.ledger.ui
import android.util.Log
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -41,7 +42,7 @@ fun LedgerApp(modifier: Modifier = Modifier){
onButtonClick = { onButtonClick = {
navController.navigate("add") navController.navigate("add")
} }
) )
} }
composable(AppRoutes.Add.route) { composable(AppRoutes.Add.route) {
@ -56,6 +57,7 @@ fun LedgerApp(modifier: Modifier = Modifier){
}) })
) { ) {
backStackEntry -> backStackEntry ->
Log.w("xaver", "edit")
Edit( Edit(
modifier = Modifier, modifier = Modifier,
onCardClick = { onCardClick = {

View File

@ -130,14 +130,7 @@ fun Add(
modifier = Modifier, modifier = Modifier,
"Add Transaction", "Add Transaction",
onClick = { onClick = {
Log.d("Kraushosdsdddad", "entryName " +entryName)
Log.d("Kraushosdsdddad", "entryAmount " +entryAmount)
Log.d("Kraushosdsdddad", "entryDate " +entryDate)
Log.d("Kraushosdsdddad", "category " +category)
if (name.isNotBlank() && spending.toFloat() != 0f && selectedDate != 0L && selectedCategory != -1) { if (name.isNotBlank() && spending.toFloat() != 0f && selectedDate != 0L && selectedCategory != -1) {
Log.d("Kraushosdsdddad", "BITTTTEEEEEE")
val newEntry = Entry( val newEntry = Entry(
id = 0, id = 0,
name = name, name = name,

View File

@ -1,7 +1,9 @@
package at.xaxa.ledger.ui.edit package at.xaxa.ledger.ui.edit
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
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
@ -17,6 +19,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.BiasAlignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
@ -100,13 +103,22 @@ fun Edit(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, HomeViewMode
} }
} }
Box( Column(
modifier = Modifier modifier = Modifier.fillMaxWidth(),
.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally // Center buttons horizontally
contentAlignment = Alignment.Center
) { ) {
ButtonDanger(modifier = Modifier, "Delete Transaction", onClick = { print("test") }) ButtonDanger(
ButtonSuccess(modifier = Modifier, "Add Transaction", onClick = { print("test") }) modifier = Modifier
.fillMaxWidth()
.padding(bottom = 8.dp),
text = "Delete Transaction",
onClick = { print("test") }
)
ButtonSuccess(
modifier = Modifier.fillMaxWidth(), // Add spacing between buttons
text = "Add Transaction",
onClick = { print("test") }
)
} }
} }
} }

View File

@ -19,6 +19,7 @@ import at.xaxa.ledger.ui.AppViewModelProvider
import at.xaxa.ledger.ui.ButtonSuccess import at.xaxa.ledger.ui.ButtonSuccess
import at.xaxa.ledger.ui.HeaderCard import at.xaxa.ledger.ui.HeaderCard
import at.xaxa.ledger.ui.HorizontalCard import at.xaxa.ledger.ui.HorizontalCard
import at.xaxa.ledger.ui.convertMillisToDate
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
@ -46,7 +47,7 @@ fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClic
HorizontalCard( HorizontalCard(
modifier = modifier, modifier = modifier,
name = item.name, name = item.name,
date = item.date.toString(), date = convertMillisToDate(item.date),
amount = item.amount.toString()+"", amount = item.amount.toString()+"",
onClick = { onCardClick(item.id) } onClick = { onCardClick(item.id) }
) )