From 4874f83a7f3d818ad6cc580dfe456ea35bc9acab Mon Sep 17 00:00:00 2001
From: Suphon Thanakornpakapong <paphonb@gmail.com>
Date: Tue, 11 Jan 2022 20:17:21 +0700
Subject: [PATCH] Hide bottom sheet on back press

---
 .../src/app/lawnchair/ui/preferences/Preferences.kt      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
index 538bc27a4a..3a191ef513 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/Preferences.kt
@@ -16,6 +16,7 @@
 
 package app.lawnchair.ui.preferences
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.ModalBottomSheetLayout
@@ -86,7 +87,13 @@ fun Preferences(interactor: PreferenceInteractor = viewModel<PreferenceViewModel
     SystemUi()
     Providers(bottomSheetHandler = bottomSheetHandler) {
         ModalBottomSheetLayout(
-            sheetContent = { bottomSheetContent.content() },
+            sheetContent = {
+                val isSheetShown = bottomSheetState.isAnimationRunning || bottomSheetState.isVisible
+                BackHandler(enabled = isSheetShown) {
+                    bottomSheetHandler.hide()
+                }
+                bottomSheetContent.content()
+            },
             sheetState = bottomSheetState
         ) {
             Surface {