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
@@ -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)) },
)
}
Original file line number Diff line number Diff line change
@@ -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<WineColour>,
selectedCountries: List<String>,
yearFromText: String,
yearToText: String,
): Boolean {
return selectedColours.toSet() != currentFilters.colours
|| selectedCountries.toSet() != currentFilters.countries
|| yearFromText.toIntOrNull() != currentFilters.yearFrom
|| yearToText.toIntOrNull() != currentFilters.yearTo
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
Expand All @@ -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,
) {
Expand All @@ -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))
}
}
Expand Down Expand Up @@ -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),
) {
Expand All @@ -217,4 +254,14 @@ fun WineFilterSheet(
}
}
}

if (showDiscardDialog) {
DiscardChangesDialog(
onConfirm = {
showDiscardDialog = false
performDismiss()
},
onDismiss = { showDiscardDialog = false },
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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,
) {
Expand All @@ -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))
}
}
Expand Down Expand Up @@ -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()
Expand All @@ -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 },
)
}
}
3 changes: 3 additions & 0 deletions app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
<string name="delete_tasting">Kóstolás törlése</string>
<string name="delete_wine">Bor törlése</string>
<string name="description">Leírás</string>
<string name="discard">Elvetés</string>
<string name="discard_changes">Elveted a változtatásokat?</string>
<string name="discard_changes_message">Mentetlen adataid vannak. Bezárás mentés nélkül?</string>
<string name="developed">Fejlett</string>
<string name="developing">Fejlődő</string>
<string name="development">Fejlődés</string>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
<string name="delete_tasting">Delete Tasting</string>
<string name="delete_wine">Delete Wine</string>
<string name="description">Description</string>
<string name="discard">Discard</string>
<string name="discard_changes">Discard changes?</string>
<string name="discard_changes_message">You have unsaved changes. Close without saving?</string>
<string name="developed">Developed</string>
<string name="developing">Developing</string>
<string name="development">Development</string>
Expand Down
Loading
Loading