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 @Ignore
var attachments: List<VkAttachment>? = null var attachments: List<VkAttachment>? = null
fun isUser() = id > 0 fun isUser() = fromId > 0
fun isGroup() = id < 0 fun isGroup() = fromId < 0
fun getPreparedAction(): Action? { fun getPreparedAction(): Action? {
if (action == null) return null 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()) { val chatUser: VkUser? = if (conversation.isUser()) {
profiles[conversation.id] profiles[conversation.id]
// profiles.find { it.id == conversation.id }
} else null } else null
val messageUser: VkUser? = if (message.isUser()) { val messageUser: VkUser? = if (message.isUser()) {
profiles[message.fromId] profiles[message.fromId]
// profiles.find { it.id == message.fromId }
} else null } else null
val chatGroup: VkGroup? = if (conversation.isGroup()) { val chatGroup: VkGroup? = if (conversation.isGroup()) {
groups[conversation.id] groups[conversation.id]
// groups.find { it.id == conversation.id }
} else null } else null
val messageGroup: VkGroup? = if (message.isGroup()) { val messageGroup: VkGroup? = if (message.isGroup()) {
groups[message.fromId] groups[message.fromId]
// groups.find { it.id == message.fromId }
} else null } else null
val avatar = when { val avatar = when {
@@ -142,13 +138,14 @@ class ConversationsAdapter constructor(
var prefix = when { var prefix = when {
actionMessage != null -> "" actionMessage != null -> ""
message.isOut -> "$youPrefix: " message.isOut -> "$youPrefix: "
messageUser != null && messageUser.firstName.isNotBlank() -> "${messageUser.firstName}: " else -> {
messageGroup != null && messageGroup.toString() if (message.isUser() && messageUser != null && messageUser.firstName.isNotBlank()) "${messageUser.firstName}: "
.isNotBlank() -> "${messageGroup.name}: " else if (message.isGroup() && messageGroup != null && messageGroup.name.isNotBlank()) "${messageGroup.name}: "
else -> "" else ""
}
} }
if (!conversation.isChat() && !message.isOut || conversation.id == UserConfig.userId) if ((!conversation.isChat() && !message.isOut) || conversation.id == UserConfig.userId)
prefix = "" prefix = ""
// if (conversation.isChat() || message.isOut) { // if (conversation.isChat() || message.isOut) {
app/src/main/res/layout/item_conversation.xml
+2 -1
View File
@@ -19,7 +19,7 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingVertical="8dp" android:paddingVertical="8dp"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="12dp" android:paddingEnd="32dp"
tools:background="@drawable/ic_message_unread"> tools:background="@drawable/ic_message_unread">
<FrameLayout <FrameLayout
@@ -151,6 +151,7 @@
android:layout_height="18dp" android:layout_height="18dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="-4dp" android:layout_marginTop="-4dp"
android:layout_marginEnd="4dp"
android:layout_weight="0" android:layout_weight="0"
android:background="@drawable/ic_back" android:background="@drawable/ic_back"
android:backgroundTint="@color/a1_600" android:backgroundTint="@color/a1_600"