Skip to content

Commit aae30fc

Browse files
authored
Merge pull request #1815 from vector-im/renovate/androidx.compose.material3-material3-1.x
Update dependency androidx.compose.material3:material3 to v1.2.0-alpha11
2 parents de646e4 + 637f788 commit aae30fc

File tree

9 files changed

+17
-14
lines changed

9 files changed

+17
-14
lines changed

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
2727
import androidx.compose.foundation.lazy.grid.items
2828
import androidx.compose.foundation.pager.HorizontalPager
2929
import androidx.compose.foundation.pager.rememberPagerState
30+
import androidx.compose.material3.ExperimentalMaterial3Api
3031
import androidx.compose.material3.SecondaryTabRow
3132
import androidx.compose.material3.Tab
3233
import androidx.compose.runtime.Composable
@@ -47,7 +48,7 @@ import kotlinx.collections.immutable.ImmutableSet
4748
import kotlinx.collections.immutable.persistentSetOf
4849
import kotlinx.coroutines.launch
4950

50-
@OptIn(ExperimentalFoundationApi::class)
51+
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
5152
@Composable
5253
fun EmojiPicker(
5354
onEmojiSelected: (Emoji) -> Unit,

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ androidx_preference = "androidx.preference:preference:1.2.1"
8989
androidx_webkit = "androidx.webkit:webkit:1.8.0"
9090

9191
androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
92-
androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha10"
92+
androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha11"
9393
androidx_compose_ui = { module = "androidx.compose.ui:ui" }
9494
androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }
9595
androidx_compose_ui_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package io.element.android.libraries.designsystem.components.dialogs
1818

19-
import androidx.compose.material3.AlertDialog
19+
import androidx.compose.material3.BasicAlertDialog
2020
import androidx.compose.material3.ExperimentalMaterial3Api
2121
import androidx.compose.runtime.Composable
2222
import androidx.compose.ui.Modifier
@@ -43,7 +43,7 @@ fun ConfirmationDialog(
4343
onCancelClicked: () -> Unit = onDismiss,
4444
onThirdButtonClicked: () -> Unit = {},
4545
) {
46-
AlertDialog(modifier = modifier, onDismissRequest = onDismiss) {
46+
BasicAlertDialog(modifier = modifier, onDismissRequest = onDismiss) {
4747
ConfirmationDialogContent(
4848
title = title,
4949
content = content,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package io.element.android.libraries.designsystem.components.dialogs
1818

19-
import androidx.compose.material3.AlertDialog
19+
import androidx.compose.material3.BasicAlertDialog
2020
import androidx.compose.material3.ExperimentalMaterial3Api
2121
import androidx.compose.runtime.Composable
2222
import androidx.compose.ui.Modifier
@@ -37,7 +37,7 @@ fun ErrorDialog(
3737
title: String = ErrorDialogDefaults.title,
3838
submitText: String = ErrorDialogDefaults.submitText,
3939
) {
40-
AlertDialog(modifier = modifier, onDismissRequest = onDismiss) {
40+
BasicAlertDialog(modifier = modifier, onDismissRequest = onDismiss) {
4141
ErrorDialogContent(
4242
title = title,
4343
content = content,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package io.element.android.libraries.designsystem.components.dialogs
1919
import androidx.compose.foundation.layout.padding
2020
import androidx.compose.foundation.lazy.LazyColumn
2121
import androidx.compose.foundation.lazy.LazyListScope
22-
import androidx.compose.material3.AlertDialog
22+
import androidx.compose.material3.BasicAlertDialog
2323
import androidx.compose.material3.ExperimentalMaterial3Api
2424
import androidx.compose.runtime.Composable
2525
import androidx.compose.ui.Modifier
@@ -56,7 +56,7 @@ fun ListDialog(
5656
)
5757
}
5858
}
59-
AlertDialog(
59+
BasicAlertDialog(
6060
modifier = modifier,
6161
onDismissRequest = onDismissRequest,
6262
) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package io.element.android.libraries.designsystem.components.dialogs
1919
import androidx.compose.foundation.layout.padding
2020
import androidx.compose.foundation.lazy.LazyColumn
2121
import androidx.compose.foundation.lazy.itemsIndexed
22-
import androidx.compose.material3.AlertDialog
22+
import androidx.compose.material3.BasicAlertDialog
2323
import androidx.compose.material3.ExperimentalMaterial3Api
2424
import androidx.compose.runtime.Composable
2525
import androidx.compose.runtime.remember
@@ -60,7 +60,7 @@ fun MultipleSelectionDialog(
6060
)
6161
}
6262
}
63-
AlertDialog(
63+
BasicAlertDialog(
6464
modifier = modifier,
6565
onDismissRequest = onDismissRequest,
6666
) {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package io.element.android.libraries.designsystem.components.dialogs
1818

19-
import androidx.compose.material3.AlertDialog
19+
import androidx.compose.material3.BasicAlertDialog
2020
import androidx.compose.material3.ExperimentalMaterial3Api
2121
import androidx.compose.runtime.Composable
2222
import androidx.compose.ui.Modifier
@@ -39,7 +39,7 @@ fun RetryDialog(
3939
onRetry: () -> Unit = {},
4040
onDismiss: () -> Unit = {},
4141
) {
42-
AlertDialog(modifier = modifier, onDismissRequest = onDismiss) {
42+
BasicAlertDialog(modifier = modifier, onDismissRequest = onDismiss) {
4343
RetryDialogContent(
4444
title = title,
4545
content = content,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package io.element.android.libraries.designsystem.components.dialogs
1919
import androidx.compose.foundation.layout.padding
2020
import androidx.compose.foundation.lazy.LazyColumn
2121
import androidx.compose.foundation.lazy.itemsIndexed
22-
import androidx.compose.material3.AlertDialog
22+
import androidx.compose.material3.BasicAlertDialog
2323
import androidx.compose.material3.ExperimentalMaterial3Api
2424
import androidx.compose.runtime.Composable
2525
import androidx.compose.ui.Modifier
@@ -57,7 +57,7 @@ fun SingleSelectionDialog(
5757
)
5858
}
5959
}
60-
AlertDialog(
60+
BasicAlertDialog(
6161
modifier = modifier,
6262
onDismissRequest = onDismissRequest,
6363
) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
package io.element.android.libraries.designsystem.components.tooltip
1818

19+
import androidx.compose.material3.ExperimentalMaterial3Api
1920
import androidx.compose.material3.TooltipState
2021
import androidx.compose.runtime.Composable
2122
import androidx.compose.ui.Modifier
2223
import androidx.compose.ui.window.PopupPositionProvider
2324
import androidx.compose.material3.TooltipBox as M3TooltipBox
2425

26+
@OptIn(ExperimentalMaterial3Api::class)
2527
@Composable
2628
fun TooltipBox(
2729
positionProvider: PopupPositionProvider,

0 commit comments

Comments
 (0)