pushme (satisfaction)
This commit is contained in:
parent
f97adc39eb
commit
9f22ce84fd
@ -99,7 +99,12 @@ fun Add(
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = spending,
|
||||
onValueChange = { spending = it },
|
||||
onValueChange = {
|
||||
val isValidSpending = it.matches(Regex("^[+-]?\\d*(\\.\\d{0,2})?$"))
|
||||
if (isValidSpending) {
|
||||
spending = it
|
||||
}
|
||||
},
|
||||
label = { Text("Spending") },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
|
@ -1,5 +1,6 @@
|
||||
package at.xaxa.ledger.ui.home
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
@ -22,6 +23,7 @@ import at.xaxa.ledger.ui.HeaderCard
|
||||
import at.xaxa.ledger.ui.HorizontalCard
|
||||
import at.xaxa.ledger.ui.convertMillisToDate
|
||||
|
||||
@SuppressLint("DefaultLocale")
|
||||
@OptIn(ExperimentalFoundationApi::class)
|
||||
@Composable
|
||||
fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClick: () -> Unit, onCatButtonClick: () -> Unit, homeViewModel : HomeViewModel = viewModel(factory = AppViewModelProvider.Factory)) {
|
||||
@ -40,7 +42,7 @@ fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClic
|
||||
.weight(1f)
|
||||
) {
|
||||
stickyHeader {
|
||||
HeaderCard(modifier = modifier, balance.toString()+"€", onCatButtonClick)
|
||||
HeaderCard(modifier = modifier, "%.2f".format(balance)+"€", onCatButtonClick)
|
||||
}
|
||||
items(state) { item ->
|
||||
Column(
|
||||
@ -51,7 +53,7 @@ fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClic
|
||||
modifier = modifier,
|
||||
name = item.name,
|
||||
date = convertMillisToDate(item.date),
|
||||
amount = item.amount.toString()+"€",
|
||||
amount = "%.2f".format(item.amount)+"€",
|
||||
iconId = item.icon,
|
||||
onClick = { onCardClick(item.entryId) }
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user