From b41f41f704a02b042a224d502d2998d1cbe42d28 Mon Sep 17 00:00:00 2001
From: rapterjet2004 <juliuslinus1@gmail.com>
Date: Tue, 30 Jul 2024 11:59:45 -0500
Subject: [PATCH] Got it working - Just need to test it out

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
 .../com/nextcloud/talk/chat/ChatActivity.kt   | 41 ++++++++++---------
 app/src/main/res/layout/activity_chat.xml     |  4 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index daec27426..b86c7b44c 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -1294,28 +1294,31 @@ class ChatActivity :
         }
 
         runOnUiThread {
-            binding.typingIndicator.text = typingString
+            binding.typingIndicator.text = typingString.append("\nTESTING LINE 2\nTESTING LINE 3\nTESTING LINE 4")
 
             if (participantNames.size > 0) {
+                binding.typingIndicatorWrapper.visibility = View.VISIBLE
                 binding.typingIndicatorWrapper.animate()
-                    .translationY(binding.fragmentContainerActivityChat.y - DisplayUtils.convertDpToPixel(18f, context))
+                    .translationYBy(DisplayUtils.convertDpToPixel(-18f, context))
                     .setInterpolator(AccelerateDecelerateInterpolator())
                     .duration = TYPING_INDICATOR_ANIMATION_DURATION
             } else {
-                if (binding.typingIndicator.lineCount == 1) {
-                    binding.typingIndicatorWrapper.animate()
-                        .translationY(binding.fragmentContainerActivityChat.y)
-                        .setInterpolator(AccelerateDecelerateInterpolator())
-                        .duration = TYPING_INDICATOR_ANIMATION_DURATION
-                } else if (binding.typingIndicator.lineCount == 2) {
-                    binding.typingIndicatorWrapper.animate()
-                        .translationY(
-                            binding.fragmentContainerActivityChat.y +
-                                DisplayUtils.convertDpToPixel(15f, context)
-                        )
-                        .setInterpolator(AccelerateDecelerateInterpolator())
-                        .duration = TYPING_INDICATOR_ANIMATION_DURATION
-                }
+                binding.typingIndicatorWrapper.visibility = View.GONE
+                binding.typingIndicatorWrapper.y += DisplayUtils.convertDpToPixel(18f, context)
+                // if (binding.typingIndicator.lineCount == 1) { // FIXME ???? Seems like some weird formatting code
+                //     binding.typingIndicatorWrapper.animate()
+                //         .translationY(binding.fragmentContainerActivityChat.y)
+                //         .setInterpolator(AccelerateDecelerateInterpolator())
+                //         .duration = TYPING_INDICATOR_ANIMATION_DURATION
+                // } else if (binding.typingIndicator.lineCount == 2) {
+                //     binding.typingIndicatorWrapper.animate()
+                //         .translationY(
+                //             binding.fragmentContainerActivityChat.y +
+                //                 DisplayUtils.convertDpToPixel(15f, context)
+                //         )
+                //         .setInterpolator(AccelerateDecelerateInterpolator())
+                //         .duration = TYPING_INDICATOR_ANIMATION_DURATION
+                // }
             }
         }
     }
@@ -3384,10 +3387,10 @@ class ChatActivity :
         val messageTemp = message as ChatMessage
         messageTemp.lastEditTimestamp = message.lastEditTimestamp
 
-        val index = adapter?.getMessagePositionById(messageTemp.id) ?: 0
-        val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage
+        // val index = adapter?.getMessagePositionById(messageTemp.id) ?: 0
+        // val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage
 
-        messageTemp.parentMessage = adapterMsg.parentMessage
+        // messageTemp.parentMessage = adapterMsg.parentMessage
         messageTemp.isOneToOneConversation =
             currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
         messageTemp.activeUser = conversationUser
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 554ffbddb..ee60f4fd4 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -226,8 +226,8 @@
                 android:id="@+id/typing_indicator"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/side_margin"
-                android:layout_marginEnd="@dimen/side_margin"
+                android:paddingStart="@dimen/side_margin"
+                android:paddingEnd="@dimen/side_margin"
                 android:background="@color/bg_default"
                 android:ellipsize="end"
                 android:maxLines="2"