Skip to content

Add: Explanation text for auto-switch depth in setpoint dialogs #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rolf-Smit merged 1 commit into from
May 5, 2026
Merged

Add: Explanation text for auto-switch depth in setpoint dialogs #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ialogsScreenshotTestKt/CcrSetpointPreferenceDialogScreenshotTest_7a9301c3_0.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 17 additions & 1 deletion ...otlin/org/neotech/app/abysner/presentation/component/preferences/CcrSetpointPreference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.AlertDialogCustomContent
import androidx.compose.material3.Checkbox
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
Expand All @@ -43,6 +44,7 @@ fun CcrSetpointPreference(
modifier: Modifier = Modifier,
label: String,
description: String,
switchDepthDescription: String,
setpoint: Double,
switchDepth: Int?,
onValueChanged: (setpoint: Double, switchDepth: Int?) -> Unit,
Expand All @@ -54,6 +56,7 @@ fun CcrSetpointPreference(
title = label,
setpoint = setpoint,
switchDepth = switchDepth,
switchDepthDescription = switchDepthDescription,
onConfirmButtonClicked = { newSetpoint, newSwitchDepth ->
if (newSetpoint != setpoint || newSwitchDepth != switchDepth) {
onValueChanged(newSetpoint, newSwitchDepth)
Expand Down Expand Up @@ -91,6 +94,7 @@ private fun CcrSetpointPreferenceDialog(
onDismissRequest: () -> Unit = {},
setpoint: Double,
switchDepth: Int?,
switchDepthDescription: String = "",
) {
val setpointValue: MutableState<Double> = remember(setpoint) { mutableStateOf(setpoint) }
val switchDepthValue: MutableState<Int?> = remember(switchDepth) { mutableStateOf(switchDepth) }
Expand Down Expand Up @@ -133,6 +137,7 @@ private fun CcrSetpointPreferenceDialog(
initialValue = setpoint,
isValid = isSetpointValid,
visualTransformation = SuffixVisualTransformation(" bar"),
supportingText = null
) {
if (it != null) {
setpointValue.value = it
Expand Down Expand Up @@ -171,6 +176,14 @@ private fun CcrSetpointPreferenceDialog(
}
}
}

if (switchDepthDescription.isNotEmpty()) {
Text(
text = switchDepthDescription,
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
}
)
Expand All @@ -184,13 +197,15 @@ private fun CcrSetpointPreferencePreview() {
CcrSetpointPreference(
label = "Low setpoint",
description = "The CCR setpoint used during descent, with optional auto-switch depth to the high setpoint.",
switchDepthDescription = "Auto-switch depth: during descent, switch to the high setpoint at this depth.",
setpoint = 0.7,
switchDepth = 6,
onValueChanged = { _, _ -> },
)
CcrSetpointPreference(
label = "High setpoint",
description = "The CCR setpoint used during bottom time and ascent, with optional auto-switch depth to the low setpoint.",
switchDepthDescription = "Auto-switch depth: during ascent, switch to the low setpoint at this depth.",
setpoint = 1.2,
switchDepth = null,
onValueChanged = { _, _ -> },
Expand All @@ -206,7 +221,8 @@ fun CcrSetpointPreferenceDialogPreview() {
CcrSetpointPreferenceDialog(
title = "Low setpoint",
setpoint = 1.2,
switchDepth = 6
switchDepth = 6,
switchDepthDescription = "Auto-switch depth: during descent, switch to the high setpoint at this depth.",
)
}
}
2 changes: 2 additions & 0 deletions ...commonMain/kotlin/org/neotech/app/abysner/presentation/screens/DiveConfigurationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ fun DiveConfigurationScreen(
CcrSetpointPreference(
label = "Low setpoint",
description = "The CCR setpoint used during descent, with optional auto-switch depth to the high setpoint.",
switchDepthDescription = "Auto-switch depth: during descent, switch to the high setpoint at this depth.",
setpoint = configuration.ccrLowSetpoint,
switchDepth = configuration.ccrToHighSetpointSwitchDepth?.roundToInt(),
) { setpoint, switchDepth ->
Expand All @@ -408,6 +409,7 @@ fun DiveConfigurationScreen(
CcrSetpointPreference(
label = "High setpoint",
description = "The CCR setpoint used during bottom time and ascent, with optional auto-switch depth to the low setpoint.",
switchDepthDescription = "Auto-switch depth: during ascent, switch to the low setpoint at this depth.",
setpoint = configuration.ccrHighSetpoint,
switchDepth = configuration.ccrToLowSetpointSwitchDepth?.roundToInt(),
) { setpoint, switchDepth ->
Expand Down
Loading