adjust outcoming message view holders to use full available width in …

…NoteToSelf chat

Signed-off-by: Christian Reiner <[email protected]>

app/src/main/java/com/nextcloud/talk/adapters/messages/AdjustableMessageHolderInterface.kt

@@ -0,0 +1,53 @@
+/*
+ * Nextcloud Talk - Android Client
+ *
+ * SPDX-FileCopyrightText: 2024 Christian Reiner <[email protected]>
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+package com.nextcloud.talk.adapters.messages
+
+import android.widget.RelativeLayout
+import androidx.viewbinding.ViewBinding
+import com.nextcloud.talk.databinding.ItemCustomOutcomingDeckCardMessageBinding
+import com.nextcloud.talk.databinding.ItemCustomOutcomingLinkPreviewMessageBinding
+import com.nextcloud.talk.databinding.ItemCustomOutcomingLocationMessageBinding
+import com.nextcloud.talk.databinding.ItemCustomOutcomingPollMessageBinding
+import com.nextcloud.talk.databinding.ItemCustomOutcomingTextMessageBinding
+import com.nextcloud.talk.databinding.ItemCustomOutcomingVoiceMessageBinding
+import com.nextcloud.talk.models.domain.ConversationModel
+import com.nextcloud.talk.models.json.conversations.ConversationEnums.ConversationType
+
+interface AdjustableMessageHolderInterface {
+
+    val binding: ViewBinding
+
+    fun adjustIfNoteToSelf(viewHolder: AdjustableMessageHolderInterface, currentConversation: ConversationModel?) {
+        currentConversation?.run {
+            if (type == ConversationType.NOTE_TO_SELF) {
+                when (viewHolder.binding.javaClass) {
+                    ItemCustomOutcomingTextMessageBinding::class.java ->
+                        (viewHolder.binding as ItemCustomOutcomingTextMessageBinding).bubble
+                    ItemCustomOutcomingDeckCardMessageBinding::class.java ->
+                        (viewHolder.binding as ItemCustomOutcomingDeckCardMessageBinding).bubble
+                    ItemCustomOutcomingLinkPreviewMessageBinding::class.java ->
+                        (viewHolder.binding as ItemCustomOutcomingLinkPreviewMessageBinding).bubble
+                    ItemCustomOutcomingPollMessageBinding::class.java ->
+                        (viewHolder.binding as ItemCustomOutcomingPollMessageBinding).bubble
+                    ItemCustomOutcomingVoiceMessageBinding::class.java ->
+                        (viewHolder.binding as ItemCustomOutcomingVoiceMessageBinding).bubble
+                    ItemCustomOutcomingLocationMessageBinding::class.java ->
+                        (viewHolder.binding as ItemCustomOutcomingLocationMessageBinding).bubble
+                    else -> null
+                }?.let {
+                    RelativeLayout.LayoutParams(binding.root.layoutParams).apply {
+                        marginStart = 0
+                        marginEnd = 0
+                    }.run {
+                        it.layoutParams = this
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingDeckCardViewHolder.kt

@@ -1,6 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
+ * SPDX-FileCopyrightText: 2024 Christian Reiner <[email protected]>
  * SPDX-FileCopyrightText: 2024 Sowjanya Kota<[email protected]>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -43,9 +44,10 @@ import javax.inject.Inject
 @AutoInjector(NextcloudTalkApplication::class)
 class OutcomingDeckCardViewHolder(
     outcomingView: View
-) : MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView) {
+) : MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView),
+    AdjustableMessageHolderInterface {
 
-    private val binding: ItemCustomOutcomingDeckCardMessageBinding = ItemCustomOutcomingDeckCardMessageBinding.bind(
+    override val binding: ItemCustomOutcomingDeckCardMessageBinding = ItemCustomOutcomingDeckCardMessageBinding.bind(
         itemView
     )
 

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt

@@ -1,6 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
+ * SPDX-FileCopyrightText: 2024 Christian Reiner <[email protected]>
  * SPDX-FileCopyrightText: 2022 Marcel Hibbe <[email protected]>
  * SPDX-FileCopyrightText: 2017-2019 Mario Danic <[email protected]>
  * SPDX-License-Identifier: GPL-3.0-or-later
@@ -38,9 +39,10 @@ import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
 class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) :
-    MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView, payload) {
+    MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView, payload),
+    AdjustableMessageHolderInterface {
 
-    private val binding: ItemCustomOutcomingLinkPreviewMessageBinding =
+    override val binding: ItemCustomOutcomingLinkPreviewMessageBinding =
         ItemCustomOutcomingLinkPreviewMessageBinding.bind(itemView)
 
     @Inject

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt

@@ -1,6 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
+ * SPDX-FileCopyrightText: 2024 Christian Reiner <[email protected]>
  * SPDX-FileCopyrightText: 2021 Marcel Hibbe <[email protected]>
  * SPDX-FileCopyrightText: 2017-2018 Mario Danic <[email protected]>
  * SPDX-License-Identifier: GPL-3.0-or-later
@@ -47,8 +48,10 @@ import kotlin.math.roundToInt
 
 @AutoInjector(NextcloudTalkApplication::class)
 class OutcomingLocationMessageViewHolder(incomingView: View) :
-    MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(incomingView) {
-    private val binding: ItemCustomOutcomingLocationMessageBinding =
+    MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(incomingView),
+    AdjustableMessageHolderInterface {
+
+    override val binding: ItemCustomOutcomingLocationMessageBinding =
         ItemCustomOutcomingLocationMessageBinding.bind(itemView)
     private val realView: View = itemView
 

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt

@@ -1,6 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
+ * SPDX-FileCopyrightText: 2024 Christian Reiner <[email protected]>
  * SPDX-FileCopyrightText: 2021 Andy Scherzinger <[email protected]>
  * SPDX-FileCopyrightText: 2021 Marcel Hibbe <[email protected]>
  * SPDX-FileCopyrightText: 2017-2018 Mario Danic <[email protected]>
@@ -38,8 +39,11 @@ import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
-class OutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewHolder<ChatMessage>(itemView) {
-    private val binding: ItemCustomOutcomingTextMessageBinding = ItemCustomOutcomingTextMessageBinding.bind(itemView)
+class OutcomingTextMessageViewHolder(itemView: View) :
+    OutcomingTextMessageViewHolder<ChatMessage>(itemView),
+    AdjustableMessageHolderInterface {
+
+    override val binding: ItemCustomOutcomingTextMessageBinding = ItemCustomOutcomingTextMessageBinding.bind(itemView)
     private val realView: View = itemView
 
     @Inject

app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt

@@ -1,6 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
+ * SPDX-FileCopyrightText: 2024 Christian Reiner <[email protected]>
  * SPDX-FileCopyrightText: 2023 Andy Scherzinger <[email protected]>
  * SPDX-FileCopyrightText: 2023 Julius Linus <[email protected]>
  * SPDX-FileCopyrightText: 2021 Marcel Hibbe <[email protected]>
@@ -45,9 +46,10 @@ import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
 class OutcomingVoiceMessageViewHolder(outcomingView: View) :
-    MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView) {
+    MessageHolders.OutcomingTextMessageViewHolder<ChatMessage>(outcomingView),
+    AdjustableMessageHolderInterface {
 
-    private val binding: ItemCustomOutcomingVoiceMessageBinding = ItemCustomOutcomingVoiceMessageBinding.bind(itemView)
+    override val binding: ItemCustomOutcomingVoiceMessageBinding = ItemCustomOutcomingVoiceMessageBinding.bind(itemView)
 
     @JvmField
     @Inject

app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java

@@ -1,6 +1,7 @@
 /*
  * Nextcloud Talk - Android Client
  *
+ * SPDX-FileCopyrightText: 2024 Christian Reiner <[email protected]>
  * SPDX-FileCopyrightText: 2020 Tobias Kaminsky <[email protected]>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -34,43 +35,50 @@ public List<MessagesListAdapter.Wrapper> getItems() {
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
 
+        if (holder instanceof IncomingTextMessageViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof OutcomingTextMessageViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+            holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation());
 
-        if (holder instanceof IncomingTextMessageViewHolder) {
-            ((IncomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
-        } else if (holder instanceof OutcomingTextMessageViewHolder) {
-            ((OutcomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof IncomingLocationMessageViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof OutcomingLocationMessageViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+            holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation());
 
-        } else if (holder instanceof IncomingLocationMessageViewHolder) {
-            ((IncomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
-        } else if (holder instanceof OutcomingLocationMessageViewHolder) {
-            ((OutcomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof IncomingLinkPreviewMessageViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof OutcomingLinkPreviewMessageViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+            holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation());
 
-        } else if (holder instanceof IncomingLinkPreviewMessageViewHolder) {
-            ((IncomingLinkPreviewMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
-        } else if (holder instanceof OutcomingLinkPreviewMessageViewHolder) {
-            ((OutcomingLinkPreviewMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof IncomingVoiceMessageViewHolder holderInstance) {
+            holderInstance.assignVoiceMessageInterface(chatActivity);
+            holderInstance.assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof OutcomingVoiceMessageViewHolder holderInstance) {
+            holderInstance.assignVoiceMessageInterface(chatActivity);
+            holderInstance.assignCommonMessageInterface(chatActivity);
+            holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation());
 
-        } else if (holder instanceof IncomingVoiceMessageViewHolder) {
-            ((IncomingVoiceMessageViewHolder) holder).assignVoiceMessageInterface(chatActivity);
-            ((IncomingVoiceMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
-        } else if (holder instanceof OutcomingVoiceMessageViewHolder) {
-            ((OutcomingVoiceMessageViewHolder) holder).assignVoiceMessageInterface(chatActivity);
-            ((OutcomingVoiceMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof PreviewMessageViewHolder holderInstance) {
+            holderInstance.assignPreviewMessageInterface(chatActivity);
+            holderInstance.assignCommonMessageInterface(chatActivity);
 
-        } else if (holder instanceof PreviewMessageViewHolder) {
-            ((PreviewMessageViewHolder) holder).assignPreviewMessageInterface(chatActivity);
-            ((PreviewMessageViewHolder) holder).assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof SystemMessageViewHolder holderInstance) {
+            holderInstance.assignSystemMessageInterface(chatActivity);
 
-        } else if (holder instanceof SystemMessageViewHolder) {
-            ((SystemMessageViewHolder) holder).assignSystemMessageInterface(chatActivity);
-        } else if (holder instanceof CallStartedViewHolder) {
-            ((CallStartedViewHolder) holder).assignCallStartedMessageInterface(chatActivity);
-        } else if (holder instanceof TemporaryMessageViewHolder) {
-            ((TemporaryMessageViewHolder) holder).assignTemporaryMessageInterface(chatActivity);
-        }else if (holder instanceof IncomingDeckCardViewHolder){
-            ((IncomingDeckCardViewHolder) holder).assignCommonMessageInterface(chatActivity);
-        } else if(holder instanceof OutcomingDeckCardViewHolder){
-            ((OutcomingDeckCardViewHolder) holder).assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof CallStartedViewHolder holderInstance) {
+            holderInstance.assignCallStartedMessageInterface(chatActivity);
+
+        } else if (holder instanceof TemporaryMessageViewHolder holderInstance) {
+            holderInstance.assignTemporaryMessageInterface(chatActivity);
+
+        } else if (holder instanceof IncomingDeckCardViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+        } else if (holder instanceof OutcomingDeckCardViewHolder holderInstance) {
+            holderInstance.assignCommonMessageInterface(chatActivity);
+            holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation());
         }
 
         super.onBindViewHolder(holder, position);