Skip to content

Fix deprecation within the app #6096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

Fix deprecation within the app #6096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...main/kotlin/com/bitwarden/ui/platform/components/appbar/color/BitwardenTopAppBarColors.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
package com.bitwarden.ui.platform.components.appbar.color

import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.TopAppBarColors
import androidx.compose.runtime.Composable
import com.bitwarden.ui.platform.theme.BitwardenTheme

/**
* Provides a default set of Bitwarden-styled colors for top app bars.
*/
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun bitwardenTopAppBarColors(): TopAppBarColors = TopAppBarColors(
containerColor = BitwardenTheme.colorScheme.background.secondary,
scrolledContainerColor = BitwardenTheme.colorScheme.background.secondary,
navigationIconContentColor = BitwardenTheme.colorScheme.icon.primary,
titleContentColor = BitwardenTheme.colorScheme.text.primary,
actionIconContentColor = BitwardenTheme.colorScheme.icon.primary,
subtitleContentColor = BitwardenTheme.colorScheme.text.primary,
)
4 changes: 3 additions & 1 deletion ...ain/kotlin/com/bitwarden/ui/platform/components/coachmark/scope/CoachMarkScopeInstance.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.TooltipAnchorPosition
import androidx.compose.material3.TooltipBox
import androidx.compose.material3.TooltipDefaults
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -199,7 +200,8 @@ internal class CoachMarkScopeInstance<T : Enum<T>>(
anchorContent: @Composable () -> Unit,
) {
TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(
positionProvider = TooltipDefaults.rememberTooltipPositionProvider(
positioning = TooltipAnchorPosition.Above,
spacingBetweenTooltipAndAnchor = 10.dp,
),
tooltip = {
Expand Down
4 changes: 2 additions & 2 deletions ui/src/main/kotlin/com/bitwarden/ui/platform/components/field/BitwardenTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExposedDropdownMenuAnchorType
import androidx.compose.material3.ExposedDropdownMenuBox
import androidx.compose.material3.MenuAnchorType
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -375,7 +375,7 @@ fun BitwardenTextField(
visualTransformation = visualTransformation,
modifier = Modifier
.nullableTestTag(tag = textFieldTestTag)
.menuAnchor(type = MenuAnchorType.PrimaryEditable)
.menuAnchor(type = ExposedDropdownMenuAnchorType.PrimaryEditable)
.fillMaxWidth()
.onFocusChanged { focusState ->
focused = focusState.isFocused
Expand Down
11 changes: 5 additions & 6 deletions ui/src/main/kotlin/com/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import androidx.compose.material3.adaptive.WindowAdaptiveInfo
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.window.core.layout.WindowWidthSizeClass
import com.bitwarden.ui.platform.model.WindowSize

/**
Expand All @@ -14,7 +13,7 @@ import com.bitwarden.ui.platform.model.WindowSize
fun rememberWindowSize(
windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),
): WindowSize {
return remember(key1 = windowAdaptiveInfo.windowSizeClass.windowWidthSizeClass) {
return remember(key1 = windowAdaptiveInfo.windowSizeClass) {
windowAdaptiveInfo.getWindowSize()
}
}
Expand All @@ -25,9 +24,9 @@ fun rememberWindowSize(
fun WindowAdaptiveInfo.getWindowSize(): WindowSize {
// Currently the app only operates with the Compact and Medium sizes in
// mind, but we can add support for others in the future here.
return when (this.windowSizeClass.windowWidthSizeClass) {
WindowWidthSizeClass.COMPACT -> WindowSize.Compact
WindowWidthSizeClass.MEDIUM -> WindowSize.Medium
else -> WindowSize.Medium
return if (this.windowSizeClass.isWidthAtLeastBreakpoint(widthDpBreakpoint = 600)) {
WindowSize.Medium
} else {
WindowSize.Compact
}
}
Loading