Skip to content

Commit e4b269c

Browse files
committed
Fix compilation errors and warnings.
1 parent 109a719 commit e4b269c

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/RoomListTopBar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private fun DefaultRoomListTopBar(
151151
isVisible = !areSearchResultsDisplayed,
152152
)
153153
.statusBarsPadding(),
154-
colors = TopAppBarDefaults.mediumTopAppBarColors(
154+
colors = TopAppBarDefaults.topAppBarColors(
155155
containerColor = Color.Transparent,
156156
scrolledContainerColor = Color.Transparent,
157157
),

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceDropdown.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import androidx.compose.foundation.layout.Column
1414
import androidx.compose.foundation.layout.Row
1515
import androidx.compose.foundation.layout.fillMaxWidth
1616
import androidx.compose.material3.ExperimentalMaterial3Api
17+
import androidx.compose.material3.ExposedDropdownMenuAnchorType
1718
import androidx.compose.material3.ExposedDropdownMenuBox
1819
import androidx.compose.material3.ExposedDropdownMenuDefaults
19-
import androidx.compose.material3.MenuAnchorType
2020
import androidx.compose.runtime.Composable
2121
import androidx.compose.runtime.getValue
2222
import androidx.compose.runtime.mutableStateOf
@@ -120,7 +120,7 @@ private fun <T : DropdownOption> DropdownTrailingContent(
120120
modifier = modifier,
121121
) {
122122
Row(
123-
modifier = Modifier.menuAnchor(MenuAnchorType.PrimaryNotEditable),
123+
modifier = Modifier.menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable),
124124
verticalAlignment = Alignment.CenterVertically,
125125
) {
126126
Text(
@@ -134,7 +134,7 @@ private fun <T : DropdownOption> DropdownTrailingContent(
134134
ExposedDropdownMenu(
135135
expanded = expanded,
136136
onDismissRequest = { onExpandedChange(false) },
137-
matchTextFieldWidth = false,
137+
matchAnchorWidth = false,
138138
) {
139139
options.forEach { option ->
140140
DropdownMenuItem(

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package io.element.android.libraries.designsystem.components.tooltip
99

1010
import androidx.compose.material3.ExperimentalMaterial3Api
11+
import androidx.compose.material3.TooltipAnchorPosition
1112
import androidx.compose.material3.TooltipDefaults
1213
import androidx.compose.runtime.Composable
1314
import androidx.compose.runtime.remember
@@ -40,8 +41,9 @@ object ElementTooltipDefaults {
4041
windowPadding: Dp = 12.dp,
4142
): PopupPositionProvider {
4243
val windowPaddingPx = with(LocalDensity.current) { windowPadding.roundToPx() }
43-
val plainTooltipPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(
44-
spacingBetweenTooltipAndAnchor = spacingBetweenTooltipAndAnchor,
44+
val plainTooltipPositionProvider = TooltipDefaults.rememberTooltipPositionProvider(
45+
positioning = TooltipAnchorPosition.Above,
46+
spacingBetweenTooltipAndAnchor = spacingBetweenTooltipAndAnchor
4547
)
4648
return remember(windowPaddingPx, plainTooltipPositionProvider) {
4749
object : PopupPositionProvider {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import androidx.compose.material3.ExperimentalMaterial3Api
1111
import androidx.compose.material3.SheetState
1212
import androidx.compose.material3.SheetValue
1313
import androidx.compose.runtime.Composable
14-
import androidx.compose.ui.platform.LocalDensity
1514

1615
@OptIn(ExperimentalMaterial3Api::class)
1716
@Composable
1817
fun sheetStateForPreview() = SheetState(
1918
skipPartiallyExpanded = true,
19+
positionalThreshold = { 0.5f },
20+
velocityThreshold = { 400f },
2021
initialValue = SheetValue.Expanded,
21-
density = LocalDensity.current,
2222
)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fun MediumTopAppBar(
3232
navigationIcon: @Composable () -> Unit = {},
3333
actions: @Composable RowScope.() -> Unit = {},
3434
windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
35-
colors: TopAppBarColors = TopAppBarDefaults.mediumTopAppBarColors(),
35+
colors: TopAppBarColors = TopAppBarDefaults.topAppBarColors(),
3636
scrollBehavior: TopAppBarScrollBehavior? = null
3737
) {
3838
androidx.compose.material3.MediumTopAppBar(

0 commit comments

Comments
 (0)