From 877565e516c4c5e5034898863dd4871ffadef371 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 4 Dec 2024 11:23:52 +0100
Subject: [PATCH] Display media in square grid if exactly 4 of them

---
 .../linphone/ui/main/chat/model/FileModel.kt  |  1 +
 .../ui/main/chat/model/MessageModel.kt        | 58 ++++++++-----------
 .../org/linphone/utils/DataBindingUtils.kt    |  8 +++
 .../layout/chat_bubble_content_grid_cell.xml  |  1 +
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
index 704b1d4df..969bdd6d1 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
@@ -44,6 +44,7 @@ class FileModel @AnyThread constructor(
     val isEncrypted: Boolean,
     val originalPath: String,
     val isWaitingToBeDownloaded: Boolean = false,
+    val flexboxLayoutWrapBefore: Boolean = false,
     private val onClicked: ((model: FileModel) -> Unit)? = null
 ) {
     companion object {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
index e2b930107..f58109ef8 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt
@@ -384,6 +384,13 @@ class MessageModel @WorkerThread constructor(
 
         val contents = chatMessage.contents
         allFilesDownloaded = true
+
+        val notMediaContent = contents.find {
+            it.isIcalendar || it.isVoiceRecording || (it.isText && !it.isFile) || it.isFileTransfer || (it.isFile && !(it.type == "video" || it.type == "image"))
+        }
+        val allContentsAreMedia = notMediaContent == null
+        val exactly4Contents = contents.size == 4
+
         for (content in contents) {
             val isFileEncrypted = content.isFileEncrypted
 
@@ -401,6 +408,7 @@ class MessageModel @WorkerThread constructor(
                 Log.d("$TAG Found voice recording content")
                 isVoiceRecord.postValue(true)
                 computeVoiceRecordContent(content)
+
                 displayableContentFound = true
             } else {
                 if (content.isFile) {
@@ -424,40 +432,23 @@ class MessageModel @WorkerThread constructor(
                             "$TAG Found file ready to be displayed [$path] with MIME [${content.type}/${content.subtype}] for message [${chatMessage.messageId}]"
                         )
 
+                        val wrapBefore = allContentsAreMedia && filesContentCount == 3
                         val fileSize = content.fileSize.toLong()
                         val timestamp = content.creationTimestamp
-                        when (content.type) {
-                            "image", "video" -> {
-                                val fileModel = FileModel(
-                                    path,
-                                    name,
-                                    fileSize,
-                                    timestamp,
-                                    isFileEncrypted,
-                                    originalPath
-                                ) { model ->
-                                    onContentClicked?.invoke(model)
-                                }
-                                filesPath.add(fileModel)
-
-                                displayableContentFound = true
-                            }
-                            else -> {
-                                val fileModel = FileModel(
-                                    path,
-                                    name,
-                                    fileSize,
-                                    timestamp,
-                                    isFileEncrypted,
-                                    originalPath
-                                ) { model ->
-                                    onContentClicked?.invoke(model)
-                                }
-                                filesPath.add(fileModel)
-
-                                displayableContentFound = true
-                            }
+                        val fileModel = FileModel(
+                            path,
+                            name,
+                            fileSize,
+                            timestamp,
+                            isFileEncrypted,
+                            originalPath,
+                            flexboxLayoutWrapBefore = wrapBefore
+                        ) { model ->
+                            onContentClicked?.invoke(model)
                         }
+                        filesPath.add(fileModel)
+
+                        displayableContentFound = true
                     } else {
                         Log.e("$TAG No path found for File Content!")
                     }
@@ -478,8 +469,7 @@ class MessageModel @WorkerThread constructor(
                                 content.fileSize.toLong(),
                                 timestamp,
                                 isFileEncrypted,
-                                path,
-                                false
+                                path
                             ) { model ->
                                 onContentClicked?.invoke(model)
                             }
@@ -491,7 +481,7 @@ class MessageModel @WorkerThread constructor(
                                 timestamp,
                                 isFileEncrypted,
                                 name,
-                                true
+                                isWaitingToBeDownloaded = true
                             ) { model ->
                                 downloadContent(model, content)
                             }
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index ce44e6298..53c7f1f6d 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -58,6 +58,7 @@ import coil.request.videoFrameMillis
 import coil.size.Dimension
 import coil.transform.CircleCropTransformation
 import coil.transform.RoundedCornersTransformation
+import com.google.android.flexbox.FlexboxLayout
 import org.linphone.BR
 import org.linphone.R
 import org.linphone.contacts.AbstractAvatarModel
@@ -605,6 +606,13 @@ fun validateOnInput(editText: EditText, onValidate: () -> (Unit)) {
     })
 }
 
+@BindingAdapter("app:layout_wrapBefore")
+fun setFlexboxLayoutWrapBefore(view: View, wrap: Boolean = false) {
+    val params = view.layoutParams as FlexboxLayout.LayoutParams
+    params.isWrapBefore = wrap
+    view.layoutParams = params
+}
+
 @BindingAdapter("emojiPickedListener")
 fun EmojiPickerView.setEmojiPickedListener(listener: EmojiPickedListener) {
     setOnEmojiPickedListener { emoji ->
diff --git a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
index 41cebe1fa..71b9cadf0 100644
--- a/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
+++ b/app/src/main/res/layout/chat_bubble_content_grid_cell.xml
@@ -17,6 +17,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_wrapBefore="@{model.flexboxLayoutWrapBefore}"
         android:padding="1dp">
 
         <androidx.constraintlayout.widget.Group