mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-22 13:05:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Seems to work - fixed adapter issue

Browse source 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
rapterjet2004 2024-07-31 08:58:24 -05:00
parent b41f41f704
commit 515ecedd04
No known key found for this signature in database
GPG key ID: 3AA5FDFED7944099
1 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View file

@ -1294,7 +1294,7 @@ class ChatActivity :
} }
runOnUiThread { runOnUiThread {
binding.typingIndicator.text = typingString.append("\nTESTING LINE 2\nTESTING LINE 3\nTESTING LINE 4") binding.typingIndicator.text = typingString
if (participantNames.size > 0) { if (participantNames.size > 0) {
binding.typingIndicatorWrapper.visibility = View.VISIBLE binding.typingIndicatorWrapper.visibility = View.VISIBLE
@ -1305,20 +1305,6 @@ class ChatActivity :
} else { } else {
binding.typingIndicatorWrapper.visibility = View.GONE binding.typingIndicatorWrapper.visibility = View.GONE
binding.typingIndicatorWrapper.y += DisplayUtils.convertDpToPixel(18f, context) 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
// }
} }
} }
} }
@ -3299,7 +3285,7 @@ class ChatActivity :
val lon = data["longitude"]!! val lon = data["longitude"]!!
metaData = metaData =
"{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," + "{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," +
"\"longitude\":\"$lon\",\"name\":\"$name\"}" "\"longitude\":\"$lon\",\"name\":\"$name\"}"
} }
when (type) { when (type) {
@ -3387,10 +3373,12 @@ 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)!!
// val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage if (index > 0) {
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