mirror of
https://github.com/bitwarden/android.git
synced 2026-04-29 12:32:26 -05:00
Update the AndroidX Activity library to 1.10.0 (#4599)
This commit is contained in:
@@ -2,14 +2,13 @@
|
|||||||
|
|
||||||
package com.x8bit.bitwarden.ui.platform.composition
|
package com.x8bit.bitwarden.ui.platform.composition
|
||||||
|
|
||||||
import android.app.Activity
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
|
import androidx.activity.compose.LocalActivity
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.CompositionLocal
|
import androidx.compose.runtime.CompositionLocal
|
||||||
import androidx.compose.runtime.CompositionLocalProvider
|
import androidx.compose.runtime.CompositionLocalProvider
|
||||||
import androidx.compose.runtime.ProvidableCompositionLocal
|
import androidx.compose.runtime.ProvidableCompositionLocal
|
||||||
import androidx.compose.runtime.compositionLocalOf
|
import androidx.compose.runtime.compositionLocalOf
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
|
import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage
|
||||||
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
|
import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow
|
||||||
import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManager
|
import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManager
|
||||||
@@ -35,14 +34,13 @@ import com.x8bit.bitwarden.ui.platform.manager.review.AppReviewManagerImpl
|
|||||||
fun LocalManagerProvider(
|
fun LocalManagerProvider(
|
||||||
content: @Composable () -> Unit,
|
content: @Composable () -> Unit,
|
||||||
) {
|
) {
|
||||||
val activity = LocalContext.current as Activity
|
val activity = requireNotNull(LocalActivity.current)
|
||||||
val fido2IntentManager: IntentManager = IntentManagerImpl(activity)
|
val fido2IntentManager: IntentManager = IntentManagerImpl(activity)
|
||||||
val fido2CompletionManager =
|
val fido2CompletionManager = if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) {
|
||||||
if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) {
|
Fido2CompletionManagerUnsupportedApiImpl
|
||||||
Fido2CompletionManagerUnsupportedApiImpl
|
} else {
|
||||||
} else {
|
Fido2CompletionManagerImpl(activity, fido2IntentManager)
|
||||||
Fido2CompletionManagerImpl(activity, fido2IntentManager)
|
}
|
||||||
}
|
|
||||||
CompositionLocalProvider(
|
CompositionLocalProvider(
|
||||||
LocalPermissionsManager provides PermissionsManagerImpl(activity),
|
LocalPermissionsManager provides PermissionsManagerImpl(activity),
|
||||||
LocalIntentManager provides fido2IntentManager,
|
LocalIntentManager provides fido2IntentManager,
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
package com.x8bit.bitwarden.ui.platform.feature.rootnav
|
package com.x8bit.bitwarden.ui.platform.feature.rootnav
|
||||||
|
|
||||||
import android.app.Activity
|
import androidx.activity.compose.LocalActivity
|
||||||
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
|
||||||
@@ -148,7 +147,7 @@ fun RootNavScreen(
|
|||||||
|
|
||||||
// In some scenarios on an emulator the Activity can leak when recreated
|
// 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.
|
// if we don't first clear focus anytime we change the root destination.
|
||||||
(LocalContext.current as? Activity)?.currentFocus?.clearFocus()
|
LocalActivity.current?.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 {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ minSdk = "29"
|
|||||||
|
|
||||||
# Dependency Versions
|
# Dependency Versions
|
||||||
androidGradlePlugin = "8.8.0"
|
androidGradlePlugin = "8.8.0"
|
||||||
androidxActivity = "1.9.3"
|
androidxActivity = "1.10.0"
|
||||||
androidXBiometrics = "1.2.0-alpha05"
|
androidXBiometrics = "1.2.0-alpha05"
|
||||||
androidxBrowser = "1.8.0"
|
androidxBrowser = "1.8.0"
|
||||||
androidxCamera = "1.4.1"
|
androidxCamera = "1.4.1"
|
||||||
|
|||||||
Reference in New Issue
Block a user