From ac170f0803c823e0a104938cb36c6fd69ac9ee5e Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Mon, 26 May 2025 09:52:13 +0200
Subject: [PATCH] adjust layout

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../talk/adapters/items/ConversationItem.kt   | 25 +++++++++++++++++++
 .../ConversationInfoActivity.kt               |  2 +-
 ...rv_item_conversation_with_last_message.xml |  3 ++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
index 5760e85d0..8b2433438 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -19,6 +19,7 @@ import android.text.TextUtils
 import android.text.format.DateUtils
 import android.text.style.ImageSpan
 import android.view.View
+import android.widget.RelativeLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import com.nextcloud.talk.R
@@ -155,6 +156,30 @@ class ConversationItem(
         } else {
             holder.binding.userStatusImage.visibility = View.GONE
         }
+
+        val dialogNameParams = holder.binding.dialogName.layoutParams as RelativeLayout.LayoutParams
+        val unreadBubbleParams = holder.binding.dialogUnreadBubble.layoutParams as RelativeLayout.LayoutParams
+        val relativeLayoutParams = holder.binding.relativeLayout.layoutParams as RelativeLayout.LayoutParams
+
+        if (model.hasSensitive == true) {
+            dialogNameParams.addRule(RelativeLayout.CENTER_VERTICAL)
+            relativeLayoutParams.addRule(RelativeLayout.ALIGN_TOP, R.id.dialogAvatarFrameLayout)
+            dialogNameParams.marginEnd =
+                context.resources.getDimensionPixelSize(R.dimen.standard_double_padding)
+            unreadBubbleParams.topMargin =
+                context.resources.getDimensionPixelSize(R.dimen.double_margin_between_elements)
+            unreadBubbleParams.addRule(RelativeLayout.CENTER_VERTICAL)
+        } else {
+            dialogNameParams.removeRule(RelativeLayout.CENTER_VERTICAL)
+            relativeLayoutParams.removeRule(RelativeLayout.ALIGN_TOP)
+            dialogNameParams.marginEnd = 0
+            unreadBubbleParams.topMargin = 0
+            unreadBubbleParams.removeRule(RelativeLayout.CENTER_VERTICAL)
+        }
+        holder.binding.relativeLayout.layoutParams = relativeLayoutParams
+        holder.binding.dialogUnreadBubble.layoutParams = unreadBubbleParams
+        holder.binding.dialogName.layoutParams = dialogNameParams
+
         setLastMessage(holder, appContext)
         showAvatar(holder)
     }
diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index c412e375b..dae77e153 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -560,7 +560,7 @@ class ConversationInfoActivity :
                 binding.sharedItemsTitle,
                 binding.recordingConsentView.recordingConsentSettingsCategory,
                 binding.conversationSettingsTitle,
-                binding.participantsListCategory,
+                binding.participantsListCategory
             )
         }.forEach(viewThemeUtils.platform::colorTextView)
     }
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index b79e3fe8a..ad83cb91c 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -64,6 +64,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/dialogName"
         android:layout_marginTop="6dp"
+        android:id="@+id/relativeLayout"
         android:layout_toEndOf="@id/dialogAvatarFrameLayout">
 
         <androidx.emoji2.widget.EmojiTextView
@@ -121,8 +122,8 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/dialogAvatarFrameLayout"
         android:layout_marginTop="2dp"
-        android:layout_toStartOf="@id/dialogDate"
         android:layout_toEndOf="@id/dialogAvatarFrameLayout"
+        android:layout_toStartOf="@id/dialogDate"
         android:ellipsize="end"
         android:includeFontPadding="false"
         android:maxLines="1"