mePixel/Ledger
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

pushme (satisfaction)

Browse Source
This commit is contained in:
Florian 2025-01-17 10:03:08 +01:00
parent f97adc39eb
commit 9f22ce84fd
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt
View File

@ -99,7 +99,12 @@ fun Add(
) )
OutlinedTextField( OutlinedTextField(
value = spending, value = spending,
onValueChange = { spending = it }, onValueChange = {
val isValidSpending = it.matches(Regex("^[+-]?\\d*(\\.\\d{0,2})?$"))
if (isValidSpending) {
spending = it
}
},
label = { Text("Spending") }, label = { Text("Spending") },
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()

6
Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt
View File

@ -1,5 +1,6 @@
package at.xaxa.ledger.ui.home package at.xaxa.ledger.ui.home
import android.annotation.SuppressLint
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column 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.HorizontalCard
import at.xaxa.ledger.ui.convertMillisToDate import at.xaxa.ledger.ui.convertMillisToDate
@SuppressLint("DefaultLocale")
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable
fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClick: () -> Unit, onCatButtonClick: () -> Unit, homeViewModel : HomeViewModel = viewModel(factory = AppViewModelProvider.Factory)) { 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) .weight(1f)
) { ) {
stickyHeader { stickyHeader {
HeaderCard(modifier = modifier, balance.toString()+"€", onCatButtonClick) HeaderCard(modifier = modifier, "%.2f".format(balance)+"€", onCatButtonClick)
} }
items(state) { item -> items(state) { item ->
Column( Column(
@ -51,7 +53,7 @@ fun Home(modifier: Modifier = Modifier, onCardClick: (Int) -> Unit, onButtonClic
modifier = modifier, modifier = modifier,
name = item.name, name = item.name,
date = convertMillisToDate(item.date), date = convertMillisToDate(item.date),
amount = item.amount.toString()+"€", amount = "%.2f".format(item.amount)+"€",
iconId = item.icon, iconId = item.icon,
onClick = { onCardClick(item.entryId) } onClick = { onCardClick(item.entryId) }
) )