From 8e7be73d66598deb97cb9d496cec516e5c0dfa52 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sat, 21 Nov 2026 10:41:10 +0000 Subject: [PATCH] Fix accidental dismissal of unsaved wine and filter sheets Block hide transitions when forms are dirty via confirmValueChange, use skipPartiallyExpanded to avoid half-expanded scrim taps, and prompt to discard on explicit close or scrim tap. Add unit tests for dirty detection. Co-authored-by: T0liver --- .../components/DiscardChangesDialog.kt | 30 +++++ .../winelist/components/SheetFormDirty.kt | 59 +++++++++ .../winelist/components/WineFilterSheet.kt | 67 ++++++++-- .../winelist/components/WineFormSheet.kt | 77 +++++++++-- app/src/main/res/values-hu/strings.xml | 3 + app/src/main/res/values/strings.xml | 3 + .../winelist/components/SheetFormDirtyTest.kt | 124 ++++++++++++++++++ 7 files changed, 341 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/DiscardChangesDialog.kt create mode 100644 app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirty.kt create mode 100644 app/src/test/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirtyTest.kt diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/DiscardChangesDialog.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/DiscardChangesDialog.kt new file mode 100644 index 0000000..d833363 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/DiscardChangesDialog.kt @@ -0,0 +1,30 @@ +package hu.toliver.vinotes.ui.screen.winelist.components + +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.res.stringResource +import hu.toliver.vinotes.R + +@Composable +fun DiscardChangesDialog( + onConfirm: () -> Unit, + onDismiss: () -> Unit, +) { + AlertDialog( + onDismissRequest = onDismiss, + confirmButton = { + TextButton(onClick = onConfirm) { + Text(stringResource(R.string.discard)) + } + }, + dismissButton = { + TextButton(onClick = onDismiss) { + Text(stringResource(R.string.cancel)) + } + }, + title = { Text(stringResource(R.string.discard_changes)) }, + text = { Text(stringResource(R.string.discard_changes_message)) }, + ) +} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirty.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirty.kt new file mode 100644 index 0000000..4e3a43b --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirty.kt @@ -0,0 +1,59 @@ +package hu.toliver.vinotes.ui.screen.winelist.components + +import hu.toliver.vinotes.domain.model.Wine +import hu.toliver.vinotes.domain.model.enums.WineColour +import hu.toliver.vinotes.ui.screen.winelist.WineFilters + +fun isWineFormDirty( + editingWine: Wine?, + name: String, + producer: String, + year: String, + grape: String, + isCuvee: Boolean, + cuveeText: String, + selectedColour: WineColour, + country: String, + region: String, + alcoholText: String, + description: String, +): Boolean { + if (editingWine == null) { + return name.isNotBlank() + || producer.isNotBlank() + || year.isNotBlank() + || grape.isNotBlank() + || isCuvee + || cuveeText.isNotBlank() + || selectedColour != WineColour.RED + || country.isNotBlank() + || region.isNotBlank() + || alcoholText.isNotBlank() + || description.isNotBlank() + } + val wine = editingWine + return name != wine.name + || producer != wine.producer + || year != wine.year.toString() + || grape != wine.grape + || isCuvee != wine.isCuvee + || cuveeText != wine.cuveeComponents.joinToString(", ") + || selectedColour != wine.colour + || country != wine.country + || region != wine.region + || alcoholText != (wine.alcoholPercentage.takeIf { it != 0.0 }?.toString() ?: "") + || description != wine.description +} + +fun isWineFilterDirty( + currentFilters: WineFilters, + selectedColours: List, + selectedCountries: List, + yearFromText: String, + yearToText: String, +): Boolean { + return selectedColours.toSet() != currentFilters.colours + || selectedCountries.toSet() != currentFilters.countries + || yearFromText.toIntOrNull() != currentFilters.yearFrom + || yearToText.toIntOrNull() != currentFilters.yearTo +} \ No newline at end of file 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 57cd118..ce05864 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 @@ -19,12 +19,14 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.SheetValue import androidx.compose.material3.Text import androidx.compose.material3.TextButton 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 @@ -51,8 +53,9 @@ fun WineFilterSheet( onDismiss: () -> Unit, modifier: Modifier = Modifier, ) { - val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false) val scope = rememberCoroutineScope() + var allowSheetHide by remember { mutableStateOf(false) } + var showDiscardDialog by rememberSaveable { mutableStateOf(false) } val filterKey = sessionId var selectedColours by rememberSaveable(filterKey) { @@ -64,11 +67,44 @@ fun WineFilterSheet( var yearFromText by rememberSaveable(filterKey) { mutableStateOf(currentFilters.yearFrom?.toString() ?: "") } var yearToText by rememberSaveable(filterKey) { mutableStateOf(currentFilters.yearTo?.toString() ?: "") } - ModalBottomSheet( - onDismissRequest = { - scope.launch { sheetState.hide() } - onDismiss() + val isDirty = isWineFilterDirty( + currentFilters = currentFilters, + selectedColours = selectedColours, + selectedCountries = selectedCountries, + yearFromText = yearFromText, + yearToText = yearToText, + ) + + val sheetState = rememberModalBottomSheetState( + skipPartiallyExpanded = true, + confirmValueChange = { newValue -> + if (newValue == SheetValue.Hidden && isDirty && !allowSheetHide) { + false + } else { + true + } }, + ) + + fun performDismiss() { + scope.launch { + allowSheetHide = true + sheetState.hide() + allowSheetHide = false + onDismiss() + } + } + + fun requestDismiss() { + if (isDirty) { + showDiscardDialog = true + } else { + performDismiss() + } + } + + ModalBottomSheet( + onDismissRequest = { requestDismiss() }, sheetState = sheetState, modifier = modifier, ) { @@ -88,10 +124,7 @@ fun WineFilterSheet( text = stringResource(R.string.filters), style = MaterialTheme.typography.titleMedium, ) - IconButton(onClick = { - scope.launch { sheetState.hide() } - onDismiss() - }) { + IconButton(onClick = { requestDismiss() }) { Icon(Icons.Filled.Close, contentDescription = stringResource(R.string.close)) } } @@ -206,7 +239,11 @@ fun WineFilterSheet( yearTo = yearToText.toIntOrNull(), ) onApply(filters) - scope.launch { sheetState.hide() } + scope.launch { + allowSheetHide = true + sheetState.hide() + allowSheetHide = false + } }, modifier = Modifier.weight(1f), ) { @@ -217,4 +254,14 @@ fun WineFilterSheet( } } } + + if (showDiscardDialog) { + DiscardChangesDialog( + onConfirm = { + showDiscardDialog = false + performDismiss() + }, + onDismiss = { showDiscardDialog = false }, + ) + } } \ No newline at end of file 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 643d501..b551f7a 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 @@ -22,12 +22,14 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.SheetValue import androidx.compose.material3.Switch import androidx.compose.material3.Text 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 @@ -53,8 +55,9 @@ fun WineFormSheet( onDismiss: () -> Unit, modifier: Modifier = Modifier, ) { - val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false) val scope = rememberCoroutineScope() + var allowSheetHide by remember { mutableStateOf(false) } + var showDiscardDialog by rememberSaveable { mutableStateOf(false) } val isEdit = editingWine != null val isNew = !isEdit @@ -74,11 +77,51 @@ fun WineFormSheet( var showDeleteDialog by rememberSaveable(formKey) { mutableStateOf(false) } - ModalBottomSheet( - onDismissRequest = { - scope.launch { sheetState.hide() } - onDismiss() + val isDirty = isWineFormDirty( + editingWine = editingWine, + name = name, + producer = producer, + year = year, + grape = grape, + isCuvee = isCuvee, + cuveeText = cuveeText, + selectedColour = selectedColour, + country = country, + region = region, + alcoholText = alcoholText, + description = description, + ) + + val sheetState = rememberModalBottomSheetState( + skipPartiallyExpanded = true, + confirmValueChange = { newValue -> + if (newValue == SheetValue.Hidden && isDirty && !allowSheetHide) { + false + } else { + true + } }, + ) + + fun performDismiss() { + scope.launch { + allowSheetHide = true + sheetState.hide() + allowSheetHide = false + onDismiss() + } + } + + fun requestDismiss() { + if (isDirty) { + showDiscardDialog = true + } else { + performDismiss() + } + } + + ModalBottomSheet( + onDismissRequest = { requestDismiss() }, sheetState = sheetState, modifier = modifier, ) { @@ -100,10 +143,7 @@ fun WineFormSheet( ), style = MaterialTheme.typography.titleMedium, ) - IconButton(onClick = { - scope.launch { sheetState.hide() } - onDismiss() - }) { + IconButton(onClick = { requestDismiss() }) { Icon(Icons.Filled.Close, contentDescription = stringResource(R.string.close)) } } @@ -270,7 +310,11 @@ fun WineFormSheet( image = editingWine?.image ?: "", ) onSave(wine, isNew) - scope.launch { sheetState.hide() } + scope.launch { + allowSheetHide = true + sheetState.hide() + allowSheetHide = false + } }, modifier = Modifier .fillMaxWidth() @@ -290,10 +334,19 @@ fun WineFormSheet( onConfirm = { onDelete(editingWine) showDeleteDialog = false - scope.launch { sheetState.hide() } - onDismiss() + performDismiss() }, onDismiss = { showDeleteDialog = false }, ) } + + if (showDiscardDialog) { + DiscardChangesDialog( + onConfirm = { + showDiscardDialog = false + performDismiss() + }, + onDismiss = { showDiscardDialog = false }, + ) + } } \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 84f356c..a38f8a9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -70,6 +70,9 @@ Kóstolás törlése Bor törlése Leírás + Elvetés + Elveted a változtatásokat? + Mentetlen adataid vannak. Bezárás mentés nélkül? Fejlett Fejlődő Fejlődés diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f20d16d..af46700 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -70,6 +70,9 @@ Delete Tasting Delete Wine Description + Discard + Discard changes? + You have unsaved changes. Close without saving? Developed Developing Development diff --git a/app/src/test/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirtyTest.kt b/app/src/test/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirtyTest.kt new file mode 100644 index 0000000..dd8ff8d --- /dev/null +++ b/app/src/test/java/hu/toliver/vinotes/ui/screen/winelist/components/SheetFormDirtyTest.kt @@ -0,0 +1,124 @@ +package hu.toliver.vinotes.ui.screen.winelist.components + +import hu.toliver.vinotes.domain.model.Wine +import hu.toliver.vinotes.domain.model.enums.WineColour +import hu.toliver.vinotes.domain.model.enums.WineSweetness +import hu.toliver.vinotes.ui.screen.winelist.WineFilters +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class SheetFormDirtyTest { + + @Test + fun newWineForm_emptyIsNotDirty() { + assertFalse( + isWineFormDirty( + editingWine = null, + name = "", + producer = "", + year = "", + grape = "", + isCuvee = false, + cuveeText = "", + selectedColour = WineColour.RED, + country = "", + region = "", + alcoholText = "", + description = "", + ), + ) + } + + @Test + fun newWineForm_anyInputIsDirty() { + assertTrue( + isWineFormDirty( + editingWine = null, + name = "Tokaji", + producer = "", + year = "", + grape = "", + isCuvee = false, + cuveeText = "", + selectedColour = WineColour.RED, + country = "", + region = "", + alcoholText = "", + description = "", + ), + ) + } + + @Test + fun editWineForm_unchangedIsNotDirty() { + val wine = sampleWine() + assertFalse( + isWineFormDirty( + editingWine = wine, + name = wine.name, + producer = wine.producer, + year = wine.year.toString(), + grape = wine.grape, + isCuvee = wine.isCuvee, + cuveeText = wine.cuveeComponents.joinToString(", "), + selectedColour = wine.colour, + country = wine.country, + region = wine.region, + alcoholText = wine.alcoholPercentage.toString(), + description = wine.description, + ), + ) + } + + @Test + fun filterSheet_matchesAppliedFiltersIsNotDirty() { + val filters = WineFilters( + colours = setOf(WineColour.RED), + countries = setOf("Hungary"), + yearFrom = 2018, + yearTo = 2022, + ) + assertFalse( + isWineFilterDirty( + currentFilters = filters, + selectedColours = listOf(WineColour.RED), + selectedCountries = listOf("Hungary"), + yearFromText = "2018", + yearToText = "2022", + ), + ) + } + + @Test + fun filterSheet_changedSelectionIsDirty() { + assertTrue( + isWineFilterDirty( + currentFilters = WineFilters(), + selectedColours = listOf(WineColour.WHITE), + selectedCountries = emptyList(), + yearFromText = "", + yearToText = "", + ), + ) + } + + private fun sampleWine() = Wine( + id = "id-1", + name = "Sample", + producer = "Producer", + year = 2020, + grape = "Pinot", + isCuvee = false, + cuveeComponents = emptyList(), + colour = WineColour.RED, + sugar = 0f, + sweetness = WineSweetness.DRY, + country = "Hungary", + region = "Tokaj", + alcoholPercentage = 12.5, + volume = 750, + description = "Notes", + image = "", + ) +} \ No newline at end of file