Skip to content
Snippets Groups Projects
Commit c31d967f authored by Nicolas ROBERT's avatar Nicolas ROBERT
Browse files

fix du bug ou toutes les catégories partagent la même liste d'items

parent a2799a04
No related branches found
No related tags found
No related merge requests found
......@@ -44,8 +44,6 @@ fun StonksinatorNavGraph(
composable(
Destinations.BUDGET,
) { entry ->
BudgetView(
modifier,
categoryState.categories,
......@@ -53,19 +51,20 @@ fun StonksinatorNavGraph(
categoryViewModel.setSelectedCategory(category)
navController.navigate(Destinations.CATEGORY)
},
categoryViewModel,
)
categoryViewModel
)
}
composable(
Destinations.CATEGORY
) { entry ->
CategoryView(
modifier,
spendingState.spendings,
spendingState.spendings.filter {
println(categoryState.selectedCategory)
it.categoryId == categoryState.selectedCategory?.id
},
categoryViewModel,
spendingViewModel,
categoryState.selectedCategory
)
......
......@@ -30,6 +30,7 @@ import fr.mim.stonksinator3000.model.Category
import fr.mim.stonksinator3000.model.Spending
import fr.mim.stonksinator3000.ui.components.Placeholder
import fr.mim.stonksinator3000.ui.components.sheets.SpendingSheet
import fr.mim.stonksinator3000.viewmodel.CategoryViewModel
import fr.mim.stonksinator3000.viewmodel.SpendingViewModel
@OptIn(ExperimentalMaterial3Api::class)
......@@ -37,6 +38,7 @@ import fr.mim.stonksinator3000.viewmodel.SpendingViewModel
fun CategoryView(
modifier: Modifier,
spendings: List<Spending>,
categoryViewModel: CategoryViewModel,
spendingViewModel: SpendingViewModel,
category: Category?
) {
......@@ -105,6 +107,7 @@ fun CategoryView(
if (isBottomSheetVisible) {
SpendingSheet(
categoryViewModel,
spendingViewModel,
{ isBottomSheetVisible = false },
spendingUnderEdit
......
......@@ -24,6 +24,7 @@ fun Sheet(
)
Sheets.Spendings -> SpendingSheet(
categoryViewModel,
spendingViewModel,
onDismissRequest
)
......
......@@ -13,6 +13,7 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
......@@ -22,12 +23,14 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
import fr.mim.stonksinator3000.model.Spending
import fr.mim.stonksinator3000.viewmodel.CategoryViewModel
import fr.mim.stonksinator3000.viewmodel.SpendingViewModel
import kotlin.random.Random
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SpendingSheet(
categoryViewModel: CategoryViewModel,
spendingViewModel: SpendingViewModel,
onDismissRequest: () -> Unit,
spending: Spending? = null
......@@ -35,6 +38,8 @@ fun SpendingSheet(
var name by remember { mutableStateOf(spending?.label ?: "") }
var amount by remember { mutableStateOf(spending?.amount ?: 0) }
val categoryState by categoryViewModel.uiState.collectAsState()
ModalBottomSheet(
onDismissRequest = {
onDismissRequest()
......@@ -75,7 +80,7 @@ fun SpendingSheet(
spendingViewModel.addSpending(
Spending(
spending?.id ?: Random.nextInt(0, 1000),
0,
categoryId = categoryState.selectedCategory?.id ?: 0,
name,
amount.toFloat()
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment