File tree Expand file tree Collapse file tree 4 files changed +11
-11
lines changed
ui/src/main/kotlin/com/bitwarden/ui/platform Expand file tree Collapse file tree 4 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 11package com.bitwarden.ui.platform.components.appbar.color
22
3- import androidx.compose.material3.ExperimentalMaterial3Api
43import androidx.compose.material3.TopAppBarColors
54import androidx.compose.runtime.Composable
65import com.bitwarden.ui.platform.theme.BitwardenTheme
76
87/* *
98 * Provides a default set of Bitwarden-styled colors for top app bars.
109 */
11- @OptIn(ExperimentalMaterial3Api ::class )
1210@Composable
1311fun bitwardenTopAppBarColors (): TopAppBarColors = TopAppBarColors (
1412 containerColor = BitwardenTheme .colorScheme.background.secondary,
1513 scrolledContainerColor = BitwardenTheme .colorScheme.background.secondary,
1614 navigationIconContentColor = BitwardenTheme .colorScheme.icon.primary,
1715 titleContentColor = BitwardenTheme .colorScheme.text.primary,
1816 actionIconContentColor = BitwardenTheme .colorScheme.icon.primary,
17+ subtitleContentColor = BitwardenTheme .colorScheme.text.primary,
1918)
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.padding
77import androidx.compose.foundation.lazy.LazyListScope
88import androidx.compose.foundation.lazy.itemsIndexed
99import androidx.compose.material3.ExperimentalMaterial3Api
10+ import androidx.compose.material3.TooltipAnchorPosition
1011import androidx.compose.material3.TooltipBox
1112import androidx.compose.material3.TooltipDefaults
1213import androidx.compose.runtime.Composable
@@ -199,7 +200,8 @@ internal class CoachMarkScopeInstance<T : Enum<T>>(
199200 anchorContent : @Composable () -> Unit ,
200201 ) {
201202 TooltipBox (
202- positionProvider = TooltipDefaults .rememberPlainTooltipPositionProvider(
203+ positionProvider = TooltipDefaults .rememberTooltipPositionProvider(
204+ positioning = TooltipAnchorPosition .Above ,
203205 spacingBetweenTooltipAndAnchor = 10 .dp,
204206 ),
205207 tooltip = {
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ import androidx.compose.foundation.text.KeyboardActions
1818import androidx.compose.foundation.text.KeyboardOptions
1919import androidx.compose.material3.DropdownMenuItem
2020import androidx.compose.material3.ExperimentalMaterial3Api
21+ import androidx.compose.material3.ExposedDropdownMenuAnchorType
2122import androidx.compose.material3.ExposedDropdownMenuBox
22- import androidx.compose.material3.MenuAnchorType
2323import androidx.compose.material3.Text
2424import androidx.compose.material3.TextField
2525import androidx.compose.runtime.Composable
@@ -375,7 +375,7 @@ fun BitwardenTextField(
375375 visualTransformation = visualTransformation,
376376 modifier = Modifier
377377 .nullableTestTag(tag = textFieldTestTag)
378- .menuAnchor(type = MenuAnchorType .PrimaryEditable )
378+ .menuAnchor(type = ExposedDropdownMenuAnchorType .PrimaryEditable )
379379 .fillMaxWidth()
380380 .onFocusChanged { focusState ->
381381 focused = focusState.isFocused
Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ import androidx.compose.material3.adaptive.WindowAdaptiveInfo
44import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
55import androidx.compose.runtime.Composable
66import androidx.compose.runtime.remember
7- import androidx.window.core.layout.WindowWidthSizeClass
87import com.bitwarden.ui.platform.model.WindowSize
98
109/* *
@@ -14,7 +13,7 @@ import com.bitwarden.ui.platform.model.WindowSize
1413fun rememberWindowSize (
1514 windowAdaptiveInfo : WindowAdaptiveInfo = currentWindowAdaptiveInfo(),
1615): WindowSize {
17- return remember(key1 = windowAdaptiveInfo.windowSizeClass.windowWidthSizeClass ) {
16+ return remember(key1 = windowAdaptiveInfo.windowSizeClass) {
1817 windowAdaptiveInfo.getWindowSize()
1918 }
2019}
@@ -25,9 +24,9 @@ fun rememberWindowSize(
2524fun WindowAdaptiveInfo.getWindowSize (): WindowSize {
2625 // Currently the app only operates with the Compact and Medium sizes in
2726 // mind, but we can add support for others in the future here.
28- return when (this .windowSizeClass.windowWidthSizeClass ) {
29- WindowWidthSizeClass . COMPACT -> WindowSize .Compact
30- WindowWidthSizeClass . MEDIUM -> WindowSize . Medium
31- else -> WindowSize .Medium
27+ return if (this .windowSizeClass.isWidthAtLeastBreakpoint(widthDpBreakpoint = 600 ) ) {
28+ WindowSize .Medium
29+ } else {
30+ WindowSize .Compact
3231 }
3332}
You can’t perform that action at this time.
0 commit comments