Simple chat & small fixes

app/src/main/kotlin/com/meloda/fast/api/model/VkConversation.kt

@@ -1,10 +1,13 @@
 package com.meloda.fast.api.model
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
 
 @Entity(tableName = "conversations")
+@Parcelize
 data class VkConversation(
     @PrimaryKey(autoGenerate = false)
     val id: Int,
@@ -18,8 +21,9 @@ data class VkConversation(
     val outRead: Int,
     val isMarkedUnread: Boolean,
     val lastMessageId: Int,
-    val unreadCount: Int?
-) {
+    val unreadCount: Int?,
+    val membersCount: Int?
+) : Parcelable {
     @Ignore
     var lastMessage: VkMessage? = null
 

app/src/main/kotlin/com/meloda/fast/api/model/VkGroup.kt

@@ -1,16 +1,19 @@
 package com.meloda.fast.api.model
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
 
 @Entity(tableName = "groups")
+@Parcelize
 data class VkGroup(
     @PrimaryKey(autoGenerate = false)
     val id: Int,
     val name: String,
     val screenName: String,
     val photo200: String?
-) {
+): Parcelable {
 
     override fun toString() = name.trim()
 

app/src/main/kotlin/com/meloda/fast/api/model/VkGroupCall.kt

@@ -1,7 +0,0 @@
-package com.meloda.fast.api.model
-
-import com.meloda.fast.api.model.attachments.VkAttachment
-
-data class VkGroupCall(
-    val initiatorId: Int
-) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt

@@ -1,41 +1,69 @@
 package com.meloda.fast.api.model
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.meloda.fast.api.model.attachments.VkAttachment
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
 @Entity(tableName = "messages")
+@Parcelize
 data class VkMessage(
     @PrimaryKey(autoGenerate = false)
     val id: Int,
-    val text: String?,
+    val text: String? = null,
     val isOut: Boolean,
     val peerId: Int,
     val fromId: Int,
     val date: Int,
-    val action: String?,
-    val actionMemberId: Int?,
-    val actionText: String?,
-    val actionConversationMessageId: Int?,
-    val actionMessage: String?,
-    val geoType: String?
-) {
+    val randomId: Int,
+    val action: String? = null,
+    val actionMemberId: Int? = null,
+    val actionText: String? = null,
+    val actionConversationMessageId: Int? = null,
+    val actionMessage: String? = null,
+    val geoType: String? = null
+) : Parcelable {
+
+    @IgnoredOnParcel
     @Ignore
     var forwards: List<VkMessage>? = null
 
+    @IgnoredOnParcel
     @Ignore
     var attachments: List<VkAttachment>? = null
 
+    fun isPeerChat() = peerId > 2_000_000_000
+
     fun isUser() = fromId > 0
 
     fun isGroup() = fromId < 0
 
+    fun isRead(conversation: VkConversation) = conversation.outRead < id
+
     fun getPreparedAction(): Action? {
         if (action == null) return null
         return Action.parse(action)
     }
 
+    fun changeId(id: Int) = VkMessage(
+        id = id,
+        text = text,
+        isOut = isOut,
+        peerId = peerId,
+        fromId = fromId,
+        date = date,
+        randomId = randomId,
+        action = action,
+        actionMemberId = actionMemberId,
+        actionText = actionText,
+        actionConversationMessageId = actionConversationMessageId,
+        actionMessage = actionMessage,
+        geoType = geoType
+    )
+
     enum class Action(val value: String) {
         CHAT_CREATE("chat_create"),
         CHAT_PHOTO_UPDATE("chat_photo_update"),

app/src/main/kotlin/com/meloda/fast/api/model/VkUser.kt

@@ -1,9 +1,12 @@
 package com.meloda.fast.api.model
 
+import android.os.Parcelable
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
 
 @Entity(tableName = "users")
+@Parcelize
 data class VkUser(
     @PrimaryKey(autoGenerate = false)
     val id: Int,
@@ -11,7 +14,7 @@ data class VkUser(
     val lastName: String,
     val online: Boolean,
     val photo200: String?
-) {
+) : Parcelable {
 
     override fun toString() = "$firstName $lastName".trim()
 

app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGroupCall.kt

@@ -0,0 +1,5 @@
+package com.meloda.fast.api.model.attachments
+
+data class VkGroupCall(
+    val initiatorId: Int
+) : VkAttachment()

app/src/main/kotlin/com/meloda/fast/api/model/base/BaseVkConversation.kt

@@ -50,7 +50,8 @@ data class BaseVkConversation(
         outRead = outRead,
         isMarkedUnread = isMarkedUnread,
         lastMessageId = lastMessageId,
-        unreadCount = unreadCount
+        unreadCount = unreadCount,
+        membersCount = chatSettings?.membersCount
     ).apply { this.lastMessage = lastMessage }
 
     @Parcelize

app/src/main/kotlin/com/meloda/fast/api/model/base/BaseVkMessage.kt

@@ -40,6 +40,7 @@ data class BaseVkMessage(
         peerId = peerId,
         fromId = fromId,
         date = date,
+        randomId = randomId,
         action = action?.type,
         actionMemberId = action?.memberId,
         actionText = action?.text,