From 8f146cc9a9e9dfa529eacd8b0d8a6e78e882c76e Mon Sep 17 00:00:00 2001 From: Jakub Zerko Date: Tue, 30 Jul 2024 17:05:14 +0200 Subject: [PATCH 1/2] fix: disable click under audio component --- .../messagecomposer/recordaudio/RecordAudioComponent.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt index 73927539a3..11ca9bc801 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt @@ -18,6 +18,8 @@ package com.wire.android.ui.home.messagecomposer.recordaudio import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth @@ -26,6 +28,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext @@ -92,6 +95,11 @@ fun RecordAudioComponent( .fillMaxWidth() .fillMaxHeight() .background(colorsScheme().background) + .clickable( + interactionSource = remember { MutableInteractionSource() }, + indication = null, + onClick = { /* Don't allow to click on elements under record area */ } + ) ) { WireDivider(color = MaterialTheme.wireColorScheme.outline) RecordAudioButtonClose( From 75816156d5549675fd6b005ae405060487f70217 Mon Sep 17 00:00:00 2001 From: Jakub Zerko Date: Wed, 31 Jul 2024 09:19:09 +0200 Subject: [PATCH 2/2] review fixes --- .../recordaudio/RecordAudioComponent.kt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt index 11ca9bc801..f66d2f0020 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/RecordAudioComponent.kt @@ -18,8 +18,6 @@ package com.wire.android.ui.home.messagecomposer.recordaudio import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth @@ -28,9 +26,9 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.Lifecycle @@ -95,11 +93,7 @@ fun RecordAudioComponent( .fillMaxWidth() .fillMaxHeight() .background(colorsScheme().background) - .clickable( - interactionSource = remember { MutableInteractionSource() }, - indication = null, - onClick = { /* Don't allow to click on elements under record area */ } - ) + .pointerInput(Unit) { /* Don't allow to click on elements under record area */ } ) { WireDivider(color = MaterialTheme.wireColorScheme.outline) RecordAudioButtonClose(