bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-10 20:07:59 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

Fix deprecation within the app (#6096)

Browse Source
This commit is contained in:
David Perez 2025-10-29 16:02:03 -05:00 committed by GitHub
parent de33ba021b
commit 600744538d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/main/kotlin/com/bitwarden/ui/platform/components/appbar/color/BitwardenTopAppBarColors.kt
View File

@ -1,6 +1,5 @@
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
@ -8,7 +7,6 @@ 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,
@ -16,4 +14,5 @@ fun bitwardenTopAppBarColors(): TopAppBarColors = TopAppBarColors(
navigationIconContentColor = BitwardenTheme.colorScheme.icon.primary,
titleContentColor = BitwardenTheme.colorScheme.text.primary,
actionIconContentColor = BitwardenTheme.colorScheme.icon.primary,
subtitleContentColor = BitwardenTheme.colorScheme.text.primary,
)

4
ui/src/main/kotlin/com/bitwarden/ui/platform/components/coachmark/scope/CoachMarkScopeInstance.kt
View File

@ -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
@ -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 = {

4
ui/src/main/kotlin/com/bitwarden/ui/platform/components/field/BitwardenTextField.kt
View File

@ -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
@ -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

11
ui/src/main/kotlin/com/bitwarden/ui/platform/util/WindowAdaptiveInfoExtensions.kt
View File

@ -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
/**
@ -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()
}
}
@ -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
}
}