Corrected ui dimentions for each media attachment on reply thread

stakwork · Aug 31, 2023 · 4f90fcb · 4f90fcb
1 parent fb8040c
commit 4f90fcb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/...c/main/java/chat/sphinx/chat_common/ui/viewstate/messageholder/HolderBindingExtensions.kt b/...c/main/java/chat/sphinx/chat_common/ui/viewstate/messageholder/HolderBindingExtensions.kt
@@ -1066,12 +1066,33 @@ internal inline fun LayoutMessageHolderBinding.setBubbleThreadLayout(
 
             when (thread.mediaAttachment) {
                 is LayoutState.Bubble.ContainerSecond.ImageAttachment -> {
+                    constraintMediaThreadContainer.visible
+
+                    includeMessageTypeImageAttachment.root.visible
+                    includeMessageTypeVideoAttachment.root.gone
+                    includeMessageTypeAudioAttachment.root.gone
+                    includeMessageTypeFileAttachment.root.gone
+
                     setBubbleImageAttachment(thread.mediaAttachment, true, lastReplyImage)
                 }
                 is LayoutState.Bubble.ContainerSecond.VideoAttachment -> {
+                    constraintMediaThreadContainer.visible
+
+                    includeMessageTypeImageAttachment.root.gone
+                    includeMessageTypeVideoAttachment.root.visible
+                    includeMessageTypeAudioAttachment.root.gone
+                    includeMessageTypeFileAttachment.root.gone
+
                     setBubbleVideoAttachment(thread.mediaAttachment, true)
                 }
                 is LayoutState.Bubble.ContainerSecond.AudioAttachment -> {
+                    constraintMediaThreadContainer.visible
+
+                    includeMessageTypeImageAttachment.root.gone
+                    includeMessageTypeVideoAttachment.root.gone
+                    includeMessageTypeAudioAttachment.root.visible
+                    includeMessageTypeFileAttachment.root.gone
+
                     setBubbleAudioAttachment(
                         thread.mediaAttachment,
                         audioPlayerController,
@@ -1081,8 +1102,18 @@ internal inline fun LayoutMessageHolderBinding.setBubbleThreadLayout(
                         true)
                 }
                 is LayoutState.Bubble.ContainerSecond.FileAttachment -> {
+                    constraintMediaThreadContainer.visible
+
+                    includeMessageTypeImageAttachment.root.gone
+                    includeMessageTypeVideoAttachment.root.gone
+                    includeMessageTypeAudioAttachment.root.gone
+                    includeMessageTypeFileAttachment.root.visible
+
                     setBubbleFileAttachment(thread.mediaAttachment, true)
                 }
+                else -> {
+                    constraintMediaThreadContainer.gone
+                }
             }
         }
     }

diff --git a/.../chats/chat-tribe/chat-tribe/src/main/java/chat/sphinx/chat_tribe/ui/ChatTribeFragment.kt b/.../chats/chat-tribe/chat-tribe/src/main/java/chat/sphinx/chat_tribe/ui/ChatTribeFragment.kt
@@ -708,7 +708,7 @@ internal class ChatTribeFragment: ChatFragment<
                                     )
                                 }
 
-                                viewState.senderAlias?.let { senderAlias ->
+                                viewState.senderAlias.let { senderAlias ->
                                     textViewPinnedBottomBodyUsername.text = senderAlias
                                     textViewPinnedBottomBodyUsername.setTextColor(
                                         Color.parseColor(
@@ -814,7 +814,7 @@ internal class ChatTribeFragment: ChatFragment<
                                                 it,
                                                 ImageLoaderOptions.Builder().build()
                                             )
-                                        } ?: imageAttachment?.url?.let {
+                                        } ?: imageAttachment.url.let {
                                             imageLoader.load(
                                                 imageViewElementPicture,
                                                 it,
@@ -846,12 +846,12 @@ internal class ChatTribeFragment: ChatFragment<
                                         threadOriginalMessageBinding?.textViewThreadMessageContent?.text = it.fileName?.value ?: "Unnamed File"
                                     }
                                 }
+
                                 viewState.audioAttachment?.let { audioAttachment ->
                                     layoutConstraintMediaContainer.visible
                                     textViewAttachmentFileIcon.visible
                                     textViewAttachmentFileIcon.text = getString(chat.sphinx.chat_common.R.string.material_icon_name_volume_up)
                                     threadOriginalMessageBinding?.textViewThreadMessageContent?.text = "Audio Clip"
-
                                 }
                             }
                         }