From 2bb80953c8354cad9983868d0b395afebd9e73ca Mon Sep 17 00:00:00 2001 From: Xaver Date: Mon, 20 Jan 2025 09:40:50 +0100 Subject: [PATCH] icon when selecting --- .../ledger/ui/category/add/AddCategoryUI.kt | 20 ++++++++++++++----- .../java/at/xaxa/ledger/ui/entry/add/AddUI.kt | 5 ++++- .../at/xaxa/ledger/ui/entry/edit/EditUI.kt | 5 ++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt index a7c9c8a..26743fd 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt @@ -5,6 +5,8 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExposedDropdownMenuBox @@ -62,15 +64,23 @@ fun AddCategory( onExpandedChange = { expanded = it } ) { OutlinedTextField( - value = iconNames[selectedIconIndex], // Show selected icon name + value = + if (selectedIconIndex == -1){ + "" + }else{ + iconNames[selectedIconIndex] + } + , onValueChange = {}, label = { Text("Icon") }, readOnly = true, leadingIcon = { - Icon( - imageVector = icons[selectedIconIndex], // Replace with your desired icon - contentDescription = "Leading Icon" - ) + if (selectedIconIndex != -1){ + Icon( + imageVector = icons[selectedIconIndex], // Replace with your desired icon + contentDescription = "Leading Icon" + ) + } }, trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) 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 a13178e..873fbcd 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 @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Info import androidx.compose.material3.AlertDialog @@ -27,6 +28,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import at.xaxa.ledger.data.Entry @@ -107,7 +109,8 @@ fun Add( }, label = { Text("Amount") }, modifier = Modifier - .fillMaxWidth() + .fillMaxWidth(), + keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number), ) ExposedDropdownMenuBox( diff --git a/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/edit/EditUI.kt b/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/edit/EditUI.kt index 8260d81..ae61318 100644 --- a/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/edit/EditUI.kt +++ b/Ledger/app/src/main/java/at/xaxa/ledger/ui/entry/edit/EditUI.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExposedDropdownMenuBox @@ -23,6 +24,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import at.xaxa.ledger.data.Entry @@ -82,7 +84,8 @@ fun Edit( } }, label = { Text("Amount") }, - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth(), + keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number), ) ExposedDropdownMenuBox(