From 8be1e8e87e419036c9a2b2c71263cda52f268c41 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Thu, 6 Jul 2023 15:20:45 +0930
Subject: [PATCH] Wire up voiceMessageView

---
 .../conversation/v2/MessageDetailActivity.kt  | 32 ++++++-------------
 .../thoughtcrime/securesms/ui/Components.kt   | 21 ++++++++++++
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
index 96fcb596f9..3dc001f00d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -1,8 +1,10 @@
 package org.thoughtcrime.securesms.conversation.v2
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.MotionEvent.ACTION_UP
 import androidx.activity.viewModels
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
@@ -12,11 +14,8 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
@@ -51,15 +50,14 @@ import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewVisibleMessageContentBinding
 import org.session.libsession.messaging.jobs.AttachmentDownloadJob
 import org.session.libsession.messaging.jobs.JobQueue
-import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.MediaPreviewActivity
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-import org.thoughtcrime.securesms.components.ProfilePictureView
 import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.mms.ImageSlide
 import org.thoughtcrime.securesms.mms.Slide
 import org.thoughtcrime.securesms.ui.AppTheme
+import org.thoughtcrime.securesms.ui.Avatar
 import org.thoughtcrime.securesms.ui.CarouselNextButton
 import org.thoughtcrime.securesms.ui.CarouselPrevButton
 import org.thoughtcrime.securesms.ui.Cell
@@ -163,6 +161,7 @@ class MessageDetailActivity : PassphraseRequiredActionBarActivity() {
         }
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Composable
     fun MessageDetails(
         messageDetails: MessageDetails,
@@ -186,6 +185,11 @@ class MessageDetailActivity : PassphraseRequiredActionBarActivity() {
                                     thread = message.individualRecipient,
                                     onAttachmentNeedsDownload = ::onAttachmentNeedsDownload
                                 )
+
+                                setOnTouchListener { _, event ->
+                                    if (event.actionMasked == ACTION_UP) onContentClick(event)
+                                    true
+                                }
                             }
                         }
                     )
@@ -225,24 +229,6 @@ class MessageDetailActivity : PassphraseRequiredActionBarActivity() {
         }
     }
 
-    @Composable
-    fun RowScope.Avatar(sender: Recipient) {
-        Box(
-            modifier = Modifier
-                .width(60.dp)
-                .align(Alignment.CenterVertically)
-        ) {
-            AndroidView(
-                factory = {
-                    ProfilePictureView(it).apply { update(sender) }
-                },
-                modifier = Modifier
-                    .width(46.dp)
-                    .height(46.dp)
-            )
-        }
-    }
-
     @Composable
     fun Buttons(
         hasError: Boolean,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
index 34c9f0b8bb..b7684a22f9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
@@ -30,9 +30,12 @@ import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
 import com.google.accompanist.pager.HorizontalPagerIndicator
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
+import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.components.ProfilePictureView
 
 @Composable
 fun ItemButton(
@@ -154,3 +157,21 @@ fun Divider() {
         color = LocalExtraColors.current.divider
     )
 }
+
+@Composable
+fun RowScope.Avatar(recipient: Recipient) {
+    Box(
+        modifier = Modifier
+            .width(60.dp)
+            .align(Alignment.CenterVertically)
+    ) {
+        AndroidView(
+            factory = {
+                ProfilePictureView(it).apply { update(recipient) }
+            },
+            modifier = Modifier
+                .width(46.dp)
+                .height(46.dp)
+        )
+    }
+}