Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import androidx.compose.material3.rememberDatePickerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalLocale
import androidx.compose.ui.res.stringResource
Expand All @@ -48,7 +48,7 @@ fun SummaryStepContent(
onEvent: (AddTastingEvent) -> Unit,
modifier: Modifier = Modifier,
) {
var showDatePicker by remember { mutableStateOf(false) }
var showDatePicker by rememberSaveable { mutableStateOf(false) }

if (showDatePicker) {
val datePickerState = rememberDatePickerState(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ fun WineDetailScreen(

if (state.isEditSheetOpen && state.wine != null) {
WineFormSheet(
sessionId = state.editSheetSessionId,
editingWine = state.wine,
onSave = { wine, _ -> viewModel.onEvent(WineDetailEvent.WineSaved(wine)) },
onDelete = { viewModel.onEvent(WineDetailEvent.DeleteWineClicked) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ data class WineDetailState(
val tastings: List<Taste> = emptyList(),
val radarData: RadarData? = null,
val isEditSheetOpen: Boolean = false,
val editSheetSessionId: Int = 0,
val showDeleteWineDialog: Boolean = false,
val errorMessage: String? = null,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ class WineDetailViewModel @Inject constructor(
when (event) {
WineDetailEvent.LoadData -> loadData()

WineDetailEvent.EditWineClicked -> _state.value = _state.value.copy(isEditSheetOpen = true)
WineDetailEvent.EditWineClicked -> _state.value = _state.value.copy(
isEditSheetOpen = true,
editSheetSessionId = _state.value.editSheetSessionId + 1,
)
WineDetailEvent.EditSheetDismissed -> _state.value = _state.value.copy(isEditSheetOpen = false)

is WineDetailEvent.WineSaved -> viewModelScope.launch {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ fun WineListScreen(

if (state.isFilterSheetOpen) {
WineFilterSheet(
sessionId = state.filterSheetSessionId,
currentFilters = state.activeFilters,
availableColours = WineColour.entries,
availableCountries = state.wines
Expand All @@ -165,6 +166,7 @@ fun WineListScreen(

if (state.isAddSheetOpen || state.editingWine != null) {
WineFormSheet(
sessionId = state.wineFormSessionId,
editingWine = state.editingWine,
onSave = { wine, isNew ->
viewModel.onEvent(WineListEvent.WineSaved(wine, isNew))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ data class WineListState(
val activeFilters: WineFilters = WineFilters(),
val sortOrder: WineSortOrder = WineSortOrder.NAME_ASC,
val isFilterSheetOpen: Boolean = false,
val filterSheetSessionId: Int = 0,
val editingWine: Wine? = null,
val isAddSheetOpen: Boolean = false,
val wineFormSessionId: Int = 0,
val errorMessage: String? = null,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ class WineListViewModel @Inject constructor(
applyFilterAndSort()
}

WineListEvent.FilterSheetOpened -> _state.update { it.copy(isFilterSheetOpen = true) }
WineListEvent.FilterSheetOpened -> _state.update {
it.copy(
isFilterSheetOpen = true,
filterSheetSessionId = it.filterSheetSessionId + 1,
)
}
WineListEvent.FilterSheetDismissed -> _state.update { it.copy(isFilterSheetOpen = false) }

is WineListEvent.FiltersApplied -> {
Expand All @@ -68,15 +73,25 @@ class WineListViewModel @Inject constructor(
applyFilterAndSort()
}

WineListEvent.AddWineClicked -> _state.update { it.copy(isAddSheetOpen = true) }
WineListEvent.AddWineClicked -> _state.update {
it.copy(
isAddSheetOpen = true,
wineFormSessionId = it.wineFormSessionId + 1,
)
}
WineListEvent.AddSheetDismissed -> _state.update { it.copy(isAddSheetOpen = false) }

is WineListEvent.WineCardClicked -> viewModelScope.launch {
_effect.send(WineListEffect.NavigateToDetail(event.wineId))
}

is WineListEvent.WineCardLongPressed ->
_state.update { it.copy(editingWine = event.wine) }
_state.update {
it.copy(
editingWine = event.wine,
wineFormSessionId = it.wineFormSessionId + 1,
)
}

WineListEvent.EditSheetDismissed ->
_state.update { it.copy(editingWine = null) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -42,6 +42,7 @@ import kotlinx.coroutines.launch
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun WineFilterSheet(
sessionId: Int,
currentFilters: WineFilters,
availableColours: List<WineColour>,
availableCountries: List<String>,
Expand All @@ -52,11 +53,16 @@ fun WineFilterSheet(
) {
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
val scope = rememberCoroutineScope()
val filterKey = sessionId

var selectedColours by remember { mutableStateOf(currentFilters.colours) }
var selectedCountries by remember { mutableStateOf(currentFilters.countries) }
var yearFromText by remember { mutableStateOf(currentFilters.yearFrom?.toString() ?: "") }
var yearToText by remember { mutableStateOf(currentFilters.yearTo?.toString() ?: "") }
var selectedColours by rememberSaveable(filterKey) {
mutableStateOf(currentFilters.colours.toList())
}
var selectedCountries by rememberSaveable(filterKey) {
mutableStateOf(currentFilters.countries.toList())
}
var yearFromText by rememberSaveable(filterKey) { mutableStateOf(currentFilters.yearFrom?.toString() ?: "") }
var yearToText by rememberSaveable(filterKey) { mutableStateOf(currentFilters.yearTo?.toString() ?: "") }

ModalBottomSheet(
onDismissRequest = {
Expand Down Expand Up @@ -107,9 +113,9 @@ fun WineFilterSheet(
selected = colour in selectedColours,
onClick = {
selectedColours = if (colour in selectedColours) {
selectedColours - colour
selectedColours - colour
} else {
selectedColours + colour
selectedColours + colour
}
},
label = { Text(colour.toDisplayName(), style = MaterialTheme.typography.labelSmall) },
Expand All @@ -135,9 +141,9 @@ fun WineFilterSheet(
selected = country in selectedCountries,
onClick = {
selectedCountries = if (country in selectedCountries) {
selectedCountries - country
selectedCountries - country
} else {
selectedCountries + country
selectedCountries + country
}
},
label = { Text(country, style = MaterialTheme.typography.labelSmall) },
Expand Down Expand Up @@ -194,8 +200,8 @@ fun WineFilterSheet(
Button(
onClick = {
val filters = WineFilters(
colours = selectedColours,
countries = selectedCountries,
colours = selectedColours.toSet(),
countries = selectedCountries.toSet(),
yearFrom = yearFromText.toIntOrNull(),
yearTo = yearToText.toIntOrNull(),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -46,6 +46,7 @@ import java.util.UUID
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun WineFormSheet(
sessionId: Int,
editingWine: Wine?,
onSave: (Wine, Boolean) -> Unit,
onDelete: (Wine) -> Unit,
Expand All @@ -57,20 +58,21 @@ fun WineFormSheet(

val isEdit = editingWine != null
val isNew = !isEdit
val formKey = sessionId to (editingWine?.id ?: "new")

var name by remember { mutableStateOf(editingWine?.name ?: "") }
var producer by remember { mutableStateOf(editingWine?.producer ?: "") }
var year by remember { mutableStateOf(editingWine?.year?.toString() ?: "") }
var grape by remember { mutableStateOf(editingWine?.grape ?: "") }
var isCuvee by remember { mutableStateOf(editingWine?.isCuvee ?: false) }
var cuveeText by remember { mutableStateOf(editingWine?.cuveeComponents?.joinToString(", ") ?: "") }
var selectedColour by remember { mutableStateOf(editingWine?.colour ?: WineColour.RED) }
var country by remember { mutableStateOf(editingWine?.country ?: "") }
var region by remember { mutableStateOf(editingWine?.region ?: "") }
var alcoholText by remember { mutableStateOf(editingWine?.alcoholPercentage?.toString() ?: "") }
var description by remember { mutableStateOf(editingWine?.description ?: "") }
var name by rememberSaveable(formKey) { mutableStateOf(editingWine?.name ?: "") }
var producer by rememberSaveable(formKey) { mutableStateOf(editingWine?.producer ?: "") }
var year by rememberSaveable(formKey) { mutableStateOf(editingWine?.year?.toString() ?: "") }
var grape by rememberSaveable(formKey) { mutableStateOf(editingWine?.grape ?: "") }
var isCuvee by rememberSaveable(formKey) { mutableStateOf(editingWine?.isCuvee ?: false) }
var cuveeText by rememberSaveable(formKey) { mutableStateOf(editingWine?.cuveeComponents?.joinToString(", ") ?: "") }
var selectedColour by rememberSaveable(formKey) { mutableStateOf(editingWine?.colour ?: WineColour.RED) }
var country by rememberSaveable(formKey) { mutableStateOf(editingWine?.country ?: "") }
var region by rememberSaveable(formKey) { mutableStateOf(editingWine?.region ?: "") }
var alcoholText by rememberSaveable(formKey) { mutableStateOf(editingWine?.alcoholPercentage?.toString() ?: "") }
var description by rememberSaveable(formKey) { mutableStateOf(editingWine?.description ?: "") }

var showDeleteDialog by remember { mutableStateOf(false) }
var showDeleteDialog by rememberSaveable(formKey) { mutableStateOf(false) }

ModalBottomSheet(
onDismissRequest = {
Expand Down
Loading