Simple attachments in messages history (#164)

* new attachments in messages history - photo, video, audio, file, link * improve attachments in messages history and adjusted font size for logo's text in auth screen * audio duration, file preview and url preview are now visible in attachments in messages history screen * make MessageBubble width adapt to attachments container width * topbar back icon crossfade animation * implement rich text for message input * handle click and long click on attachments * added click and long click handlers for attachments in message bubbles * enabled opening photos, files, and links when clicked. * implemented basic long-click logging for photos. * handled back press to return to Conversations from other tabs. * corrected the logic for filtering and selecting video images. * updated string resources for attachments, including a new "Clip" string. * make MessageBubble mention text underline on out messages
2025-05-10 03:10:07 +03:00
parent f45a106ed8
commit 43539139e8
46 changed files with 2296 additions and 369 deletions
@@ -23,6 +23,20 @@ fun <T> MutableList<T>.addIf(element: T, condition: () -> Boolean) {
    if (condition.invoke()) add(element)
 }

+fun <T> MutableList<T>.removeIfCompat(condition: (T) -> Boolean): Boolean {
+    var removed = false
+
+    val each = iterator()
+    while (each.hasNext()) {
+        if (condition(each.next())) {
+            each.remove()
+            removed = true
+        }
+    }
+
+    return removed
+}
+
 fun <T> Flow<T>.listenValue(
    coroutineScope: CoroutineScope,
    action: suspend (T) -> Unit
@@ -33,7 +33,8 @@ interface MessagesRepository {
        randomId: Long,
        message: String?,
        replyTo: Long?,
-        attachments: List<VkAttachment>?
+        attachments: List<VkAttachment>?,
+        formatData: VkMessage.FormatData?
    ): ApiResult<MessagesSendResponse, RestApiErrorDomain>

    suspend fun markAsRead(
@@ -184,14 +184,16 @@ class MessagesRepositoryImpl(
        randomId: Long,
        message: String?,
        replyTo: Long?,
-        attachments: List<VkAttachment>?
+        attachments: List<VkAttachment>?,
+        formatData: VkMessage.FormatData?
    ): ApiResult<MessagesSendResponse, RestApiErrorDomain> = withContext(Dispatchers.IO) {
        val requestModel = MessagesSendRequest(
            peerId = peerId,
            randomId = randomId,
            message = message,
            replyTo = replyTo,
-            attachments = attachments
+            attachments = attachments,
+            formatData = formatData
        )

        messagesService.send(requestModel.map).mapApiDefault()
@@ -0,0 +1,58 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "ca007bca2ab4a9b901662792042770ad",
+    "entities": [
+      {
+        "tableName": "accounts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` INTEGER NOT NULL, `accessToken` TEXT NOT NULL, `fastToken` TEXT, `trustedHash` TEXT, `exchangeToken` TEXT, PRIMARY KEY(`userId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accessToken",
+            "columnName": "accessToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fastToken",
+            "columnName": "fastToken",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "trustedHash",
+            "columnName": "trustedHash",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "exchangeToken",
+            "columnName": "exchangeToken",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ca007bca2ab4a9b901662792042770ad')"
+    ]
+  }
+}
@@ -0,0 +1,454 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 10,
+    "identityHash": "fa307a5eb2e1f7d601bd1374174635cd",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `firstName` TEXT NOT NULL, `lastName` TEXT NOT NULL, `isOnline` INTEGER NOT NULL, `isOnlineMobile` INTEGER NOT NULL, `onlineAppId` INTEGER, `lastSeen` INTEGER, `lastSeenStatus` TEXT, `birthday` TEXT, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `photo400Orig` TEXT, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "firstName",
+            "columnName": "firstName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastName",
+            "columnName": "lastName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isOnline",
+            "columnName": "isOnline",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isOnlineMobile",
+            "columnName": "isOnlineMobile",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "onlineAppId",
+            "columnName": "onlineAppId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastSeenStatus",
+            "columnName": "lastSeenStatus",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "birthday",
+            "columnName": "birthday",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo400Orig",
+            "columnName": "photo400Orig",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "groups",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `screenName` TEXT NOT NULL, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `membersCount` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "screenName",
+            "columnName": "screenName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "membersCount",
+            "columnName": "membersCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `conversationMessageId` INTEGER NOT NULL, `text` TEXT, `isOut` INTEGER NOT NULL, `peerId` INTEGER NOT NULL, `fromId` INTEGER NOT NULL, `date` INTEGER NOT NULL, `randomId` INTEGER NOT NULL, `action` TEXT, `actionMemberId` INTEGER, `actionText` TEXT, `actionConversationMessageId` INTEGER, `actionMessage` TEXT, `updateTime` INTEGER, `important` INTEGER NOT NULL, `forwardIds` TEXT, `attachments` TEXT, `replyMessageId` INTEGER, `geoType` TEXT, `pinnedAt` INTEGER, `isPinned` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conversationMessageId",
+            "columnName": "conversationMessageId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isOut",
+            "columnName": "isOut",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "peerId",
+            "columnName": "peerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fromId",
+            "columnName": "fromId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "randomId",
+            "columnName": "randomId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "action",
+            "columnName": "action",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "actionMemberId",
+            "columnName": "actionMemberId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "actionText",
+            "columnName": "actionText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "actionConversationMessageId",
+            "columnName": "actionConversationMessageId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "actionMessage",
+            "columnName": "actionMessage",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "updateTime",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "important",
+            "columnName": "important",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "forwardIds",
+            "columnName": "forwardIds",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "replyMessageId",
+            "columnName": "replyMessageId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "geoType",
+            "columnName": "geoType",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pinnedAt",
+            "columnName": "pinnedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPinned",
+            "columnName": "isPinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "conversations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `localId` INTEGER NOT NULL, `ownerId` INTEGER, `title` TEXT, `photo50` TEXT, `photo100` TEXT, `photo200` TEXT, `isPhantom` INTEGER NOT NULL, `lastConversationMessageId` INTEGER NOT NULL, `inReadCmId` INTEGER NOT NULL, `outReadCmId` INTEGER NOT NULL, `inRead` INTEGER NOT NULL, `outRead` INTEGER NOT NULL, `lastMessageId` INTEGER, `unreadCount` INTEGER NOT NULL, `membersCount` INTEGER, `canChangePin` INTEGER NOT NULL, `canChangeInfo` INTEGER NOT NULL, `majorId` INTEGER NOT NULL, `minorId` INTEGER NOT NULL, `pinnedMessageId` INTEGER, `peerType` TEXT NOT NULL, `isArchived` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localId",
+            "columnName": "localId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo50",
+            "columnName": "photo50",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo100",
+            "columnName": "photo100",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "photo200",
+            "columnName": "photo200",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isPhantom",
+            "columnName": "isPhantom",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastConversationMessageId",
+            "columnName": "lastConversationMessageId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inReadCmId",
+            "columnName": "inReadCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "outReadCmId",
+            "columnName": "outReadCmId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "inRead",
+            "columnName": "inRead",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "outRead",
+            "columnName": "outRead",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastMessageId",
+            "columnName": "lastMessageId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "unreadCount",
+            "columnName": "unreadCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "membersCount",
+            "columnName": "membersCount",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "canChangePin",
+            "columnName": "canChangePin",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canChangeInfo",
+            "columnName": "canChangeInfo",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "majorId",
+            "columnName": "majorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minorId",
+            "columnName": "minorId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinnedMessageId",
+            "columnName": "pinnedMessageId",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "peerType",
+            "columnName": "peerType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isArchived",
+            "columnName": "isArchived",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fa307a5eb2e1f7d601bd1374174635cd')"
+    ]
+  }
+}
@@ -33,7 +33,8 @@ interface MessagesUseCase : BaseUseCase {
        randomId: Long,
        message: String?,
        replyTo: Long?,
-        attachments: List<VkAttachment>?
+        attachments: List<VkAttachment>?,
+        formatData: VkMessage.FormatData?
    ): Flow<State<MessagesSendResponse>>

    fun markAsRead(
@@ -57,14 +57,16 @@ class MessagesUseCaseImpl(
        randomId: Long,
        message: String?,
        replyTo: Long?,
-        attachments: List<VkAttachment>?
+        attachments: List<VkAttachment>?,
+        formatData: VkMessage.FormatData?
    ): Flow<State<MessagesSendResponse>> = flowNewState {
        repository.send(
            peerId = peerId,
            randomId = randomId,
            message = message,
            replyTo = replyTo,
-            attachments = attachments
+            attachments = attachments,
+            formatData = formatData
        ).mapToState()
    }

@@ -0,0 +1,8 @@
+package dev.meloda.fast.model
+
+data class PhotoSize(
+    val height: Int,
+    val width: Int,
+    val type: String,
+    val url: String
+)
@@ -6,8 +6,8 @@ enum class AttachmentType(var value: String) {
    UNKNOWN("unknown"),
    PHOTO("photo"),
    VIDEO("video"),
-    AUDIO("audio"),
    FILE("doc"),
+    AUDIO("audio"),
    LINK("link"),
    AUDIO_MESSAGE("audio_message"),
    MINI_APP("mini_app"),
@@ -27,7 +27,9 @@ data class VkFileData(
    ) {

        @JsonClass(generateAdapter = true)
-        data class Photo(val sizes: List<Size>) {
+        data class Photo(
+            val sizes: List<Size>
+        ) {

            @JsonClass(generateAdapter = true)
            data class Size(
@@ -2,6 +2,7 @@ package dev.meloda.fast.model.api.data

 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import dev.meloda.fast.model.PhotoSize
 import dev.meloda.fast.model.api.domain.VkPhotoDomain

@JsonClass(generateAdapter = true)
@@ -35,7 +36,14 @@ data class VkPhotoData(
        ownerId = ownerId,
        hasTags = hasTags == true,
        accessKey = accessKey,
-        sizes = sizes,
+        sizes = sizes.map { size ->
+            PhotoSize(
+                height = size.height,
+                width = size.width,
+                type = size.type,
+                url = size.url
+            )
+        },
        text = text,
        userId = userId
    )
@@ -23,7 +23,7 @@ data class VkVideoData(
    @Json(name = "is_favorite") val isFavorite: Boolean?,
    @Json(name = "image") val image: List<Image>?,
    @Json(name = "first_frame") val firstFrame: List<FirstFrame>?,
-    @Json(name = "files") val files: File?
+    @Json(name = "files") val files: File?,
 ) : VkAttachmentData {

    @JsonClass(generateAdapter = true)
@@ -73,6 +73,7 @@ data class VkVideoData(
        accessKey = accessKey,
        title = title,
        views = views,
-        duration = duration
+        duration = duration,
+        isShortVideo = type == "short_video"
    )
 }
@@ -9,10 +9,10 @@ data class VkWallReplyData(
    val from_id: Long,
    val date: Int,
    val text: String,
-    val post_id: Long,
-    val owner_id: Long,
-    val parents_stack: List<Int>,
-    val likes: Likes,
+    val post_id: Long?,
+    val owner_id: Long?,
+    val parents_stack: List<Int>?,
+    val likes: Likes?,
    val reply_to_user: Int?,
    val reply_to_comment: Int?
 ) {
@@ -3,6 +3,10 @@ package dev.meloda.fast.model.api.domain
 enum class FormatDataType {
    BOLD, ITALIC, UNDERLINE, URL;

+    override fun toString(): String {
+        return super.toString().lowercase()
+    }
+
    companion object {
        fun parse(value: String): FormatDataType? =
            entries.firstOrNull { it.name.lowercase() == value }
@@ -1,7 +1,7 @@
 package dev.meloda.fast.model.api.domain

+import dev.meloda.fast.model.PhotoSize
 import dev.meloda.fast.model.api.data.AttachmentType
-import dev.meloda.fast.model.api.data.VkPhotoData
 import java.util.Stack


@@ -13,7 +13,7 @@ data class VkPhotoDomain(
    val ownerId: Long,
    val hasTags: Boolean,
    val accessKey: String?,
-    val sizes: List<VkPhotoData.Size>,
+    val sizes: List<PhotoSize>,
    val text: String?,
    val userId: Long?
 ) : VkAttachment {
@@ -35,11 +35,15 @@ data class VkPhotoDomain(
        sizesChars.push(SIZE_TYPE_2560_2048)
    }

-    fun getMaxSize(): VkPhotoData.Size? {
+    fun getMaxSize(): PhotoSize? {
        return getSizeOrSmaller(sizesChars.peek())
    }

-    fun getSizeOrNull(type: Char): VkPhotoData.Size? {
+    fun getDefault(): PhotoSize? {
+        return getSizeOrSmaller(SIZE_TYPE_1080_1024)
+    }
+
+    fun getSizeOrNull(type: Char): PhotoSize? {
        for (size in sizes) {
            if (size.type == type.toString()) return size
        }
@@ -47,7 +51,7 @@ data class VkPhotoDomain(
        return null
    }

-    fun getSizeOrSmaller(type: Char): VkPhotoData.Size? {
+    fun getSizeOrSmaller(type: Char): PhotoSize? {
        val photoStack = sizesChars.clone() as Stack<*>

        val sizeIndex = photoStack.search(type)
@@ -13,7 +13,8 @@ data class VkVideoDomain(
    val accessKey: String?,
    val title: String,
    val views: Int,
-    val duration: Int
+    val duration: Int,
+    val isShortVideo: Boolean
 ) : VkAttachment {

    override val type: AttachmentType = AttachmentType.VIDEO
@@ -22,6 +23,10 @@ data class VkVideoDomain(
        return images.find { it.width == width }
    }

+    fun getDefault(): VideoImage? {
+        return imageForWidthAtLeast(720)
+    }
+
    fun imageForWidthAtLeast(width: Int): VideoImage? {
        var certainImages = images.sortedByDescending { it.width }
        var containsVertical = false
@@ -36,9 +41,11 @@ data class VkVideoDomain(
            certainImages = certainImages.filter { it.shapeKind == ShapeKind.Vertical }
        }

-        certainImages = certainImages.filter { it.width >= width }
+        val filteredCertainImages = certainImages.filter { it.width >= width }

-        return certainImages.firstOrNull()
+        return filteredCertainImages
+            .ifEmpty { certainImages }
+            .firstOrNull()
    }

    @JsonClass(generateAdapter = true)
@@ -2,6 +2,7 @@ package dev.meloda.fast.model.api.requests

 import dev.meloda.fast.model.api.asInt
 import dev.meloda.fast.model.api.domain.VkAttachment
+import dev.meloda.fast.model.api.domain.VkMessage

 data class MessagesGetHistoryRequest(
    val count: Int? = null,
@@ -38,7 +39,8 @@ data class MessagesSendRequest(
    val disableMentions: Boolean? = null,
    val doNotParseLinks: Boolean? = null,
    val silent: Boolean? = null,
-    val attachments: List<VkAttachment>? = null
+    val attachments: List<VkAttachment>? = null,
+    val formatData: VkMessage.FormatData? = null
 ) {

    val map: Map<String, String>
@@ -54,6 +56,13 @@ data class MessagesSendRequest(
            disableMentions?.let { this["disable_mentions"] = it.asInt().toString() }
            doNotParseLinks?.let { this["dont_parse_links"] = it.asInt().toString() }
            silent?.let { this["silent"] = it.toString() }
+            formatData?.let {
+                this["format_data"] = "{\"version\":\"${formatData.version}\",\"items\":[" +
+                        formatData.items.joinToString(separator = ", ") { item ->
+                            "{\"type\":\"${item.type}\",\"offset\":${item.offset},\"length\":${item.length}}"
+                        } +
+                        "]}"
+            }

            // TODO: 05/05/2024, Danil Nikolaev: add attachments
 //            attachments?.let {
@@ -3,7 +3,7 @@ package dev.meloda.fast.ui.util
 import androidx.compose.runtime.Immutable

@Immutable
-class ImmutableList<T>(val values: List<T>) : Iterable<T> {
+class ImmutableList<T>(val values: List<T>) : Collection<T> {

    constructor(size: Int, init: (index: Int) -> T) : this(MutableList(size, init))

@@ -25,30 +25,18 @@ class ImmutableList<T>(val values: List<T>) : Iterable<T> {
        return values.mapIndexed(transform).toImmutableList()
    }

-    fun singleOrNull(): T? {
-        return if (values.size == 1) this[0] else null
+    override fun isEmpty(): Boolean = values.isEmpty()
+
+    override val size: Int get() = values.size
+
+    override fun containsAll(elements: Collection<T>): Boolean {
+        return values.containsAll(elements)
    }

-    fun isEmpty(): Boolean = values.isEmpty()
-
-    fun isNotEmpty(): Boolean = !isEmpty()
-
-    inline fun singleOrNull(predicate: (T) -> Boolean): T? {
-        var single: T? = null
-        var found = false
-        for (element in this) {
-            if (predicate(element)) {
-                if (found) return null
-                single = element
-                found = true
-            }
-        }
-        if (!found) return null
-        return single
+    override fun contains(element: T): Boolean {
+        return values.contains(element)
    }

-    val size: Int get() = values.size
-
    companion object {
        fun <T> copyOf(collection: Collection<T>): ImmutableList<T> =
            ImmutableList(collection.toList())
@@ -67,3 +55,7 @@ class ImmutableList<T>(val values: List<T>) : Iterable<T> {
 }

 fun <T> emptyImmutableList(): ImmutableList<T> = ImmutableList(emptyList())
+
+fun <T> immutableListOf(vararg elements: T) = ImmutableList(listOf(elements = elements))
+
+fun <T> ImmutableList<T>?.orEmpty(): ImmutableList<T> = this ?: emptyImmutableList()
@@ -107,6 +107,7 @@
    <string name="message_attachments_files_few">%1$d файла</string>
    <string name="message_attachments_files_many">%1$d файлов</string>
    <string name="message_attachments_files_other">%1$d файлов</string>
+    <string name="message_attachments_clip">Клип</string>
    <string name="message_attachments_audio_message">Голосовое сообщение</string>
    <string name="message_attachments_link">Ссылка</string>
    <string name="message_attachments_mini_app">Мини-приложение</string>
@@ -263,4 +264,9 @@
    <string name="conversation_context_action_archive">В архив</string>
    <string name="confirm_archive_conversation">Архивировать чат?</string>
    <string name="action_archive">В архив</string>
+    <string name="autofill">Автозаполнение</string>
+    <string name="bold">Жирный</string>
+    <string name="italic">Курсив</string>
+    <string name="underline">Подчёркнутый</string>
+    <string name="link">Ссылка</string>
 </resources>
@@ -83,6 +83,7 @@
    <string name="message_attachments_files_many">%1$d files</string>
    <string name="message_attachments_files_other">%1$d files</string>

+    <string name="message_attachments_clip">Clip</string>
    <string name="message_attachments_audio_message">Voice message</string>
    <string name="message_attachments_link">Link</string>
    <string name="message_attachments_mini_app">Mini App</string>
@@ -338,4 +339,10 @@
    <string name="unspam_message_title">Unmark as spam</string>
    <string name="unspam_message_text">Are you sure you want to unmark this message as spam?</string>
    <string name="copied_to_clipboard">Copied to clipboard</string>
+
+    <string name="autofill">Autofill</string>
+    <string name="bold">Bold</string>
+    <string name="italic">Italic</string>
+    <string name="underline">Underline</string>
+    <string name="link">Link</string>
 </resources>