From 0786ab98a7213d868b8101af6fd63030b5f25f1c Mon Sep 17 00:00:00 2001 From: Dave Severns <149429124+dseverns-livefront@users.noreply.github.com> Date: Mon, 3 Feb 2025 11:46:41 -0500 Subject: [PATCH] PM-17910 Prevent back events from system when coach mark tour is in progress. (#4674) --- .../platform/components/coachmark/CoachMarkContainer.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkContainer.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkContainer.kt index 1185858df6..04429887e2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkContainer.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/coachmark/CoachMarkContainer.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.ui.platform.components.coachmark +import androidx.activity.compose.BackHandler import androidx.compose.foundation.background import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Box @@ -132,6 +133,14 @@ fun > CoachMarkContainer( } } } + + // Consume system back event when the scrim is visible. + BackHandler( + enabled = state.isVisible.value, + onBack = { + // No-op + }, + ) } }