Merge pull request #1695 from google/1.5stable

Upgrade to Compose 1.5 stable
google · Aug 20, 2023 · 6eb55b0 · 6eb55b0
2 parents 511ee9c + d1b2afd
commit 6eb55b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 
 GROUP=com.google.accompanist
 # !! No longer need to update this manually when using a Compose SNAPSHOT
-VERSION_NAME=0.31.7-SNAPSHOT
+VERSION_NAME=0.32.0
 
 POM_DESCRIPTION=Utilities for Jetpack Compose
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 
-compose = "1.5.0-rc01"
+compose = "1.5.0"
 composeCompiler = "1.5.1"
 composeMaterial3 = "1.0.1"
 composesnapshot = "-" # a single character = no snapshot
@@ -18,7 +18,7 @@ okhttp = "3.12.13"
 coil = "1.3.2"
 
 androidxtest = "1.4.0"
-androidxnavigation = "2.7.0-alpha01"
+androidxnavigation = "2.7.0"
 androidxWindow = "1.0.0"
 
 metalava = "0.3.2"

diff --git a/...material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt b/...material/src/main/java/com/google/accompanist/navigation/material/BottomSheetNavigator.kt
@@ -17,6 +17,7 @@
 package com.google.accompanist.navigation.material
 
 import android.annotation.SuppressLint
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.material.ExperimentalMaterialApi
@@ -219,6 +220,10 @@ public class BottomSheetNavigator(
             }
         }
 
+        BackHandler(retainedEntry != null) {
+            state.popWithTransition(retainedEntry!!, false)
+        }
+
         SheetContentHost(
             backStackEntry = retainedEntry,
             sheetState = sheetState,