diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt index f05f11ef96..1cdc847ece 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountSwitcher.kt @@ -53,6 +53,7 @@ import com.bitwarden.ui.platform.base.util.scrolledContainerBackground import com.bitwarden.ui.platform.base.util.toSafeOverlayColor import com.bitwarden.ui.platform.base.util.toUnscaledTextUnit import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider +import com.bitwarden.ui.platform.components.scrim.BitwardenAnimatedScrim import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.resource.BitwardenString @@ -62,7 +63,6 @@ import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenRemovalConfirm import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenSelectionDialog import com.x8bit.bitwarden.ui.platform.components.dialog.row.BitwardenBasicDialogRow import com.x8bit.bitwarden.ui.platform.components.model.AccountSummary -import com.x8bit.bitwarden.ui.platform.components.scrim.BitwardenAnimatedScrim import com.x8bit.bitwarden.ui.vault.feature.vault.util.iconRes import com.x8bit.bitwarden.ui.vault.feature.vault.util.iconTestTag import com.x8bit.bitwarden.ui.vault.feature.vault.util.initials diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt index 3688ab5012..2de6d9b6f5 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/scaffold/BitwardenScaffold.kt @@ -42,13 +42,13 @@ import androidx.compose.ui.zIndex import com.bitwarden.ui.platform.base.util.toDp import com.bitwarden.ui.platform.components.navigation.BitwardenBottomAppBar import com.bitwarden.ui.platform.components.navigation.BitwardenNavigationRail +import com.bitwarden.ui.platform.components.scrim.BitwardenAnimatedScrim import com.bitwarden.ui.platform.model.WindowSize import com.bitwarden.ui.platform.theme.BitwardenTheme import com.bitwarden.ui.platform.util.rememberWindowSize import com.x8bit.bitwarden.ui.platform.components.model.BitwardenPullToRefreshState import com.x8bit.bitwarden.ui.platform.components.model.ScaffoldNavigationData import com.x8bit.bitwarden.ui.platform.components.model.rememberBitwardenPullToRefreshState -import com.x8bit.bitwarden.ui.platform.components.scrim.BitwardenAnimatedScrim /** * Direct passthrough to [Scaffold] but contains a few specific override values. Everything is diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/scrim/BitwardenAnimatedScrim.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/scrim/BitwardenAnimatedScrim.kt similarity index 96% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/scrim/BitwardenAnimatedScrim.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/scrim/BitwardenAnimatedScrim.kt index cdddc46e14..c652d93ddb 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/scrim/BitwardenAnimatedScrim.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/scrim/BitwardenAnimatedScrim.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.ui.platform.components.scrim +package com.bitwarden.ui.platform.components.scrim import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn