Skip to content

Fix: Bailout toggle sometimes shown on non-diluent cylinders #184

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

Fix: Bailout toggle sometimes shown on non-diluent cylinders #184

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
1 change: 0 additions & 1 deletion .../src/commonMain/kotlin/org/neotech/app/abysner/presentation/screens/planner/PlanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ fun PlannerScreen(
configuration = uiState.configuration,
diveMode = uiState.diveMode,
cylinders = uiState.availableGas,
segments = uiState.segments,
unitSystem = uiState.settingsModel.unitSystem,
onDismiss = { cylinderSheet = null },
onAddCylinder = onAddCylinder,
Expand Down
6 changes: 1 addition & 5 deletions ...g/neotech/app/abysner/presentation/screens/planner/cylinders/CylinderPickerBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ import org.neotech.app.abysner.domain.core.model.Environment
import org.neotech.app.abysner.domain.core.model.Gas
import org.neotech.app.abysner.domain.core.model.UnitSystem
import org.neotech.app.abysner.domain.core.physics.PSI_PER_BAR
import org.neotech.app.abysner.domain.diveplanning.model.DiveProfileSection
import org.neotech.app.abysner.domain.diveplanning.model.PlannedCylinderModel
import org.neotech.app.abysner.presentation.utilities.ModalTarget
import org.neotech.app.abysner.presentation.component.GasPickerComponent
Expand All @@ -73,7 +72,6 @@ internal fun CylinderPickerBottomSheetHost(
configuration: Configuration,
diveMode: DiveMode = DiveMode.OPEN_CIRCUIT,
cylinders: List<PlannedCylinderModel> = emptyList(),
segments: List<DiveProfileSection> = emptyList(),
unitSystem: UnitSystem,
onDismiss: () -> Unit,
onAddCylinder: (Cylinder) -> Unit,
Expand All @@ -87,11 +85,9 @@ internal fun CylinderPickerBottomSheetHost(
}
val lockGas = plannedCylinder?.isCcrOxygen == true

val gasesInSegments = segments.mapTo(mutableSetOf()) { it.cylinder.gas }
val showBailoutToggle = diveMode.isCcr
&& plannedCylinder != null
&& !plannedCylinder.isCcrOxygen
&& plannedCylinder.cylinder.gas in gasesInSegments
&& plannedCylinder.isCcrDiluent

CylinderPickerBottomSheet(
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
Expand Down
Loading