hacker/fast-messenger
1
0
Fork 0
forked from melod1n/fast-messenger
Code Pull Requests Activity

fix layout

Browse Source
This commit is contained in:
Danil Nikolaev
2021-09-12 03:50:02 +03:00
parent da21035fba
commit f098a9ff12
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt
+2 -2
View File
@@ -27,9 +27,9 @@ data class VkMessage(
@Ignore
var attachments: List<VkAttachment>? = null
fun isUser() = id > 0
fun isUser() = fromId > 0
fun isGroup() = id < 0
fun isGroup() = fromId < 0
fun getPreparedAction(): Action? {
if (action == null) return null
app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt
+6 -9
View File
@@ -61,22 +61,18 @@ class ConversationsAdapter constructor(
val chatUser: VkUser? = if (conversation.isUser()) {
profiles[conversation.id]
// profiles.find { it.id == conversation.id }
} else null
val messageUser: VkUser? = if (message.isUser()) {
profiles[message.fromId]
// profiles.find { it.id == message.fromId }
} else null
val chatGroup: VkGroup? = if (conversation.isGroup()) {
groups[conversation.id]
// groups.find { it.id == conversation.id }
} else null
val messageGroup: VkGroup? = if (message.isGroup()) {
groups[message.fromId]
// groups.find { it.id == message.fromId }
} else null
val avatar = when {
@@ -142,13 +138,14 @@ class ConversationsAdapter constructor(
var prefix = when {
actionMessage != null -> ""
message.isOut -> "$youPrefix: "
messageUser != null && messageUser.firstName.isNotBlank() -> "${messageUser.firstName}: "
messageGroup != null && messageGroup.toString()
.isNotBlank() -> "${messageGroup.name}: "
else -> ""
else -> {
if (message.isUser() && messageUser != null && messageUser.firstName.isNotBlank()) "${messageUser.firstName}: "
else if (message.isGroup() && messageGroup != null && messageGroup.name.isNotBlank()) "${messageGroup.name}: "
else ""
}
}
if (!conversation.isChat() && !message.isOut || conversation.id == UserConfig.userId)
if ((!conversation.isChat() && !message.isOut) || conversation.id == UserConfig.userId)
prefix = ""
// if (conversation.isChat() || message.isOut) {