gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 20:49:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Got it working - Just need to test it out

Browse Source 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
rapterjet2004 2024-07-30 11:59:45 -05:00
parent 9a3702d0ce
commit b41f41f704
No known key found for this signature in database
GPG Key ID: 3AA5FDFED7944099
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -1294,28 +1294,31 @@ class ChatActivity :
} }
runOnUiThread { runOnUiThread {
binding.typingIndicator.text = typingString binding.typingIndicator.text = typingString.append("\nTESTING LINE 2\nTESTING LINE 3\nTESTING LINE 4")
if (participantNames.size > 0) { if (participantNames.size > 0) {
binding.typingIndicatorWrapper.visibility = View.VISIBLE
binding.typingIndicatorWrapper.animate() binding.typingIndicatorWrapper.animate()
.translationY(binding.fragmentContainerActivityChat.y - DisplayUtils.convertDpToPixel(18f, context)) .translationYBy(DisplayUtils.convertDpToPixel(-18f, context))
.setInterpolator(AccelerateDecelerateInterpolator()) .setInterpolator(AccelerateDecelerateInterpolator())
.duration = TYPING_INDICATOR_ANIMATION_DURATION .duration = TYPING_INDICATOR_ANIMATION_DURATION
} else { } else {
if (binding.typingIndicator.lineCount == 1) { binding.typingIndicatorWrapper.visibility = View.GONE
binding.typingIndicatorWrapper.animate() binding.typingIndicatorWrapper.y += DisplayUtils.convertDpToPixel(18f, context)
.translationY(binding.fragmentContainerActivityChat.y) // if (binding.typingIndicator.lineCount == 1) { // FIXME ???? Seems like some weird formatting code
.setInterpolator(AccelerateDecelerateInterpolator()) // binding.typingIndicatorWrapper.animate()
.duration = TYPING_INDICATOR_ANIMATION_DURATION // .translationY(binding.fragmentContainerActivityChat.y)
} else if (binding.typingIndicator.lineCount == 2) { // .setInterpolator(AccelerateDecelerateInterpolator())
binding.typingIndicatorWrapper.animate() // .duration = TYPING_INDICATOR_ANIMATION_DURATION
.translationY( // } else if (binding.typingIndicator.lineCount == 2) {
binding.fragmentContainerActivityChat.y + // binding.typingIndicatorWrapper.animate()
DisplayUtils.convertDpToPixel(15f, context) // .translationY(
) // binding.fragmentContainerActivityChat.y +
.setInterpolator(AccelerateDecelerateInterpolator()) // DisplayUtils.convertDpToPixel(15f, context)
.duration = TYPING_INDICATOR_ANIMATION_DURATION // )
} // .setInterpolator(AccelerateDecelerateInterpolator())
// .duration = TYPING_INDICATOR_ANIMATION_DURATION
// }
} }
} }
} }
@ -3384,10 +3387,10 @@ class ChatActivity :
val messageTemp = message as ChatMessage val messageTemp = message as ChatMessage
messageTemp.lastEditTimestamp = message.lastEditTimestamp messageTemp.lastEditTimestamp = message.lastEditTimestamp
val index = adapter?.getMessagePositionById(messageTemp.id) ?: 0 // val index = adapter?.getMessagePositionById(messageTemp.id) ?: 0
val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage // val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage
messageTemp.parentMessage = adapterMsg.parentMessage // messageTemp.parentMessage = adapterMsg.parentMessage
messageTemp.isOneToOneConversation = messageTemp.isOneToOneConversation =
currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
messageTemp.activeUser = conversationUser messageTemp.activeUser = conversationUser

4
app/src/main/res/layout/activity_chat.xml
View File

@ -226,8 +226,8 @@
android:id="@+id/typing_indicator" android:id="@+id/typing_indicator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/side_margin" android:paddingStart="@dimen/side_margin"
android:layout_marginEnd="@dimen/side_margin" android:paddingEnd="@dimen/side_margin"
android:background="@color/bg_default" android:background="@color/bg_default"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"