fix: detect when the sheet is dismissed by swipe down

Author: jvsena42

app/src/main/java/to/bitkit/ui/nav/SheetSceneStrategy.kt

@@ -17,7 +17,11 @@ import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
@@ -26,6 +30,7 @@ import androidx.navigation3.scene.OverlayScene
 import androidx.navigation3.scene.Scene
 import androidx.navigation3.scene.SceneStrategy
 import androidx.navigation3.scene.SceneStrategyScope
+import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import to.bitkit.ui.components.SheetDragHandle
 import to.bitkit.ui.components.SheetSize
@@ -87,8 +92,21 @@ internal class BitKitSheetScene<T : Any>(
             bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
         )
 
+        var isInitialExpansion by remember { mutableStateOf(true) }
+
         LaunchedEffect(Unit) {
             scaffoldState.bottomSheetState.expand()
+            isInitialExpansion = false
+        }
+
+        LaunchedEffect(scaffoldState.bottomSheetState) {
+            snapshotFlow { scaffoldState.bottomSheetState.currentValue }
+                .drop(1)
+                .collect { value: SheetValue ->
+                    if (!isInitialExpansion && value == SheetValue.Hidden) {
+                        onBack()
+                    }
+                }
         }
 
         Box(modifier = Modifier.fillMaxSize()) {

app/src/main/java/to/bitkit/ui/nav/entries/SheetEntries.kt

@@ -3,6 +3,7 @@ package to.bitkit.ui.nav.entries
 import android.content.Intent
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -833,30 +834,33 @@ private fun EntryProviderScope<NavKey>.timedSheetEntries(
     entry<Routes.TimedUpdateSheet>(
         metadata = SheetSceneStrategy.sheet()
     ) {
+        DisposableEffect(Unit) {
+            onDispose { appViewModel.dismissTimedSheet() }
+        }
         UpdateSheet(
-            onCancel = {
-                appViewModel.dismissTimedSheet()
-                navigator.goBack()
-            },
+            onCancel = { navigator.goBack() },
         )
     }
 
     entry<Routes.TimedBackupSheet>(
         metadata = SheetSceneStrategy.sheet()
     ) {
+        DisposableEffect(Unit) {
+            onDispose { appViewModel.dismissTimedSheet() }
+        }
         BackupIntroScreen(
             hasFunds = LocalBalances.current.totalSats > 0u,
-            onClose = {
-                appViewModel.dismissTimedSheet()
-                navigator.goBack()
-            },
+            onClose = { navigator.goBack() },
             onConfirm = { navigator.navigate(Routes.BackupShowMnemonic) },
         )
     }
 
     entry<Routes.TimedNotificationsSheet>(
         metadata = SheetSceneStrategy.sheet()
     ) {
+        DisposableEffect(Unit) {
+            onDispose { appViewModel.dismissTimedSheet() }
+        }
         BackgroundPaymentsIntroSheet(
             onContinue = {
                 appViewModel.dismissTimedSheet(skipQueue = true)
@@ -868,6 +872,9 @@ private fun EntryProviderScope<NavKey>.timedSheetEntries(
     entry<Routes.TimedQuickPaySheet>(
         metadata = SheetSceneStrategy.sheet()
     ) {
+        DisposableEffect(Unit) {
+            onDispose { appViewModel.dismissTimedSheet() }
+        }
         QuickPayIntroSheet(
             onContinue = {
                 appViewModel.dismissTimedSheet(skipQueue = true)
@@ -879,12 +886,12 @@ private fun EntryProviderScope<NavKey>.timedSheetEntries(
     entry<Routes.TimedHighBalanceSheet>(
         metadata = SheetSceneStrategy.sheet()
     ) {
+        DisposableEffect(Unit) {
+            onDispose { appViewModel.dismissTimedSheet() }
+        }
         val context = LocalContext.current
         HighBalanceWarningSheet(
-            understoodClick = {
-                appViewModel.dismissTimedSheet()
-                navigator.goBack()
-            },
+            understoodClick = { navigator.goBack() },
             learnMoreClick = {
                 val intent = Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
                 context.startActivity(intent)