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

Merge remote-tracking branch 'origin/Florian'

Browse Source 
# Conflicts:
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt
#	Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt
This commit is contained in:
Xaver 2025-01-15 17:59:11 +01:00
commit c65b271f9c
5 changed files with 124 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerApp.kt
View File

@ -99,7 +99,7 @@ fun LedgerApp(modifier: Modifier = Modifier){
navController.navigate("category/add")
},
onCardClick = {
navController.navigate("catEdit/$it")
navController.navigate("categoryEdit/$it")
}
)
}

34
Ledger/app/src/main/java/at/xaxa/ledger/ui/LedgerUI.kt
View File

@ -51,6 +51,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.em
import androidx.compose.ui.unit.sp
import at.xaxa.ledger.data.Entry
import at.xaxa.ledger.ui.category.icons
import java.util.Date
import java.util.Locale
@ -154,7 +155,12 @@ fun HorizontalCard(modifier: Modifier = Modifier, name: String, date: String, am
}
@Composable
fun CategoryCard(modifier: Modifier = Modifier, name: String, icon : Int, onClick: () -> Unit ) {
fun CategoryCard(
modifier: Modifier = Modifier,
name: String,
iconid: Int,
onClick: () -> Unit
) {
Surface(
onClick = onClick,
shape = RoundedCornerShape(12.dp),
@ -166,9 +172,16 @@ fun CategoryCard(modifier: Modifier = Modifier, name: String, icon : Int, onClic
Row(
modifier = Modifier
.fillMaxSize()
.padding(16.dp)
.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
LayoutMediaText(modifier, name, icon)
LayoutMediaText(modifier, name)
Icon(
icons[iconid],
contentDescription = "$name Icon"
)
}
}
}
@ -222,7 +235,7 @@ fun LayoutMediaText(modifier: Modifier = Modifier, name: String, date: String, a
}
}
@Composable
fun LayoutMediaText(modifier: Modifier = Modifier, name: String, icon: Int) {
fun LayoutMediaText(modifier: Modifier = Modifier, name: String) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier
@ -245,19 +258,6 @@ fun LayoutMediaText(modifier: Modifier = Modifier, name: String, icon: Int) {
)
}
Box(
modifier = Modifier
.fillMaxHeight()
.wrapContentWidth() // Allow the Box to wrap its content width
.padding(start = 16.dp), // Add some padding to separate from the Column
contentAlignment = Alignment.Center
) {
Text(
text = icon.toString(),
fontSize = 30.sp, // Set the desired font size
modifier = Modifier.wrapContentSize() // Ensure the text wraps its content
)
}
}
}

3
Ledger/app/src/main/java/at/xaxa/ledger/ui/add/AddViewModel.kt
View File

@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlin.math.log
data class CategoryListUIState(val categories: Flow<List<CategoryEntity>> = flowOf(emptyList()))
@ -86,8 +85,6 @@ class AddViewModel(
repository.getAllCategories()
}
categoryUiState = CategoryListUIState(categories)
}
}
}

37
Ledger/app/src/main/java/at/xaxa/ledger/ui/category/CategoryIcons.kt Normal file
View File

@ -0,0 +1,37 @@
package at.xaxa.ledger.ui.category
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccountBox
import androidx.compose.material.icons.filled.Build
import androidx.compose.material.icons.filled.Call
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.LocationOn
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material.icons.filled.ShoppingCart
import androidx.compose.material.icons.filled.Warning
val icons = listOf(
Icons.Filled.Call,
Icons.Filled.Home,
Icons.Filled.Build,
Icons.Filled.ShoppingCart,
Icons.Filled.Notifications,
Icons.Filled.LocationOn,
Icons.Filled.Delete,
Icons.Filled.Lock,
Icons.Filled.Info,
Icons.Filled.Warning,
Icons.Filled.Check,
Icons.Filled.Close,
Icons.Filled.AccountBox
)
val iconNames = listOf( // For displaying icon names in the dropdown
"Call", "Home", "Build", "ShoppingCart", "Notifications", "LocationOn",
"Delete", "Lock", "Info", "Warning", "Check", "Close", "AccountBox"
)

85
Ledger/app/src/main/java/at/xaxa/ledger/ui/category/add/AddCategoryUI.kt
View File

@ -1,11 +1,33 @@
package at.xaxa.ledger.ui.category.add
import android.util.Log
import androidx.compose.foundation.layout.Box
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.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccountBox
import androidx.compose.material.icons.filled.ArrowForward
import androidx.compose.material.icons.filled.Build
import androidx.compose.material.icons.filled.Call
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.LocationOn
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material.icons.filled.Share
import androidx.compose.material.icons.filled.ShoppingCart
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuBox
import androidx.compose.material3.ExposedDropdownMenuDefaults
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@ -22,6 +44,9 @@ import at.xaxa.ledger.data.db.Category.CategoryEntity
import at.xaxa.ledger.ui.AppViewModelProvider
import at.xaxa.ledger.ui.ButtonSuccess
import at.xaxa.ledger.ui.category.CategoryViewModel
import at.xaxa.ledger.ui.category.iconNames
import at.xaxa.ledger.ui.category.icons
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -30,8 +55,10 @@ fun AddCategory(
modifier: Modifier = Modifier,
categoryViewModel: CategoryViewModel = viewModel(factory = AppViewModelProvider.Factory)
) {
var name by remember { mutableStateOf("") }
var icon by remember { mutableStateOf(0) }
var selectedIconIndex by remember { mutableStateOf(0) } // Store index of selected icon
var expanded by remember { mutableStateOf(false) } // Controls dropdown visibility
val categories by categoryViewModel.categoryUiState.categories.collectAsState(initial = emptyList())
val category = categoryViewModel.categoryUi.category
@ -43,21 +70,51 @@ fun AddCategory(
.padding(16.dp, 0.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Column(Modifier.weight(1f)) {
OutlinedTextField(
value = name,
onValueChange = { name = it },
label = { Text("Category Name") },
modifier = Modifier
.fillMaxWidth()
)
ExposedDropdownMenuBox(
expanded = expanded,
onExpandedChange = { expanded = it }
) {
OutlinedTextField(
value = name,
onValueChange = { name = it },
label = { Text("Name") },
modifier = Modifier
.fillMaxWidth()
)
OutlinedTextField(
value = category.icon.toString(),
onValueChange = { category.copy(icon = it.toInt()) },
value = iconNames[selectedIconIndex], // Show selected icon name
onValueChange = {},
label = { Text("Icon") },
readOnly = true,
trailingIcon = {
ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded)
},
modifier = Modifier
.menuAnchor()
.fillMaxWidth()
)
ExposedDropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false }
) {
icons.forEachIndexed { index, icon ->
DropdownMenuItem(
text = { Text(text = iconNames[index]) }, // Use name from iconNames
onClick = {
selectedIconIndex = index // Update selected index
expanded = false
},
leadingIcon = {
androidx.compose.material3.Icon(
imageVector = icon,
contentDescription = iconNames[index]
)
}
)
}
}
}
Box(
@ -73,7 +130,7 @@ fun AddCategory(
val newCategory = CategoryEntity(
_id = 0,
categoryName = name,
icon = icon
icon = selectedIconIndex // Save selected index as the icon ID
)
categoryViewModel.addCategory(newCategory)
@ -84,7 +141,3 @@ fun AddCategory(
}
}
}