letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #1815 from vector-im/renovate/androidx.compose.material3-material3-1.x

Browse Source 
Update dependency androidx.compose.material3:material3 to v1.2.0-alpha11
This commit is contained in:
Benoit Marty
2023-11-22 09:45:30 +01:00
committed by GitHub
parent eb2836f42b 806a5193d3
commit 468331ca0f
9 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

2
gradle/libs.versions.toml
View File

@@ -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" }

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

@@ -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,

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

@@ -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,

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

@@ -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,
) {

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

@@ -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,
) {

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

@@ -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,

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

@@ -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,
) {

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

@@ -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,