feat: allow closing the drawer using the back button (#342)

paug · Mar 2, 2025 · 8f485c3 · 8f485c3
1 parent d9b4f65
commit 8f485c3
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 2 deletions.
diff --git a/shared/ui/src/androidMain/kotlin/com/androidmakers/ui/common/BackHandlerCompat.android.kt b/shared/ui/src/androidMain/kotlin/com/androidmakers/ui/common/BackHandlerCompat.android.kt
@@ -0,0 +1,9 @@
+package com.androidmakers.ui.common
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun BackHandlerCompat(enabled: Boolean, onBack: () -> Unit) {
+  BackHandler(enabled = enabled, onBack = onBack)
+}
diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaLayout.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaLayout.kt
@@ -255,7 +255,7 @@ private fun AgendaFilterDrawerPreview() {
 @Composable
 private fun AgendaLayoutPreview() {
   AgendaLayout(
-      agendaFilterDrawerState = DrawerState(DrawerValue.Closed, confirmStateChange = { true }),
+      agendaFilterDrawerState = DrawerState(DrawerValue.Closed),
       onSessionClick = { _ -> }
   )
 }
diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/BackHandlerCompat.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/BackHandlerCompat.kt
@@ -0,0 +1,6 @@
+package com.androidmakers.ui.common
+
+import androidx.compose.runtime.Composable
+
+@Composable
+expect fun BackHandlerCompat(enabled: Boolean = true, onBack: () -> Unit)
diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/AVALayout.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/common/navigation/AVALayout.kt
@@ -50,6 +50,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.androidmakers.ui.about.AboutScreen
 import com.androidmakers.ui.agenda.AgendaLayout
+import com.androidmakers.ui.common.BackHandlerCompat
 import com.androidmakers.ui.common.SigninButton
 import com.androidmakers.ui.common.SigninCallbacks
 import com.androidmakers.ui.speakers.SpeakerScreen
@@ -120,10 +121,19 @@ fun AVALayout(
             actions = {
               if (currentRoute == AVANavigationRoute.AGENDA.name) {
                 val scope = rememberCoroutineScope()
+                BackHandlerCompat(enabled = agendaFilterDrawerState.isOpen) {
+                  scope.launch {
+                    agendaFilterDrawerState.close()
+                  }
+                }
                 IconButton(
                     onClick = {
                       scope.launch {
-                        if (agendaFilterDrawerState.isClosed) agendaFilterDrawerState.open() else agendaFilterDrawerState.close()
+                        if (agendaFilterDrawerState.isClosed) {
+                          agendaFilterDrawerState.open()
+                        } else {
+                          agendaFilterDrawerState.close()
+                        }
                       }
                     }
                 ) {

diff --git a/shared/ui/src/iosMain/kotlin/com/androidmakers/ui/common/BackHandlerCompat.ios.kt b/shared/ui/src/iosMain/kotlin/com/androidmakers/ui/common/BackHandlerCompat.ios.kt
@@ -0,0 +1,8 @@
+package com.androidmakers.ui.common
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun BackHandlerCompat(enabled: Boolean, onBack: () -> Unit) {
+  // No-op on iOS
+}