mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-25 19:06:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

Clear focus whenever the root navigation changes (#1411)

Browse source
This commit is contained in:
David Perez 2024-05-30 16:23:36 -05:00 committed by Álison Fernandes
parent 9b30d50eac
commit 5329629e22
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavScreen.kt
View file

@ -1,10 +1,12 @@
package com.x8bit.bitwarden.ui.platform.feature.rootnav package com.x8bit.bitwarden.ui.platform.feature.rootnav
import android.app.Activity
import androidx.compose.animation.AnimatedContentTransitionScope import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavBackStackEntry import androidx.navigation.NavBackStackEntry
@ -117,6 +119,10 @@ fun RootNavScreen(
} }
previousStateReference.set(state) previousStateReference.set(state)
// In some scenarios on an emulator the Activity can leak when recreated
// if we don't first clear focus anytime we change the root destination.
(LocalContext.current as? Activity)?.currentFocus?.clearFocus()
// When state changes, navigate to different root navigation state // When state changes, navigate to different root navigation state
val rootNavOptions = navOptions { val rootNavOptions = navOptions {
// When changing root navigation state, pop everything else off the back stack: // When changing root navigation state, pop everything else off the back stack: