From 9f22ce84fda96a4011afb469f6f6a257c754b98a Mon Sep 17 00:00:00 2001 From: Florian Date: Fri, 17 Jan 2025 10:03:08 +0100 Subject: [PATCH] pushme (satisfaction) --- .../app/src/main/java/at/xaxa/ledger/ui/entry/add/AddUI.kt | 7 ++++++- Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) 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 148a123..4aef65f 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 @@ -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() diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt index 55338bb..25c9625 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/home/HomeUI.kt @@ -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) } )