From 47551284f6a75dfedd2a56ace41b73bc2c568909 Mon Sep 17 00:00:00 2001
From: sowjanyakch <sowjanya.kch@gmail.com>
Date: Fri, 21 Feb 2025 13:56:09 +0100
Subject: [PATCH] adjust layout

Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
---
 .../messages/IncomingTextMessageViewHolder.kt    |  6 ++++--
 .../layout/item_custom_incoming_text_message.xml | 16 ++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
index 069430e33..0697fccb3 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
@@ -188,7 +188,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
     }
 
     private fun updateCheckboxStates(chatMessage: ChatMessage, user: User, checkboxes: List<CheckBox>) {
-       job =  CoroutineScope(Dispatchers.Main).launch {
+        job = CoroutineScope(Dispatchers.Main).launch {
             withContext(Dispatchers.IO) {
                 val apiVersion: Int = ApiUtils.getChatApiVersion(
                     user.capabilities?.spreedCapability!!,
@@ -205,10 +205,12 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
                     withContext(Dispatchers.Main) {
                         if (result.isSuccess) {
                             val editedMessage = result.getOrNull()?.ocs?.data!!.parentMessage!!
-                            Log.d(TAG," EditedMessage: $editedMessage")
+                            Log.d(TAG, "EditedMessage: $editedMessage")
                             binding.messageEditIndicator.apply {
                                 visibility = View.VISIBLE
                             }
+                            binding.messageTime.text =
+                                dateUtils.getLocalTimeStringFromTimestamp(editedMessage.lastEditTimestamp!!)
                         } else {
                             Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show()
                         }
diff --git a/app/src/main/res/layout/item_custom_incoming_text_message.xml b/app/src/main/res/layout/item_custom_incoming_text_message.xml
index 6291dd8ec..884c3087d 100644
--- a/app/src/main/res/layout/item_custom_incoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_text_message.xml
@@ -74,25 +74,17 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginStart="8dp"
-            android:gravity="end"
-            android:orientation="horizontal"
-            android:layout_below="@id/messageText"
-            app:layout_alignSelf="flex_end">
-
         <TextView
             android:id="@id/messageTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
             android:alpha="0.6"
             android:textColor="@color/no_emphasis_text"
             android:textIsSelectable="false"
-            android:gravity = "end"
+            android:gravity="end"
+            app:layout_alignSelf="center"
             app:layout_flexGrow="1"
             app:layout_alignSelf="flex_end"
             app:layout_wrapBefore="false"
@@ -103,6 +95,7 @@
             android:id="@+id/messageEditIndicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
             android:alpha="0.6"
             android:textColor="@color/no_emphasis_text"
@@ -111,7 +104,6 @@
             android:text = "@string/hint_edited_message"
             android:textSize="12sp">
         </TextView>
-        </LinearLayout>
 
         <include
             android:id="@+id/reactions"