mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-02 22:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Compose And Remove BackHandler (#2160)

Browse source
This commit is contained in:
SkechyWolf 2022-01-18 18:18:40 -08:00 committed by GitHub
parent e4234ec98d
commit 817af69069
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wear/build.gradle.kts
View file

@ -114,9 +114,9 @@ dependencies {
implementation("androidx.compose.compiler:compiler:1.0.5")
implementation("androidx.compose.foundation:foundation:1.0.5")
implementation("androidx.compose.ui:ui-tooling:1.0.5")
implementation("androidx.wear.compose:compose-foundation:1.0.0-alpha13")
implementation("androidx.wear.compose:compose-material:1.0.0-alpha13")
implementation("androidx.wear.compose:compose-navigation:1.0.0-alpha13")
implementation("androidx.wear.compose:compose-foundation:1.0.0-alpha14")
implementation("androidx.wear.compose:compose-material:1.0.0-alpha14")
implementation("androidx.wear.compose:compose-navigation:1.0.0-alpha14")
implementation("com.google.guava:guava:31.0.1-android")
implementation("androidx.wear.tiles:tiles:1.0.0")

10
wear/src/main/java/io/homeassistant/companion/android/home/views/HomeView.kt
View file

@ -1,7 +1,5 @@
package io.homeassistant.companion.android.home.views
import android.app.Activity
import androidx.activity.compose.BackHandler
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
@ -71,14 +69,6 @@ fun LoadHomePage(
}
} else {
val swipeDismissableNavController = rememberSwipeDismissableNavController()
BackHandler {
val activity = (context as? Activity)
if (swipeDismissableNavController.currentDestination?.route == SCREEN_LANDING) {
activity?.finish()
} else {
swipeDismissableNavController.popBackStack()
}
}
SwipeDismissableNavHost(
navController = swipeDismissableNavController,
startDestination = SCREEN_LANDING