collapse by clicking children

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
nextcloud · Aug 31, 2023 · 7098e78 · 7098e78
1 parent 4a91bfe
commit 7098e78
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt
@@ -107,23 +107,15 @@ class SystemMessageViewHolder(itemView: View) : MessageHolders.IncomingTextMessa
                 binding.expandCollapseIcon.setImageDrawable(
                     ContextCompat.getDrawable(context!!, R.drawable.baseline_unfold_more_24)
                 )
-                binding.systemMessageLayout.setOnClickListener {
-                    systemMessageInterface.expandSystemMessage(message)
-                }
-                binding.messageText.setOnClickListener {
-                    systemMessageInterface.expandSystemMessage(message)
-                }
+                binding.systemMessageLayout.setOnClickListener { systemMessageInterface.expandSystemMessage(message) }
+                binding.messageText.setOnClickListener { systemMessageInterface.expandSystemMessage(message) }
             } else {
                 binding.messageText.text = messageString
                 binding.expandCollapseIcon.setImageDrawable(
                     ContextCompat.getDrawable(context!!, R.drawable.baseline_unfold_less_24)
                 )
-                binding.systemMessageLayout.setOnClickListener {
-                    systemMessageInterface.collapseSystemMessages()
-                }
-                binding.messageText.setOnClickListener {
-                    systemMessageInterface.collapseSystemMessages()
-                }
+                binding.systemMessageLayout.setOnClickListener { systemMessageInterface.collapseSystemMessages() }
+                binding.messageText.setOnClickListener { systemMessageInterface.collapseSystemMessages() }
             }
         } else if (message.hiddenByCollapse) {
             binding.systemMessageLayout.visibility = View.GONE
@@ -134,9 +126,10 @@ class SystemMessageViewHolder(itemView: View) : MessageHolders.IncomingTextMessa
             binding.systemMessageLayout.setOnClickListener(null)
         }
 
-        // if (!message.expandableParent && message.lastExpandedItemOfGroup != 0) {
-        //     binding.systemMessageLayout.setOnClickListener { systemMessageInterface.collapseSystemMessages() }
-        // }
+        if (!message.expandableParent && message.lastItemOfExpandableGroup != 0) {
+            binding.systemMessageLayout.setOnClickListener { systemMessageInterface.collapseSystemMessages() }
+            binding.messageText.setOnClickListener { systemMessageInterface.collapseSystemMessages() }
+        }
 
         binding.messageTime.text = dateUtils!!.getLocalTimeStringFromTimestamp(message.timestamp)
         itemView.setTag(R.string.replyable_message_view_tag, message.replyable)