codinux
/
Bankmeister
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added autocomplete also for amount to e.g. do the same transfer again; had to fix AutocompleteTextField's value setting for this

This commit is contained in:
dankito 2024-09-06 16:58:27 +02:00
parent 255cc41dce
commit f29e4b5fcc
3 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/AddAccountDialog.kt
View File

@ -26,6 +26,7 @@ private val bankingService = DI.bankingService
fun AddAccountDialog(
onDismiss: () -> Unit,
) {
var enteredBankSearchQuery by remember { mutableStateOf("") }
var selectedBank by remember { mutableStateOf<BankInfo?>(null) }
var loginName by remember { mutableStateOf("") }
var password by remember { mutableStateOf("") }
@ -39,11 +40,11 @@ fun AddAccountDialog(
val coroutineScope = rememberCoroutineScope()
fun confirmCalled() {
selectedBank?.let {
selectedBank?.let { bank ->
isAddingAccount = true
coroutineScope.launch(Dispatchers.IOorDefault) {
val successful = DI.bankingService.addAccount(selectedBank!!, loginName, password)
val successful = DI.bankingService.addAccount(bank, loginName, password)
withContext(Dispatchers.Main) {
isAddingAccount = false
@ -71,8 +72,10 @@ fun AddAccountDialog(
Column {
AutocompleteTextField(
onSelectedItemChanged = { selectedBank = it },
label = "Bank (Suche mit Name, Bankleitzahl oder Ort)",
value = enteredBankSearchQuery,
onEnteredTextChanged = { enteredBankSearchQuery = it },
onSelectedItemChanged = { selectedBank = it },
getItemTitle = { bank -> bank.name },
fetchSuggestions = { query -> bankingService.findBanks(query) }
) { bank ->

28
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/TransferMoneyDialog.kt
View File

@ -181,13 +181,29 @@ fun TransferMoneyDialog(
)
Row(Modifier.padding(vertical = verticalSpace).fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
OutlinedTextField(
value = amount,
onValueChange = { amount = it },
label = { Text("Betrag") },
AutocompleteTextField(
"Betrag",
amount,
dropdownMaxHeight = 250.dp,
minTextLengthForSearch = 0,
modifier = Modifier.weight(1f).focusRequester(amountFocus),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal, imeAction = ImeAction.Next)
)
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal, imeAction = ImeAction.Next),
getItemTitle = { suggestion -> suggestion.amount.amount },
onEnteredTextChanged = { amount = it },
onSelectedItemChanged = {
amount = it?.amount?.amount ?: ""
if (it != null) {
paymentReference = it.reference
}
},
fetchSuggestions = { recipientFinder.findPaymentDataForIban(recipientAccountIdentifier) }
) { paymentDataSuggestion ->
Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
Text(formatUtil.formatAmount(paymentDataSuggestion.amount, paymentDataSuggestion.currency), Modifier.widthIn(min = 60.dp), textAlign = TextAlign.End)
Text(paymentDataSuggestion.reference, Modifier.padding(start = 6.dp), maxLines = 1, overflow = TextOverflow.Ellipsis)
}
}
Text(formatUtil.formatCurrency(senderAccount.currency), Modifier.padding(start = 4.dp))
}

24
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/forms/AutocompleteTextField.kt
View File

@ -2,6 +2,7 @@ package net.codinux.banking.ui.forms
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
@ -19,18 +20,19 @@ import net.codinux.banking.ui.config.Colors
@Composable
fun <T> AutocompleteTextField(
label: String,
initialValue: String? = null,
value: String,
onEnteredTextChanged: (String) -> Unit,
onSelectedItemChanged: (T?) -> Unit,
onEnteredTextChanged: ((String) -> Unit)? = null,
minTextLengthForSearch: Int = 1,
showDividersBetweenItems: Boolean = true,
getItemTitle: ((T) -> String)? = null,
dropdownMaxHeight: Dp = 400.dp,
modifier: Modifier = Modifier,
keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
leadingIcon: @Composable (() -> Unit)? = null,
fetchSuggestions: suspend (query: String) -> Collection<T> = { emptyList() },
suggestionContent: @Composable (T) -> Unit
) {
var searchQuery by remember { mutableStateOf(initialValue ?: "") }
var expanded by remember { mutableStateOf(false) }
var isLoading by remember { mutableStateOf(false) }
var suggestions by remember { mutableStateOf<Collection<T>>(emptyList()) }
@ -47,7 +49,7 @@ fun <T> AutocompleteTextField(
suggestionsFetchJob = coroutineScope.launch {
isLoading = true
suggestions = fetchSuggestions(searchQuery)
suggestions = fetchSuggestions(value)
isLoading = false
if (expanded == false && suggestions.isNotEmpty()) {
@ -57,13 +59,12 @@ fun <T> AutocompleteTextField(
}
ExposedDropdownMenuBox(expanded, { isExpanded -> expanded = isExpanded }, Modifier.fillMaxWidth()) {
ExposedDropdownMenuBox(expanded, { isExpanded -> expanded = isExpanded }, modifier.fillMaxWidth()) {
OutlinedTextField(
value = searchQuery,
value = value,
onValueChange = { query ->
searchQuery = query
onSelectedItemChanged(null)
onEnteredTextChanged?.invoke(query)
onEnteredTextChanged(query)
if (query.length >= minTextLengthForSearch) {
fetchSuggestionsAsync()
@ -79,6 +80,7 @@ fun <T> AutocompleteTextField(
},
label = { Text(label) },
maxLines = 1,
keyboardOptions = keyboardOptions,
trailingIcon = {
if (isLoading) {
CircularProgressIndicator(
@ -90,7 +92,7 @@ fun <T> AutocompleteTextField(
imageVector = Icons.Default.Close,
contentDescription = "Sucheingabe löschen",
modifier = Modifier.clickable {
searchQuery = ""
onEnteredTextChanged("")
suggestions = emptyList()
expanded = false
onSelectedItemChanged(null)
@ -114,9 +116,7 @@ fun <T> AutocompleteTextField(
Column(
Modifier.fillMaxWidth().padding(8.dp).clickable {
onSelectedItemChanged(item)
getItemTitle?.let {
searchQuery = it.invoke(item)
}
onEnteredTextChanged(getItemTitle?.invoke(item) ?: "")
expanded = false
}
) {