From 1e24e39b2ee4d57d3fb340286b33b4dfaa002803 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 09:57:47 +0200 Subject: [PATCH] Update dependency androidx.compose.material3:material3 to v1.2.0-alpha09 (#1493) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependency androidx.compose.material3:material3 to v1.2.0-alpha09 * Fix deprecation issues --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín --- .../components/customreaction/EmojiPicker.kt | 12 ++++++------ gradle/libs.versions.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) 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 dc0e8a190f..ee9d4c819d 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 @@ -34,8 +34,8 @@ import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.ripple.rememberRipple +import androidx.compose.material3.SecondaryTabRow import androidx.compose.material3.Tab -import androidx.compose.material3.TabRow import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -49,8 +49,8 @@ import io.element.android.emojibasebindings.Emoji import io.element.android.emojibasebindings.EmojibaseCategory import io.element.android.emojibasebindings.EmojibaseDatasource import io.element.android.emojibasebindings.EmojibaseStore -import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.ElementPreview +import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.theme.ElementTheme @@ -68,12 +68,12 @@ fun EmojiPicker( ) { val coroutineScope = rememberCoroutineScope() val categories = remember { emojibaseStore.categories } - val pagerState = rememberPagerState(pageCount = { EmojibaseCategory.values().size }) + val pagerState = rememberPagerState(pageCount = { EmojibaseCategory.entries.size }) Column(modifier) { - TabRow( + SecondaryTabRow( selectedTabIndex = pagerState.currentPage, ) { - EmojibaseCategory.values().forEachIndexed { index, category -> + EmojibaseCategory.entries.forEachIndexed { index, category -> Tab( text = { Icon( @@ -93,7 +93,7 @@ fun EmojiPicker( state = pagerState, modifier = Modifier.fillMaxWidth(), ) { index -> - val category = EmojibaseCategory.values()[index] + val category = EmojibaseCategory.entries[index] val emojis = categories[category] ?: listOf() LazyVerticalGrid( modifier = Modifier.fillMaxSize(), diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8eb33c3b44..2be4c7c350 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -96,7 +96,7 @@ androidx_webkit = "androidx.webkit:webkit:1.8.0" androidx_compose_bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" } # Warning: issue on alpha07, make sure this is working when upgrading # Context in https://github.com/vector-im/element-x-android/pull/1239#issuecomment-1711500332 -androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha08" +androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha09" # Coroutines coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }