From 50c193b5531a92628eef341143ab25d1d4a4524a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 14:45:34 +0000 Subject: [PATCH 1/3] Update dependency androidx.compose.material3:material3 to v1.2.0-alpha11 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 79dc0222ac..7f13c696e8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -89,7 +89,7 @@ androidx_preference = "androidx.preference:preference:1.2.1" androidx_webkit = "androidx.webkit:webkit:1.8.0" androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" } -androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha10" +androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha11" androidx_compose_ui = { module = "androidx.compose.ui:ui" } androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" } androidx_compose_ui_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" } From 16186f74f1114125cf2911ae0b5b4a35cabb9dab Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 21 Nov 2023 16:13:07 +0100 Subject: [PATCH 2/3] Fix compilation warning, add opt in for ExperimentalMaterial3Api --- .../impl/timeline/components/customreaction/EmojiPicker.kt | 3 ++- .../libraries/designsystem/components/tooltip/TooltipBox.kt | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt index 29d6b14e59..02ddfec026 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt @@ -27,6 +27,7 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.SecondaryTabRow import androidx.compose.material3.Tab import androidx.compose.runtime.Composable @@ -47,7 +48,7 @@ import kotlinx.collections.immutable.ImmutableSet import kotlinx.collections.immutable.persistentSetOf import kotlinx.coroutines.launch -@OptIn(ExperimentalFoundationApi::class) +@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable fun EmojiPicker( onEmojiSelected: (Emoji) -> Unit, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt index 589f1fddcd..fc11758104 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt @@ -16,12 +16,14 @@ package io.element.android.libraries.designsystem.components.tooltip +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.TooltipState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.material3.TooltipBox as M3TooltipBox +@OptIn(ExperimentalMaterial3Api::class) @Composable fun TooltipBox( positionProvider: PopupPositionProvider, From 806a5193d3caebc9ac1842e83b4b80a6a63f734b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 21 Nov 2023 17:22:53 +0100 Subject: [PATCH 3/3] Replace Alertdialog (deprecated) by BasicAlertDialog. --- .../designsystem/components/dialogs/ConfirmationDialog.kt | 4 ++-- .../libraries/designsystem/components/dialogs/ErrorDialog.kt | 4 ++-- .../libraries/designsystem/components/dialogs/ListDialog.kt | 4 ++-- .../components/dialogs/MultipleSelectionDialog.kt | 4 ++-- .../libraries/designsystem/components/dialogs/RetryDialog.kt | 4 ++-- .../designsystem/components/dialogs/SingleSelectionDialog.kt | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt index 801575fe56..aed618cd3b 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt @@ -16,7 +16,7 @@ package io.element.android.libraries.designsystem.components.dialogs -import androidx.compose.material3.AlertDialog +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -43,7 +43,7 @@ fun ConfirmationDialog( onCancelClicked: () -> Unit = onDismiss, onThirdButtonClicked: () -> Unit = {}, ) { - AlertDialog(modifier = modifier, onDismissRequest = onDismiss) { + BasicAlertDialog(modifier = modifier, onDismissRequest = onDismiss) { ConfirmationDialogContent( title = title, content = content, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt index 9b080f5403..52779052a6 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt @@ -16,7 +16,7 @@ package io.element.android.libraries.designsystem.components.dialogs -import androidx.compose.material3.AlertDialog +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -37,7 +37,7 @@ fun ErrorDialog( title: String = ErrorDialogDefaults.title, submitText: String = ErrorDialogDefaults.submitText, ) { - AlertDialog(modifier = modifier, onDismissRequest = onDismiss) { + BasicAlertDialog(modifier = modifier, onDismissRequest = onDismiss) { ErrorDialogContent( title = title, content = content, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt index 5ad13d6a13..83079584c3 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt @@ -19,7 +19,7 @@ package io.element.android.libraries.designsystem.components.dialogs import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope -import androidx.compose.material3.AlertDialog +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -56,7 +56,7 @@ fun ListDialog( ) } } - AlertDialog( + BasicAlertDialog( modifier = modifier, onDismissRequest = onDismissRequest, ) { diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt index 5ed79f2c35..055843edae 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt @@ -19,7 +19,7 @@ package io.element.android.libraries.designsystem.components.dialogs import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material3.AlertDialog +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -60,7 +60,7 @@ fun MultipleSelectionDialog( ) } } - AlertDialog( + BasicAlertDialog( modifier = modifier, onDismissRequest = onDismissRequest, ) { diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt index 85447b940b..1837041e64 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt @@ -16,7 +16,7 @@ package io.element.android.libraries.designsystem.components.dialogs -import androidx.compose.material3.AlertDialog +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -39,7 +39,7 @@ fun RetryDialog( onRetry: () -> Unit = {}, onDismiss: () -> Unit = {}, ) { - AlertDialog(modifier = modifier, onDismissRequest = onDismiss) { + BasicAlertDialog(modifier = modifier, onDismissRequest = onDismiss) { RetryDialogContent( title = title, content = content, diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt index 82b88bc0a1..36869bf270 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt @@ -19,7 +19,7 @@ package io.element.android.libraries.designsystem.components.dialogs import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material3.AlertDialog +import androidx.compose.material3.BasicAlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -57,7 +57,7 @@ fun SingleSelectionDialog( ) } } - AlertDialog( + BasicAlertDialog( modifier = modifier, onDismissRequest = onDismissRequest, ) {