fix(deps): update dependency androidx.compose.material3:material3 to v1.5.0-alpha15 (#6306)

* fix(deps): update dependency androidx.compose.material3:material3 to v1.5.0-alpha15

* Fix deprecations

* Add bottom sheet workaround

* Fix new lint issues

* Fix and ignore broken tests

* Update screenshots

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
Co-authored-by: ElementBot <android@element.io>

app/src/main/kotlin/io/element/android/x/ElementXApplication.kt

@@ -9,6 +9,8 @@
 package io.element.android.x
 
 import android.app.Application
+import androidx.compose.material3.ComposeMaterial3Flags.isAnchoredDraggableComponentsStrictOffsetCheckEnabled
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.startup.AppInitializer
 import androidx.work.Configuration
 import dev.zacsweers.metro.createGraphFactory
@@ -27,6 +29,7 @@ class ElementXApplication : Application(), DependencyInjectionGraphOwner, Config
         .setWorkerFactory(MetroWorkerFactory(graph.workerProviders))
         .build()
 
+    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate() {
         super.onCreate()
         AppInitializer.getInstance(this).apply {
@@ -36,5 +39,9 @@ class ElementXApplication : Application(), DependencyInjectionGraphOwner, Config
         }
 
         logApplicationInfo(this)
+
+        // Disable the strict offset check for anchored draggable components, as it can cause issues with bottom sheets.
+        // Remove once https://issuetracker.google.com/issues/477038695 is fixed.
+        isAnchoredDraggableComponentsStrictOffsetCheckEnabled = false
     }
 }

features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModePresenter.kt

@@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import dev.zacsweers.metro.Inject
 import io.element.android.features.logout.api.direct.DirectLogoutEvents
@@ -30,17 +31,21 @@ class ChooseSelfVerificationModePresenter(
     @Composable
     override fun present(): ChooseSelfVerificationModeState {
         val hasDevicesToVerifyAgainst by encryptionService.hasDevicesToVerifyAgainst.collectAsState()
-        val canUseRecoveryKey by encryptionService.recoveryStateStateFlow
-            .mapState { recoveryState ->
-                when (recoveryState) {
-                    RecoveryState.WAITING_FOR_SYNC,
-                    RecoveryState.UNKNOWN -> AsyncData.Loading()
-                    RecoveryState.INCOMPLETE -> AsyncData.Success(true)
-                    RecoveryState.ENABLED,
-                    RecoveryState.DISABLED -> AsyncData.Success(false)
+        val canUseRecoveryKey by produceState<AsyncData<Boolean>>(AsyncData.Uninitialized) {
+            encryptionService.recoveryStateStateFlow
+                .mapState { recoveryState ->
+                    when (recoveryState) {
+                        RecoveryState.WAITING_FOR_SYNC,
+                        RecoveryState.UNKNOWN -> AsyncData.Loading()
+                        RecoveryState.INCOMPLETE -> AsyncData.Success(true)
+                        RecoveryState.ENABLED,
+                        RecoveryState.DISABLED -> AsyncData.Success(false)
+                    }
                 }
-            }
-            .collectAsState()
+                .collect {
+                    value = it
+                }
+        }
         val buttonsState by remember {
             derivedStateOf {
                 val canUseAnotherDevice = hasDevicesToVerifyAgainst.dataOrNull()

features/home/impl/src/test/kotlin/io/element/android/features/home/impl/roomlist/RoomListViewTest.kt

@@ -56,7 +56,6 @@ class RoomListViewTest {
 
         eventsRecorder.assertList(
             listOf(
-                RoomListEvent.UpdateVisibleRange(IntRange.EMPTY),
                 RoomListEvent.UpdateVisibleRange(0..5),
             )
         )

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt

@@ -38,6 +38,7 @@ import io.element.android.tests.testutils.setSafeContent
 import io.element.android.wysiwyg.link.Link
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -141,6 +142,10 @@ class TimelineViewTest {
         eventsRecorder.assertSingle(TimelineEvent.HideShieldDialog)
     }
 
+    @Ignore(
+        "performScrollToIndex in compose tests no longer sets LazyListState.isScrollInProgress to true, so the LoadMore event is not emitted." +
+        "This needs to be reworked to use a different approach to check the LoadMore event was emitted."
+    )
     @Test
     fun `scrolling near to the start of the loaded items triggers a pre-fetch`() {
         val eventsRecorder = EventsRecorder<TimelineEvent>()

features/rolesandpermissions/impl/src/test/kotlin/io/element/android/features/rolesandpermissions/impl/roles/ChangeRolesViewTest.kt

@@ -63,6 +63,10 @@ class ChangeRolesViewTest {
             ),
         )
         rule.pressBackKey()
+
+        // Advance time to let the event be processed, as the search toggle might have some delay (e.g. for the animation)
+        rule.mainClock.advanceTimeBy(1)
+
         eventsRecorder.assertSingle(ChangeRolesEvent.ToggleSearchActive)
     }
 

gradle/libs.versions.toml

@@ -120,7 +120,7 @@ androidx_preference = "androidx.preference:preference:1.2.1"
 androidx_webkit = "androidx.webkit:webkit:1.15.0"
 
 androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
-androidx_compose_material3 = { module = "androidx.compose.material3:material3", version = '1.5.0-alpha11' }
+androidx_compose_material3 = { module = "androidx.compose.material3:material3", version = '1.5.0-alpha15' }
 androidx_compose_material3_windowsizeclass = { module = "androidx.compose.material3:material3-window-size-class" }
 androidx_compose_material3_adaptive = "androidx.compose.material3:material3-adaptive-android:1.0.0-alpha06"
 androidx_compose_ui = { module = "androidx.compose.ui:ui" }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Blur.kt

@@ -20,9 +20,9 @@ import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.RoundRect
+import androidx.compose.ui.graphics.AndroidPaint
 import androidx.compose.ui.graphics.ClipOp
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.drawscope.clipPath
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
@@ -55,10 +55,10 @@ fun Modifier.blurredShapeShadow(
                 addRoundRect(RoundRect(Rect(Offset.Zero, size), CornerRadius(cornerRadius.toPx())))
             }
 
+            val frameworkPaint = android.graphics.Paint()
             // Draw the blurred shadow, then cut out the shape from it
             clipPath(path, ClipOp.Difference) {
-                val paint = Paint()
-                val frameworkPaint = paint.asFrameworkPaint()
+                val paint = AndroidPaint(frameworkPaint)
                 if (blurRadius != 0.dp) {
                     frameworkPaint.maskFilter = BlurMaskFilter(blurRadius.toPx(), BlurMaskFilter.Blur.NORMAL)
                 }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ModalBottomSheet.kt

@@ -54,7 +54,7 @@ fun ModalBottomSheet(
     tonalElevation: Dp = if (ElementTheme.isLightTheme) 0.dp else BottomSheetDefaults.Elevation,
     scrimColor: Color = BottomSheetDefaults.ScrimColor,
     dragHandle: @Composable (() -> Unit)? = { BottomSheetDefaults.DragHandle() },
-    contentWindowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.windowInsets },
+    contentWindowInsets: @Composable () -> WindowInsets = { BottomSheetDefaults.modalWindowInsets },
     content: @Composable ColumnScope.() -> Unit,
 ) {
     val safeSheetState = if (LocalInspectionMode.current) sheetStateForPreview() else sheetState