From 3c696962720b6ad565790f30c17923fa6a139107 Mon Sep 17 00:00:00 2001 From: T0liver <123989030+T0liver@users.noreply.github.com> Date: Tue, 23 Jun 2026 23:33:49 +0200 Subject: [PATCH 1/3] Changing GPS to not required GPS is not required it's just a funny feature. I can set this so maybe more ppl can use it if there are restrictions because of this. --- app/src/main/AndroidManifest.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 466720a..6e86ec0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,9 +2,9 @@ - - - + + + - \ No newline at end of file + From c6139373ee9597c49c549e255901d82a48ed7a31 Mon Sep 17 00:00:00 2001 From: T0liver Date: Sun, 13 Sep 2026 11:54:03 +0200 Subject: [PATCH 2/3] Fixing accidentally closing forms --- .../vinotes/ui/screen/winelist/components/WineFilterSheet.kt | 2 +- .../vinotes/ui/screen/winelist/components/WineFormSheet.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt index aaa28ae..b82b93c 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt @@ -50,7 +50,7 @@ fun WineFilterSheet( onDismiss: () -> Unit, modifier: Modifier = Modifier, ) { - val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false) val scope = rememberCoroutineScope() var selectedColours by remember { mutableStateOf(currentFilters.colours) } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt index 14e13ce..b85e896 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt @@ -52,7 +52,7 @@ fun WineFormSheet( onDismiss: () -> Unit, modifier: Modifier = Modifier, ) { - val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false) val scope = rememberCoroutineScope() val isEdit = editingWine != null From 05246946fb1647c2580d09a99220269c669ef46c Mon Sep 17 00:00:00 2001 From: T0liver Date: Sun, 13 Sep 2026 12:37:37 +0200 Subject: [PATCH 3/3] Fixing "No save state for forms" --- .../addtasting/steps/SummaryStepContent.kt | 4 +-- .../ui/screen/winedetail/WineDetailScreen.kt | 1 + .../ui/screen/winedetail/WineDetailState.kt | 1 + .../screen/winedetail/WineDetailViewModel.kt | 5 +++- .../ui/screen/winelist/WineListScreen.kt | 2 ++ .../ui/screen/winelist/WineListState.kt | 2 ++ .../ui/screen/winelist/WineListViewModel.kt | 21 ++++++++++++-- .../winelist/components/WineFilterSheet.kt | 28 +++++++++++-------- .../winelist/components/WineFormSheet.kt | 28 ++++++++++--------- 9 files changed, 62 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt index 75178e9..a2b0fa2 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt @@ -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 @@ -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( diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailScreen.kt index 2f6b5d7..e3125eb 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailScreen.kt @@ -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) }, diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailState.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailState.kt index 8db7911..64cd512 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailState.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailState.kt @@ -9,6 +9,7 @@ data class WineDetailState( val tastings: List = emptyList(), val radarData: RadarData? = null, val isEditSheetOpen: Boolean = false, + val editSheetSessionId: Int = 0, val showDeleteWineDialog: Boolean = false, val errorMessage: String? = null, ) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt index 31d2273..f190231 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt @@ -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 { diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt index b582d9f..adae396 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt @@ -151,6 +151,7 @@ fun WineListScreen( if (state.isFilterSheetOpen) { WineFilterSheet( + sessionId = state.filterSheetSessionId, currentFilters = state.activeFilters, availableColours = WineColour.entries, availableCountries = state.wines @@ -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)) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListState.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListState.kt index 1882c13..d00a712 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListState.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListState.kt @@ -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, ) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt index 9c26203..af62d99 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt @@ -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 -> { @@ -68,7 +73,12 @@ 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 { @@ -76,7 +86,12 @@ class WineListViewModel @Inject constructor( } 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) } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt index b82b93c..57cd118 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFilterSheet.kt @@ -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 @@ -42,6 +42,7 @@ import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) @Composable fun WineFilterSheet( + sessionId: Int, currentFilters: WineFilters, availableColours: List, availableCountries: List, @@ -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 = { @@ -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) }, @@ -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) }, @@ -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(), ) diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt index b85e896..643d501 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineFormSheet.kt @@ -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 @@ -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, @@ -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 = {