From 28db80aed26f0d5f3eff23ff338520cee56861b1 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 29 Sep 2025 17:49:03 +0200 Subject: [PATCH] Fix compilation errors and warnings. --- .../components/tooltip/ElementTooltipDefaults.kt | 6 ++++-- .../android/libraries/designsystem/preview/SheetState.kt | 4 ++-- .../designsystem/theme/components/MediumTopAppBar.kt | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt index b21c5550cf..c6c244b2d6 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/ElementTooltipDefaults.kt @@ -9,6 +9,7 @@ package io.element.android.libraries.designsystem.components.tooltip import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.TooltipAnchorPosition import androidx.compose.material3.TooltipDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -41,8 +42,9 @@ object ElementTooltipDefaults { windowPadding: Dp = 12.dp, ): PopupPositionProvider { val windowPaddingPx = with(LocalDensity.current) { windowPadding.roundToPx() } - val plainTooltipPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider( - spacingBetweenTooltipAndAnchor = spacingBetweenTooltipAndAnchor, + val plainTooltipPositionProvider = TooltipDefaults.rememberTooltipPositionProvider( + positioning = TooltipAnchorPosition.Above, + spacingBetweenTooltipAndAnchor = spacingBetweenTooltipAndAnchor ) return remember(windowPaddingPx, plainTooltipPositionProvider) { object : PopupPositionProvider { diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt index d14d614306..7e687e9b89 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/SheetState.kt @@ -12,12 +12,12 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.SheetState import androidx.compose.material3.SheetValue import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalDensity @OptIn(ExperimentalMaterial3Api::class) @Composable fun sheetStateForPreview() = SheetState( skipPartiallyExpanded = true, + positionalThreshold = { 0.5f }, + velocityThreshold = { 400f }, initialValue = SheetValue.Expanded, - density = LocalDensity.current, ) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt index e4c8ca74db..a49a3595f7 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/MediumTopAppBar.kt @@ -33,7 +33,7 @@ fun MediumTopAppBar( navigationIcon: @Composable () -> Unit = {}, actions: @Composable RowScope.() -> Unit = {}, windowInsets: WindowInsets = TopAppBarDefaults.windowInsets, - colors: TopAppBarColors = TopAppBarDefaults.mediumTopAppBarColors(), + colors: TopAppBarColors = TopAppBarDefaults.topAppBarColors(), scrollBehavior: TopAppBarScrollBehavior? = null ) { androidx.compose.material3.MediumTopAppBar(