1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-02-22 16:49:13 +03:00

Update the AndroidX Activity library to 1.10.0 ()

This commit is contained in:
David Perez 2025-01-20 16:17:00 -06:00 committed by GitHub
parent e25743e3f0
commit 08e51fde98
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 13 deletions
app/src/main/java/com/x8bit/bitwarden/ui/platform
composition
feature/rootnav
gradle

View file

@ -2,14 +2,13 @@
package com.x8bit.bitwarden.ui.platform.composition
import android.app.Activity
import android.os.Build
import androidx.activity.compose.LocalActivity
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocal
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.ProvidableCompositionLocal
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.util.isBuildVersionBelow
import com.x8bit.bitwarden.ui.autofill.fido2.manager.Fido2CompletionManager
@ -35,14 +34,13 @@ import com.x8bit.bitwarden.ui.platform.manager.review.AppReviewManagerImpl
fun LocalManagerProvider(
content: @Composable () -> Unit,
) {
val activity = LocalContext.current as Activity
val activity = requireNotNull(LocalActivity.current)
val fido2IntentManager: IntentManager = IntentManagerImpl(activity)
val fido2CompletionManager =
if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) {
Fido2CompletionManagerUnsupportedApiImpl
} else {
Fido2CompletionManagerImpl(activity, fido2IntentManager)
}
val fido2CompletionManager = if (isBuildVersionBelow(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)) {
Fido2CompletionManagerUnsupportedApiImpl
} else {
Fido2CompletionManagerImpl(activity, fido2IntentManager)
}
CompositionLocalProvider(
LocalPermissionsManager provides PermissionsManagerImpl(activity),
LocalIntentManager provides fido2IntentManager,

View file

@ -1,12 +1,11 @@
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.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavBackStackEntry
@ -148,7 +147,7 @@ fun RootNavScreen(
// 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()
LocalActivity.current?.currentFocus?.clearFocus()
// When state changes, navigate to different root navigation state
val rootNavOptions = navOptions {

View file

@ -8,7 +8,7 @@ minSdk = "29"
# Dependency Versions
androidGradlePlugin = "8.8.0"
androidxActivity = "1.9.3"
androidxActivity = "1.10.0"
androidXBiometrics = "1.2.0-alpha05"
androidxBrowser = "1.8.0"
androidxCamera = "1.4.1"