Merge branch 'develop' of https://github.com/vector-im/element-x-android into langleyd/custom_waveform

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt

@@ -69,26 +69,18 @@ fun TimelineItemVoiceView(
         modifier = modifier,
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        Box(
-            modifier = Modifier
-                .size(32.dp)
-                .clip(CircleShape)
-                .background(ElementTheme.materialColors.background),
-            contentAlignment = Alignment.Center,
-        ) {
-            when (state.button) {
-                VoiceMessageState.Button.Play -> PlayButton(onClick = ::playPause)
-                VoiceMessageState.Button.Pause -> PauseButton(onClick = ::playPause)
-                VoiceMessageState.Button.Downloading -> ProgressButton()
-                VoiceMessageState.Button.Retry -> RetryButton(onClick = ::playPause)
-                VoiceMessageState.Button.Disabled -> DisabledPlayButton()
-            }
+        when (state.button) {
+            VoiceMessageState.Button.Play -> PlayButton(onClick = ::playPause)
+            VoiceMessageState.Button.Pause -> PauseButton(onClick = ::playPause)
+            VoiceMessageState.Button.Downloading -> ProgressButton()
+            VoiceMessageState.Button.Retry -> RetryButton(onClick = ::playPause)
+            VoiceMessageState.Button.Disabled -> DisabledPlayButton()
         }
         Spacer(Modifier.width(8.dp))
         Text(
             text = state.time,
             color = ElementTheme.materialColors.secondary,
-            style = ElementTheme.typography.fontBodySmRegular,
+            style = ElementTheme.typography.fontBodySmMedium,
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
         )
@@ -153,9 +145,9 @@ private fun ProgressButton() {
         CircularProgressIndicator(
             modifier = Modifier
                 .padding(2.dp)
-                .size(12.dp),
-            color = ElementTheme.materialColors.primary,
-            strokeWidth = 1.6.dp,
+                .size(16.dp),
+            color = ElementTheme.colors.iconSecondary,
+            strokeWidth = 2.dp,
         )
     }
 }
@@ -181,9 +173,8 @@ private fun IconButton(
         Icon(
             painter = painterResource(id = drawableRes),
             contentDescription = contentDescription,
-            tint = ElementTheme.materialColors.primary,
-            modifier = Modifier
-                .size(16.dp),
+            tint = ElementTheme.colors.iconSecondary,
+            modifier = Modifier.size(24.dp),
         )
     }
 }
@@ -195,7 +186,7 @@ private fun Button(
 ) {
     Box(
         modifier = Modifier
-            .size(32.dp)
+            .size(36.dp)
             .clip(CircleShape)
             .background(ElementTheme.materialColors.background)
             .let {
@@ -211,8 +202,14 @@ open class TimelineItemVoiceViewParametersProvider : PreviewParameterProvider<Ti
     private val voiceMessageStateProvider = VoiceMessageStateProvider()
     private val timelineItemVoiceContentProvider = TimelineItemVoiceContentProvider()
     override val values: Sequence<TimelineItemVoiceViewParameters>
-        get() = voiceMessageStateProvider.values.zip(timelineItemVoiceContentProvider.values)
-            .map { TimelineItemVoiceViewParameters(it.first, it.second) }
+        get() = timelineItemVoiceContentProvider.values.flatMap { content ->
+            voiceMessageStateProvider.values.map { state ->
+                TimelineItemVoiceViewParameters(
+                    state = state,
+                    content = content,
+                )
+            }
+        }
 }
 
 data class TimelineItemVoiceViewParameters(

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/VoiceMessageStateProvider.kt

@@ -24,13 +24,13 @@ open class VoiceMessageStateProvider : PreviewParameterProvider<VoiceMessageStat
             VoiceMessageState(
                 VoiceMessageState.Button.Downloading,
                 progress = 0f,
-                time = "00:00",
+                time = "0:00",
                 eventSink = {},
             ),
             VoiceMessageState(
                 VoiceMessageState.Button.Retry,
                 progress = 0.5f,
-                time = "00:00",
+                time = "0:01",
                 eventSink = {}
             ),
             VoiceMessageState(
@@ -41,20 +41,20 @@ open class VoiceMessageStateProvider : PreviewParameterProvider<VoiceMessageStat
             ),
             VoiceMessageState(
                 VoiceMessageState.Button.Pause,
-                progress = 0.5f,
-                time = "00:00",
+                progress = 1f,
+                time = "1:00",
                 eventSink = {}
             ),
             VoiceMessageState(
                 VoiceMessageState.Button.Pause,
                 progress = 0.2f,
-                time = "00:00",
+                time = "10:00",
                 eventSink = {}
             ),
             VoiceMessageState(
                 VoiceMessageState.Button.Disabled,
                 progress = 0.2f,
-                time = "00:00",
+                time = "30:00",
                 eventSink = {}
             ),
         )

gradle/libs.versions.toml

@@ -149,7 +149,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.64"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.65"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -99,7 +99,7 @@ class RustMatrixClient constructor(
     private val sessionDispatcher = dispatchers.io.limitedParallelism(64)
     private val sessionCoroutineScope = appCoroutineScope.childScope(dispatchers.main, "Session-${sessionId}")
     private val rustSyncService = RustSyncService(syncService, sessionCoroutineScope)
-    private val verificationService = RustSessionVerificationService(rustSyncService)
+    private val verificationService = RustSessionVerificationService(rustSyncService, sessionCoroutineScope)
     private val pushersService = RustPushersService(
         client = client,
         dispatchers = dispatchers,

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt

@@ -23,10 +23,12 @@ import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatu
 import io.element.android.libraries.matrix.api.verification.VerificationEmoji
 import io.element.android.libraries.matrix.api.verification.VerificationFlowState
 import io.element.android.libraries.matrix.impl.sync.RustSyncService
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
 import org.matrix.rustcomponents.sdk.SessionVerificationController
 import org.matrix.rustcomponents.sdk.SessionVerificationControllerDelegate
 import org.matrix.rustcomponents.sdk.SessionVerificationControllerInterface
@@ -35,6 +37,7 @@ import javax.inject.Inject
 
 class RustSessionVerificationService @Inject constructor(
     private val syncService: RustSyncService,
+    private val sessionCoroutineScope: CoroutineScope,
 ) : SessionVerificationService, SessionVerificationControllerDelegate {
 
     var verificationController: SessionVerificationControllerInterface? = null
@@ -44,7 +47,7 @@ class RustSessionVerificationService @Inject constructor(
             // If status was 'Unknown', move it to either 'Verified' or 'NotVerified'
             if (value != null) {
                 value.setDelegate(this)
-                updateVerificationStatus(value.isVerified())
+                sessionCoroutineScope.launch { updateVerificationStatus(value.isVerified()) }
             }
         }