melod1n/fast-messenger
3
2
Fork 1
Code Issues Actions Packages Projects 1 Releases Wiki Activity

Basic conversations screen

Browse Source 
attachment types
action types
forwards
This commit is contained in:
Danil Nikolaev
2021-09-11 21:58:55 +03:00
parent 2109ff9ee5
commit f7c8d6e1c8
91 changed files with 1694 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/meloda/fast/api/UserConfig.kt
+3
View File
@@ -1,5 +1,6 @@
package com.meloda.fast.api
import com.meloda.fast.api.model.VkUser
import com.meloda.fast.common.AppGlobal
object UserConfig {
@@ -30,4 +31,6 @@ object UserConfig {
fun isLoggedIn() = userId > 0 && accessToken.isNotBlank()
var vkUser: VkUser? = null
}
app/src/main/kotlin/com/meloda/fast/api/VkUtils.kt
+357
View File
@@ -0,0 +1,357 @@
package com.meloda.fast.api
import android.content.Context
import com.meloda.fast.R
import com.meloda.fast.api.model.VkGroup
import com.meloda.fast.api.model.VkMessage
import com.meloda.fast.api.model.VkUser
import com.meloda.fast.api.model.attachments.*
import com.meloda.fast.api.model.base.BaseVkMessage
import com.meloda.fast.api.model.base.attachments.BaseVkAttachmentItem
object VkUtils {
fun parseForwards(baseForwards: List<BaseVkMessage>?): List<VkMessage>? {
if (baseForwards.isNullOrEmpty()) return null
val forwards = mutableListOf<VkMessage>()
for (baseForward in baseForwards) {
forwards += baseForward.asVkMessage()
}
return forwards
}
fun parseAttachments(baseAttachments: List<BaseVkAttachmentItem>?): List<VkAttachment>? {
if (baseAttachments.isNullOrEmpty()) return null
val attachments = mutableListOf<VkAttachment>()
for (baseAttachment in baseAttachments) {
when (baseAttachment.getPreparedType()) {
BaseVkAttachmentItem.AttachmentType.PHOTO -> {
val photo = baseAttachment.photo ?: continue
attachments += VkPhoto(
link = photo.sizes[0].url
)
}
BaseVkAttachmentItem.AttachmentType.VIDEO -> {
val video = baseAttachment.video ?: continue
attachments += VkVideo(
link = video.player
)
}
BaseVkAttachmentItem.AttachmentType.AUDIO -> {
val audio = baseAttachment.audio ?: continue
attachments += VkAudio(
link = audio.url
)
}
BaseVkAttachmentItem.AttachmentType.FILE -> {
val file = baseAttachment.file ?: continue
attachments += VkFile(
link = file.url
)
}
BaseVkAttachmentItem.AttachmentType.LINK -> {
val link = baseAttachment.link ?: continue
attachments += VkLink(
link = link.url
)
}
BaseVkAttachmentItem.AttachmentType.MINI_APP -> {
val miniApp = baseAttachment.miniApp ?: continue
attachments += VkMiniApp(
link = miniApp.app.shareUrl
)
}
BaseVkAttachmentItem.AttachmentType.VOICE -> {
val voiceMessage = baseAttachment.voiceMessage ?: continue
attachments += VkVoiceMessage(
link = voiceMessage.linkMp3
)
}
BaseVkAttachmentItem.AttachmentType.STICKER -> {
val sticker = baseAttachment.sticker ?: continue
attachments += VkSticker(
link = sticker.images[0].url
)
}
BaseVkAttachmentItem.AttachmentType.GIFT -> {
val gift = baseAttachment.gift ?: continue
attachments += VkGift(
link = gift.thumb48
)
}
BaseVkAttachmentItem.AttachmentType.WALL -> {
val wall = baseAttachment.wall ?: continue
attachments += VkWall(
id = wall.id
)
}
BaseVkAttachmentItem.AttachmentType.GRAFFITI -> {
val graffiti = baseAttachment.graffiti ?: continue
attachments += VkGraffiti(
link = graffiti.url
)
}
BaseVkAttachmentItem.AttachmentType.POLL -> {
val poll = baseAttachment.poll ?: continue
attachments += VkPoll(
id = poll.id
)
}
BaseVkAttachmentItem.AttachmentType.WALL_REPLY -> {
val wallReply = baseAttachment.wallReply ?: continue
attachments += VkWallReply(
id = wallReply.id
)
}
BaseVkAttachmentItem.AttachmentType.CALL -> {
val call = baseAttachment.call ?: continue
attachments += VkCall(
initiatorId = call.initiatorId
)
}
else -> continue
}
}
return attachments
}
fun getActionConversationText(
message: VkMessage,
youPrefix: String,
profiles: HashMap<Int, VkUser>? = null,
groups: HashMap<Int, VkGroup>? = null,
messageUser: VkUser? = null,
messageGroup: VkGroup? = null
): String? {
return when (message.getPreparedAction()) {
VkMessage.Action.CHAT_CREATE -> {
val text = message.actionText ?: return null
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isGroup() -> messageGroup?.name
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix created «$text»"
}
VkMessage.Action.CHAT_TITLE_UPDATE -> {
val text = message.actionText ?: return null
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isGroup() -> messageGroup?.name
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix renamed chat to «$text»"
}
VkMessage.Action.CHAT_PHOTO_UPDATE -> {
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isGroup() -> messageGroup?.name
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix updated the chat photo"
}
VkMessage.Action.CHAT_PHOTO_REMOVE -> {
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isGroup() -> messageGroup?.name
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix deleted the chat photo"
}
VkMessage.Action.CHAT_KICK_USER -> {
val memberId = message.actionMemberId ?: return null
val isUser = memberId > 0
val isGroup = memberId < 0
val actionUser = profiles?.get(memberId)
val actionGroup = groups?.get(memberId)
// val actionUser = profiles?.find { it.id == memberId }
// val actionGroup = groups?.find { it.id == memberId }
if (isUser && actionUser == null) return null
if (isGroup && actionGroup == null) return null
if (memberId == message.fromId) {
val prefix = if (memberId == UserConfig.userId) youPrefix
else actionUser.toString()
"$prefix left the chat"
} else {
val prefix =
if (message.fromId == UserConfig.userId) youPrefix
else messageUser?.toString() ?: messageGroup?.toString() ?: "..."
val postfix =
if (memberId == UserConfig.userId) youPrefix.lowercase()
else actionUser.toString()
"$prefix kicked $postfix"
}
}
VkMessage.Action.CHAT_INVITE_USER -> {
val memberId = message.actionMemberId ?: 0
val isUser = memberId > 0
val isGroup = memberId < 0
val actionUser = profiles?.get(memberId)
val actionGroup = groups?.get(memberId)
// val actionUser = profiles?.find { it.id == memberId }
// val actionGroup = groups?.find { it.id == memberId }
if (isUser && actionUser == null) return null
if (isGroup && actionGroup == null) return null
if (memberId == message.fromId) {
val prefix = if (memberId == UserConfig.userId) youPrefix
else actionUser.toString()
"$prefix returned the chat"
} else {
val prefix = if (message.fromId == UserConfig.userId) youPrefix
else messageUser?.toString() ?: messageGroup?.toString() ?: "..."
val postfix =
if (memberId == UserConfig.userId) youPrefix.lowercase()
else actionUser.toString()
"$prefix invited $postfix"
}
}
VkMessage.Action.CHAT_INVITE_USER_BY_LINK -> {
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix joined the chat via link"
}
VkMessage.Action.CHAT_INVITE_USER_BY_CALL_LINK -> {
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix joined the call via link"
}
VkMessage.Action.CHAT_PIN_MESSAGE -> {
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isGroup() -> messageGroup?.name
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
val actionMessage = message.actionMessage ?: return null
"$prefix pinned message «$actionMessage»"
}
VkMessage.Action.CHAT_UNPIN_MESSAGE -> {
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isGroup() -> messageGroup?.name
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix unpinned message"
}
VkMessage.Action.CHAT_SCREENSHOT -> {
val prefix = when {
message.fromId == UserConfig.userId -> youPrefix
message.isGroup() -> messageGroup?.name
message.isUser() -> messageUser?.toString()
else -> return null
} ?: return null
"$prefix took a screenshot"
}
null -> null
else -> "[${message.action}]"
}
}
fun getForwardsConversationText(context: Context, message: VkMessage): String? {
if (message.forwards.isNullOrEmpty()) return null
return message.forwards?.let { forwards ->
context.getString(
if (forwards.size == 1) R.string.forwarded_message
else R.string.forwarded_messages
)
}
}
fun getAttachmentConversationText(context: Context, message: VkMessage): String? {
message.geoType?.let {
return when (it) {
"point" -> context.getString(R.string.message_geo_point)
else -> context.getString(R.string.message_geo)
}
}
if (message.attachments.isNullOrEmpty()) return null
return message.attachments?.let { attachments ->
if (attachments.size == 1) {
getAttachmentTypeByClass(attachments[0])?.let { getAttachmentTextByType(it) }
} else {
if (isAttachmentsHaveOneType(attachments)) {
getAttachmentTypeByClass(attachments[0])?.let { getAttachmentTextByType(it) }
} else {
context.getString(R.string.message_attachments_many)
}
}
}
}
fun isAttachmentsHaveOneType(attachments: List<VkAttachment>): Boolean {
if (attachments.isEmpty()) return true
if (attachments.size == 1) return true
val firstType = getAttachmentTypeByClass(attachments[0])
for (i in 1 until attachments.size) {
val type = getAttachmentTypeByClass(attachments[i])
if (type != firstType) return false
}
return true
}
fun getAttachmentTypeByClass(attachment: VkAttachment): BaseVkAttachmentItem.AttachmentType? {
return when (attachment) {
is VkPhoto -> BaseVkAttachmentItem.AttachmentType.PHOTO
is VkVideo -> BaseVkAttachmentItem.AttachmentType.VIDEO
is VkAudio -> BaseVkAttachmentItem.AttachmentType.AUDIO
is VkFile -> BaseVkAttachmentItem.AttachmentType.FILE
is VkLink -> BaseVkAttachmentItem.AttachmentType.LINK
is VkMiniApp -> BaseVkAttachmentItem.AttachmentType.MINI_APP
is VkVoiceMessage -> BaseVkAttachmentItem.AttachmentType.VOICE
is VkSticker -> BaseVkAttachmentItem.AttachmentType.STICKER
is VkGift -> BaseVkAttachmentItem.AttachmentType.GIFT
is VkWall -> BaseVkAttachmentItem.AttachmentType.WALL
is VkGraffiti -> BaseVkAttachmentItem.AttachmentType.GRAFFITI
is VkPoll -> BaseVkAttachmentItem.AttachmentType.POLL
is VkWallReply -> BaseVkAttachmentItem.AttachmentType.WALL_REPLY
is VkCall -> BaseVkAttachmentItem.AttachmentType.CALL
else -> null
}
}
fun getAttachmentTextByType(attachmentType: BaseVkAttachmentItem.AttachmentType): String? {
return when (attachmentType) {
else -> attachmentType.value
}
}
}
app/src/main/kotlin/com/meloda/fast/api/datasource/ConversationsDataSource.kt
+1 -1
View File
@@ -11,7 +11,7 @@ class ConversationsDataSource @Inject constructor(
private val dao: ConversationsDao
) {
suspend fun getAllChats(params: ConversationsGetRequest) = repo.getAllChats(params)
suspend fun getAllChats(params: ConversationsGetRequest) = repo.getAllChats(params.map)
suspend fun storeConversations(conversations: List<VkConversation>) = dao.insert(conversations)
app/src/main/kotlin/com/meloda/fast/api/model/VkConversation.kt
+8
View File
@@ -9,7 +9,15 @@ data class VkConversation(
@PrimaryKey(autoGenerate = false)
val id: Int,
val title: String?,
val photo200: String?,
val type: String,
val callInProgress: Boolean
) {
@Ignore
var lastMessage: VkMessage? = null
fun isChat() = type == "chat"
fun isUser() = type == "user"
fun isGroup() = type == "group"
}
app/src/main/kotlin/com/meloda/fast/api/model/VkGroup.kt
+17
View File
@@ -0,0 +1,17 @@
package com.meloda.fast.api.model
import androidx.room.Entity
import androidx.room.PrimaryKey
@Entity(tableName = "groups")
data class VkGroup(
@PrimaryKey(autoGenerate = false)
val id: Int,
val name: String,
val screenName: String,
val photo200: String?
) {
override fun toString() = name.trim()
}
app/src/main/kotlin/com/meloda/fast/api/model/VkMessage.kt
+42 -1
View File
@@ -1,7 +1,9 @@
package com.meloda.fast.api.model
import androidx.room.Entity
import androidx.room.Ignore
import androidx.room.PrimaryKey
import com.meloda.fast.api.model.attachments.VkAttachment
@Entity(tableName = "messages")
data class VkMessage(
@@ -11,9 +13,48 @@ data class VkMessage(
val isOut: Boolean,
val peerId: Int,
val fromId: Int,
val date: Int
val date: Int,
val action: String?,
val actionMemberId: Int?,
val actionText: String?,
val actionConversationMessageId: Int?,
val actionMessage: String?,
val geoType: String?
) {
@Ignore
var forwards: List<VkMessage>? = null
@Ignore
var attachments: List<VkAttachment>? = null
fun isUser() = id > 0
fun isGroup() = id < 0
fun getPreparedAction(): Action? {
if (action == null) return null
return Action.parse(action)
}
enum class Action(val value: String) {
CHAT_CREATE("chat_create"),
CHAT_PHOTO_UPDATE("chat_photo_update"),
CHAT_PHOTO_REMOVE("chat_photo_remove"),
CHAT_TITLE_UPDATE("chat_title_update"),
CHAT_PIN_MESSAGE("chat_pin_message"),
CHAT_UNPIN_MESSAGE("chat_unpin_message"),
CHAT_INVITE_USER("chat_invite_user"),
CHAT_INVITE_USER_BY_LINK("chat_invite_user_by_link"),
CHAT_KICK_USER("chat_kick_user"),
CHAT_SCREENSHOT("chat_screenshot"),
// TODO: 9/11/2021 catch this shit
CHAT_INVITE_USER_BY_CALL("chat_invite_user_by_call"),
CHAT_INVITE_USER_BY_CALL_LINK("chat_invite_user_by_call_join_link");
companion object {
fun parse(value: String) = values().first { it.value == value }
}
}
}
app/src/main/kotlin/com/meloda/fast/api/model/VkUser.kt
+8 -2
View File
@@ -8,5 +8,11 @@ data class VkUser(
@PrimaryKey(autoGenerate = false)
val id: Int,
val firstName: String,
val lastName: String
)
val lastName: String,
val online: Boolean,
val photo200: String?
) {
override fun toString() = "$firstName $lastName".trim()
}
app/src/main/kotlin/com/meloda/fast/api/model/attachments/BaseVKAttachmentItem.kt
-16
View File
@@ -1,16 +0,0 @@
package com.meloda.fast.api.model.attachments
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVKAttachmentItem(
val type: String,
val photo: VKPhotoAttachment?,
val video: VKVideoAttachment?,
val audio: VKAudioAttachment?,
val doc: VKFileAttachment?,
val link: VKLinkAttachment?
) : Parcelable
abstract class BaseVKAttachment : Parcelable
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkAttachment.kt
+3
View File
@@ -0,0 +1,3 @@
package com.meloda.fast.api.model.attachments
abstract class VkAttachment
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkAudio.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkAudio(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkCall.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkCall(
val initiatorId: Int
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkFile.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkFile(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGift.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkGift(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGraffiti.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkGraffiti(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkLink.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkLink(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkMiniApp.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkMiniApp(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkPhoto.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkPhoto(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkPoll.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkPoll(
val id: Int
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkSticker.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkSticker(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkVideo.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkVideo(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkVoiceMessage.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkVoiceMessage(
val link: String
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkWall.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkWall(
val id: Int
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkWallReply.kt
+5
View File
@@ -0,0 +1,5 @@
package com.meloda.fast.api.model.attachments
data class VkWallReply(
val id: Int
) : VkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/base/BaseVkConversation.kt
+27 -6
View File
@@ -31,12 +31,17 @@ data class BaseVkConversation(
@SerializedName("can_receive_money")
val canReceiveMoney: Boolean,
@SerializedName("chat_settings")
val chatSettings: ChatSettings?
val chatSettings: ChatSettings?,
@SerializedName("call_in_progress")
val callInProgress: CallInProgress?
) : Parcelable {
fun asVkConversation(lastMessage: VkMessage? = null) = VkConversation(
id = peer.id,
title = chatSettings?.title,
photo200 = chatSettings?.photo?.photo200,
type = peer.type,
callInProgress = callInProgress != null
).apply { this.lastMessage = lastMessage }
@Parcelize
@@ -83,7 +88,7 @@ data class BaseVkConversation(
val membersCount: Int,
@SerializedName("friends_count")
val friendsCount: Int,
val photo: Photo,
val photo: Photo?,
@SerializedName("admin_ids")
val adminsIds: List<Int>,
@SerializedName("active_ids")
@@ -93,7 +98,8 @@ data class BaseVkConversation(
@SerializedName("is_disappearing")
val isDisappearing: Boolean,
@SerializedName("is_service")
val isService: Boolean
val isService: Boolean,
val theme: String
) : Parcelable {
@Parcelize
@@ -125,13 +131,28 @@ data class BaseVkConversation(
@Parcelize
data class Photo(
@SerializedName("photo_50")
val photo50: String,
val photo50: String?,
@SerializedName("photo_100")
val photo100: String,
val photo100: String?,
@SerializedName("photo_200")
val photo200: String,
val photo200: String?,
@SerializedName("is_default_photo")
val isDefaultPhoto: Boolean
) : Parcelable
}
@Parcelize
data class CallInProgress(
val participants: Participants,
@SerializedName("join_link")
val joinLink: String
) : Parcelable {
@Parcelize
data class Participants(
val list: List<Int>,
val count: Int
) : Parcelable
}
}
app/src/main/kotlin/com/meloda/fast/api/model/base/BaseVkGroup.kt
+38
View File
@@ -0,0 +1,38 @@
package com.meloda.fast.api.model.base
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.meloda.fast.api.model.VkGroup
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkGroup(
val id: Int,
val name: String,
@SerializedName("screen_name")
val screenName: String,
@SerializedName("is_closed")
val isClosed: Int,
val type: String,
@SerializedName("is_admin")
val isAdmin: Int,
@SerializedName("is_member")
val isMember: Int,
@SerializedName("is_advertiser")
val isAdvertiser: Int,
@SerializedName("photo_50")
val photo50: String?,
@SerializedName("photo_100")
val photo100: String?,
@SerializedName("photo_200")
val photo200: String?
) : Parcelable {
fun asVkGroup() = VkGroup(
id = -id,
name = name,
screenName = screenName,
photo200 = photo200
)
}
app/src/main/kotlin/com/meloda/fast/api/model/base/BaseVkMessage.kt
+30 -7
View File
@@ -2,9 +2,10 @@ package com.meloda.fast.api.model.base
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.meloda.fast.api.VkUtils
import com.meloda.fast.api.model.VkMessage
import com.meloda.fast.api.model.base.attachments.BaseVkAttachmentItem
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
@Parcelize
data class BaseVkMessage(
@@ -19,25 +20,36 @@ data class BaseVkMessage(
@SerializedName("conversation_message_id")
val conversationMessageId: Int,
@SerializedName("fwd_messages")
val fwdMessages: List<BaseVkMessage> = listOf(),
val fwdMessages: List<BaseVkMessage>? = listOf(),
val important: Boolean,
@SerializedName("random_id")
val randomId: Int,
val attachments: @RawValue List<Any> = listOf(),
val attachments: List<BaseVkAttachmentItem> = listOf(),
@SerializedName("is_hidden")
val isHidden: Boolean,
val payload: String,
val geo: Geo?
val geo: Geo?,
val action: Action?,
val ttl: Int
) : Parcelable {
fun asVkMessage() = VkMessage(
id = id,
text = text,
text = if (text.isBlank()) null else text,
isOut = out == 1,
peerId = peerId,
fromId = fromId,
date = date
)
date = date,
action = action?.type,
actionMemberId = action?.memberId,
actionText = action?.text,
actionConversationMessageId = action?.conversationMessageId,
actionMessage = action?.message,
geoType = geo?.type
).also {
it.attachments = VkUtils.parseAttachments(attachments)
it.forwards = VkUtils.parseForwards(fwdMessages)
}
@Parcelize
data class Geo(
@@ -54,4 +66,15 @@ data class BaseVkMessage(
data class Place(val country: String, val city: String, val title: String) : Parcelable
}
@Parcelize
data class Action(
val type: String,
@SerializedName("member_id")
val memberId: Int?,
val text: String?,
@SerializedName("conversation_message_id")
val conversationMessageId: Int?,
val message: String?
) : Parcelable
}
app/src/main/kotlin/com/meloda/fast/api/model/base/BaseVkUser.kt
+3 -1
View File
@@ -50,7 +50,9 @@ data class BaseVkUser(
fun asVkUser() = VkUser(
id = id,
firstName = firstName,
lastName = lastName
lastName = lastName,
online = online == 1,
photo200 = photo200
)
}
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkAttachmentItem.kt
+56
View File
@@ -0,0 +1,56 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkAttachmentItem(
val type: String,
val photo: BaseVkPhoto?,
val video: BaseVkVideo?,
val audio: BaseVkAudio?,
@SerializedName("doc")
val file: BaseVkFile?,
val link: BaseVkLink?,
@SerializedName("mini_app")
val miniApp: BaseVkMiniApp?,
@SerializedName("audio_message")
val voiceMessage: BaseVkVoiceMessage?,
val sticker: BaseVkSticker?,
val gift: BaseVkGift?,
val wall: BaseVkWall?,
val graffiti: BaseVkGraffiti?,
val poll: BaseVkPoll?,
@SerializedName("wall_reply")
val wallReply: BaseVkWallReply?,
val call: BaseVkCall?
) : Parcelable {
fun getPreparedType() = AttachmentType.parse(type)
enum class AttachmentType(val value: String) {
PHOTO("photo"),
VIDEO("video"),
AUDIO("audio"),
FILE("doc"),
LINK("link"),
VOICE("audio_message"),
MINI_APP("mini_app"),
STICKER("sticker"),
GIFT("gift"),
WALL("wall"),
GRAFFITI("graffiti"),
POLL("poll"),
WALL_REPLY("wall_reply"),
CALL("call")
;
companion object {
fun parse(value: String) = values().firstOrNull { it.value == value }
}
}
}
abstract class BaseVkAttachment : Parcelable
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VKAudioAttachment.kt → app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkAudio.kt
+3 -3
View File
@@ -1,11 +1,11 @@
package com.meloda.fast.api.model.attachments
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class VKAudioAttachment(
data class BaseVkAudio(
val id: Int,
val title: String,
val artist: String,
@@ -33,7 +33,7 @@ data class VKAudioAttachment(
val storiesAllowed: Boolean,
@SerializedName("stories_cover_allowed")
val storiesCoverAllowed: Boolean
) : BaseVKAttachment() {
) : BaseVkAttachment() {
@Parcelize
data class Album(
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkCall.kt
+17
View File
@@ -0,0 +1,17 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkCall(
@SerializedName("initiator_id")
val initiatorId: Int,
@SerializedName("receiver_id")
val receiverId: Int,
val state: String,
val time: Int,
val duration: Int,
val video: Boolean
) : Parcelable
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VKFileAttachment.kt → app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkFile.kt
+3 -3
View File
@@ -1,11 +1,11 @@
package com.meloda.fast.api.model.attachments
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class VKFileAttachment(
data class BaseVkFile(
val id: Int,
@SerializedName("owner_id")
val ownerId: Int,
@@ -22,7 +22,7 @@ data class VKFileAttachment(
val accessKey: String,
@SerializedName("web_preview_url")
val webPreviewUrl: String?
) : BaseVKAttachment() {
) : BaseVkAttachment() {
@Parcelize
data class Preview(
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkGift.kt
+16
View File
@@ -0,0 +1,16 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkGift(
val id: Int,
@SerializedName("thumb_256")
val thumb256: String?,
@SerializedName("thumb_96")
val thumb96: String?,
@SerializedName("thumb_48")
val thumb48: String
) : Parcelable
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkGraffiti.kt
+17
View File
@@ -0,0 +1,17 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkGraffiti(
val id: Int,
@SerializedName("owner_id")
val ownerId: Int,
val url: String,
val width: Int,
val height: Int,
@SerializedName("access_key")
val accessKey: String
) : Parcelable
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VKLinkAttachment.kt → app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkLink.kt
+4 -4
View File
@@ -1,15 +1,15 @@
package com.meloda.fast.api.model.attachments
package com.meloda.fast.api.model.base.attachments
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class VKLinkAttachment(
data class BaseVkLink(
val url: String,
val title: String,
val caption: String,
val photo: VKPhotoAttachment,
val photo: BaseVkPhoto,
val target: String,
@SerializedName("is_favorite")
val isFavorite: Boolean
) : BaseVKAttachment()
) : BaseVkAttachment()
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkMiniApp.kt
+67
View File
@@ -0,0 +1,67 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkMiniApp(
val title: String,
val description: String,
val app: App,
val images: List<Image>?,
@SerializedName("button_text")
val buttonText: String
) : Parcelable {
@Parcelize
data class App(
val type: String,
val id: Int,
val title: String,
@SerializedName("author_owner_id")
val authorOwnerId: Int,
@SerializedName("are_notifications_enabled")
val areNotificationsEnabled: Boolean,
@SerializedName("is_favorite")
val isFavorite: Boolean,
@SerializedName("is_installed")
val isInstalled: Boolean,
@SerializedName("track_code")
val trackCode: String,
@SerializedName("share_url")
val shareUrl: String,
@SerializedName("webview_url")
val webViewUrl: String,
@SerializedName("hide_tabbar")
val hideTabBar: Int,
@SerializedName("icon_75")
val icon75: String?,
@SerializedName("icon_139")
val icon139: String?,
@SerializedName("icon_150")
val icon150: String?,
@SerializedName("icon_278")
val icon278: String?,
@SerializedName("icon_576")
val icon576: String?,
@SerializedName("open_in_external_browser")
val openInExternalBrowser: Boolean,
@SerializedName("need_policy_confirmation")
val needPolicyConfirmation: Boolean,
@SerializedName("is_vkui_internal")
val isVkUiInternal: Boolean,
@SerializedName("has_vk_connect")
val hasVkConnect: Boolean,
@SerializedName("need_show_bottom_menu_tooltip_on_close")
val needShowBottomMenuTooltipOnClose: Boolean
) : Parcelable
@Parcelize
data class Image(
val height: Int,
val width: Int,
val url: String
) : Parcelable
}
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VKPhotoAttachment.kt → app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkPhoto.kt
+3 -3
View File
@@ -1,11 +1,11 @@
package com.meloda.fast.api.model.attachments
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class VKPhotoAttachment(
data class BaseVkPhoto(
@SerializedName("album_id")
val albumId: Int,
val date: Int,
@@ -20,7 +20,7 @@ data class VKPhotoAttachment(
val text: String,
@SerializedName("user_id")
val userId: Int?
) : BaseVKAttachment()
) : BaseVkAttachment()
@Parcelize
data class Size(
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkPoll.kt
+72
View File
@@ -0,0 +1,72 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkPoll(
val multiple: Boolean,
val id: Int,
val votes: Int,
val anonymous: Boolean,
val closed: Boolean,
@SerializedName("end_date")
val endDate: Int,
@SerializedName("is_board")
val isBoard: Boolean,
@SerializedName("can_vote")
val canVote: Boolean,
@SerializedName("can_edit")
val canEdit: Boolean,
@SerializedName("can_report")
val canReport: Boolean,
@SerializedName("can_share")
val canShare: Boolean,
val created: Int,
@SerializedName("owner_id")
val ownerId: Int,
val question: String,
@SerializedName("disable_unvote")
val disableUnVote: Boolean,
val friends: List<Friend>?,
@SerializedName("embed_hash")
val embedHash: String,
val answers: List<Answer>,
@SerializedName("author_id")
val authorId: Int,
val background: Background?
) : Parcelable {
@Parcelize
data class Friend(
val id: Int
) : Parcelable
@Parcelize
data class Answer(
val id: Int,
val rate: Double,
val text: String,
val votes: Int
) : Parcelable
@Parcelize
data class Background(
val angle: Int,
val color: String,
val id: Int,
val name: String,
val type: String,
val points: List<Point>
) : Parcelable {
@Parcelize
data class Point(
val color: String,
val position: Double
) : Parcelable
}
}
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkSticker.kt
+35
View File
@@ -0,0 +1,35 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkSticker(
@SerializedName("product_id")
val productId: Int,
@SerializedName("sticker_id")
val stickerId: Int,
val images: List<Image>,
@SerializedName("images_with_background")
val imagesWithBackground: List<Image>,
@SerializedName("animation_url")
val animationUrl: String?,
val animations: List<Animation>?
) : Parcelable {
@Parcelize
data class Image(
val width: Int,
val height: Int,
val url: String
) : Parcelable
@Parcelize
data class Animation(
val type: String,
val url: String
) : Parcelable
}
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VKVideoAttachment.kt → app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkVideo.kt
+10 -10
View File
@@ -1,11 +1,11 @@
package com.meloda.fast.api.model.attachments
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class VKVideoAttachment(
data class BaseVkVideo(
val id: Int,
val title: String,
val width: Int,
@@ -47,11 +47,11 @@ data class VKVideoAttachment(
val image: List<Image>,
@SerializedName("first_frame")
val firstFrame: List<FirstFrame>,
val files: List<File>,
val files: File,
@SerializedName("timeline_thumbs")
val timelineThumbs: TimelineThumbs
//ads
) : BaseVKAttachment() {
) : BaseVkAttachment() {
@Parcelize
data class Image(
@@ -71,12 +71,12 @@ data class VKVideoAttachment(
@Parcelize
data class File(
val mp4_240: String,
val mp4_360: String,
val mp4_480: String,
val mp4_720: String,
val mp4_1080: String,
val mp4_1440: String,
val mp4_240: String?,
val mp4_360: String?,
val mp4_480: String?,
val mp4_720: String?,
val mp4_1080: String?,
val mp4_1440: String?,
val hls: String,
@SerializedName("dash_uni")
val dashUni: String,
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkVoiceMessage.kt
+23
View File
@@ -0,0 +1,23 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkVoiceMessage(
val id: Int,
@SerializedName("owner_id")
val ownerId: Int,
val duration: Int,
val waveform: List<Int>,
@SerializedName("link_ogg")
val linkOgg: String,
@SerializedName("link_mp3")
val linkMp3: String,
@SerializedName("access_key")
val accessKey: String,
@SerializedName("transcript_state")
val transcriptState: String,
val transcript: String
) : Parcelable
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkWall.kt
+76
View File
@@ -0,0 +1,76 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkWall(
val id: Int,
@SerializedName("from_id")
val fromId: Int,
@SerializedName("to_id")
val toId: Int,
val date: Int,
val text: String,
val attachments: List<BaseVkAttachmentItem>?,
@SerializedName("post_source")
val postSource: PostSource,
val comments: Comments,
val likes: Likes,
val reposts: Reposts,
val views: Views,
@SerializedName("is_favorite")
val isFavorite: Boolean,
val donut: Donut,
@SerializedName("access_key")
val accessKey: String,
@SerializedName("short_text_rate")
val shortTextRate: Double
) : Parcelable {
@Parcelize
data class PostSource(
val type: String,
val platform: String
) : Parcelable
@Parcelize
data class Comments(
val count: Int,
@SerializedName("can_post")
val canPost: Int,
@SerializedName("groups_can_post")
val groupsCanPost: Boolean
) : Parcelable
@Parcelize
data class Likes(
val count: Int,
@SerializedName("user_likes")
val userLikes: Int,
@SerializedName("can_like")
val canLike: Int,
@SerializedName("can_publish")
val canPublish: Int,
) : Parcelable
@Parcelize
data class Reposts(
val count: Int,
@SerializedName("user_reposted")
val userReposted: Int
) : Parcelable
@Parcelize
data class Views(
val count: Int
) : Parcelable
@Parcelize
data class Donut(
@SerializedName("is_donut")
val isDonut: Boolean
) : Parcelable
}
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkWallReply.kt
+39
View File
@@ -0,0 +1,39 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
@Parcelize
data class BaseVkWallReply(
val id: Int,
@SerializedName("from_id")
val fromId: Int,
val date: Int,
val text: String,
@SerializedName("post_id")
val postId: Int,
@SerializedName("owner_id")
val ownerId: Int,
@SerializedName("parents_stack")
val parentsStack: List<Int>,
val likes: Likes,
@SerializedName("reply_to_user")
val replyToUser: Int?,
@SerializedName("reply_to_comment")
val replyToComment: Int?
) : Parcelable {
@Parcelize
data class Likes(
val count: Int,
@SerializedName("can_like")
val canLike: Int,
@SerializedName("user_likes")
val userLikes: Int,
@SerializedName("can_publish")
val canPublish: Int
) : Parcelable
}
app/src/main/kotlin/com/meloda/fast/api/model/old/VKAttachments.kt
+13 -13
View File
@@ -18,20 +18,20 @@ object VKAttachments {
val jsonObject = attachment.optJSONObject(type.value) ?: continue
when (type) {
Type.PHOTO -> attachments.add(VKPhoto(jsonObject))
Type.AUDIO -> attachments.add(VKAudio(jsonObject))
Type.VIDEO -> attachments.add(VKVideo(jsonObject))
Type.DOCUMENT -> attachments.add(VKDocument(jsonObject))
Type.STICKER -> attachments.add(VKSticker(jsonObject))
Type.LINK -> attachments.add(VKLink(jsonObject))
Type.GIFT -> attachments.add(VKGift(jsonObject))
Type.VOICE_MESSAGE -> attachments.add(VKAudioMessage(jsonObject))
Type.GRAFFITI -> attachments.add(VKGraffiti(jsonObject))
Type.POLL -> attachments.add(VKPoll(jsonObject))
// Type.PHOTO -> attachments.add(oldVKPhoto(jsonObject))
// Type.AUDIO -> attachments.add(oldVKAudio(jsonObject))
// Type.VIDEO -> attachments.add(oldVKVideo(jsonObject))
// Type.DOCUMENT -> attachments.add(oldVKDocument(jsonObject))
// Type.STICKER -> attachments.add(oldVKSticker(jsonObject))
// Type.LINK -> attachments.add(oldVKLink(jsonObject))
// Type.GIFT -> attachments.add(VKGift(jsonObject))
// Type.VOICE_MESSAGE -> attachments.add(oldVKAudioMessage(jsonObject))
// Type.GRAFFITI -> attachments.add(VKGraffiti(jsonObject))
Type.POLL -> attachments.add(oldVKPoll(jsonObject))
Type.CALL -> attachments.add(VKCall(jsonObject))
Type.WALL_POST -> attachments.add(VKWall(jsonObject))
Type.WALL_REPLY -> attachments.add(VKComment(jsonObject))
Type.GEOLOCATION -> attachments.add(VKGeolocation(jsonObject))
// Type.WALL_POST -> attachments.add(VKWall(jsonObject))
Type.WALL_REPLY -> attachments.add(oldVKComment(jsonObject))
// Type.GEOLOCATION -> attachments.add(oldVKGeolocation(jsonObject))
else -> continue
}
}
app/src/main/kotlin/com/meloda/fast/api/model/old/VKLongPollHistory.kt
+1 -1
View File
@@ -9,6 +9,6 @@ class VKLongPollHistory : VKModel() {
private val lpMessages: ArrayList<oldVKMessage>? = null
private val messages: ArrayList<oldVKMessage>? = null
private val profiles: ArrayList<oldVKUser>? = null
private val groups: ArrayList<VKGroup>? = null //TODO: использовать
private val groups: ArrayList<oldVKGroup>? = null //TODO: использовать
}
app/src/main/kotlin/com/meloda/fast/api/model/old/VKAudio.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKAudio.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKAudio() : VKModel() {
class oldVKAudio() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKAudioMessage.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKAudioMessage.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKAudioMessage() : VKModel() {
class oldVKAudioMessage() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKComment.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKComment.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKComment() : VKModel() { //https://vk.com/dev/objects/comment
class oldVKComment() : VKModel() { //https://vk.com/dev/objects/comment
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKConversation.kt
+2 -2
View File
@@ -10,7 +10,7 @@ class oldVKConversation() : VKModel(), Cloneable {
const val serialVersionUID: Long = 1L
var profiles = arrayListOf<oldVKUser>()
var groups = arrayListOf<VKGroup>()
var groups = arrayListOf<oldVKGroup>()
var conversationsCount: Int = 0
@@ -56,7 +56,7 @@ class oldVKConversation() : VKModel(), Cloneable {
var peerUser: oldVKUser? = null
var peerGroup: VKGroup? = null
var peerGroup: oldVKGroup? = null
constructor(o: JSONObject) : this() {
inReadMessageId = o.optInt("in_read")
app/src/main/kotlin/com/meloda/fast/api/model/old/VKDocument.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKDocument.kt
+4 -4
View File
@@ -4,7 +4,7 @@ import org.json.JSONObject
import java.io.Serializable
import java.util.*
class VKDocument() : VKModel() {
class oldVKDocument() : VKModel() {
override val attachmentType = VKAttachments.Type.DOCUMENT
@@ -47,13 +47,13 @@ class VKDocument() : VKModel() {
inner class Photo(o: JSONObject) : Serializable {
var sizes: ArrayList<VKPhotoSize>? = null
var sizes: ArrayList<oldVKPhotoSize>? = null
init {
o.optJSONArray("sizes")?.let {
val sizes = ArrayList<VKPhotoSize>()
val sizes = ArrayList<oldVKPhotoSize>()
for (i in 0 until it.length()) {
sizes.add(VKPhotoSize(it.optJSONObject(i)))
sizes.add(oldVKPhotoSize(it.optJSONObject(i)))
}
this.sizes = sizes
}
app/src/main/kotlin/com/meloda/fast/api/model/old/VKGeolocation.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKGeolocation.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKGeolocation() : VKModel() {
class oldVKGeolocation() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKGift.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKGift.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKGift() : VKModel() {
class oldVKGift() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKGraffiti.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKGraffiti.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKGraffiti() : VKModel() {
class oldVKGraffiti() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKGroup.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKGroup.kt
+4 -4
View File
@@ -3,7 +3,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONArray
import org.json.JSONObject
open class VKGroup() : VKModel() {
open class oldVKGroup() : VKModel() {
override val attachmentType = VKAttachments.Type.NONE
@@ -11,11 +11,11 @@ open class VKGroup() : VKModel() {
const val serialVersionUID: Long = 1L
fun parse(array: JSONArray): ArrayList<VKGroup> {
val groups = ArrayList<VKGroup>()
fun parse(array: JSONArray): ArrayList<oldVKGroup> {
val groups = ArrayList<oldVKGroup>()
for (i in 0 until array.length()) {
groups.add(VKGroup(array.optJSONObject(i)))
groups.add(oldVKGroup(array.optJSONObject(i)))
}
return groups
}
app/src/main/kotlin/com/meloda/fast/api/model/old/VKLink.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKLink.kt
+3 -3
View File
@@ -3,7 +3,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
import java.io.Serializable
class VKLink() : VKModel() {
class oldVKLink() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
@@ -17,7 +17,7 @@ class VKLink() : VKModel() {
var description: String = ""
var previewPage: String = ""
var previewUrl: String = ""
var photo: VKPhoto? = null
var photo: oldVKPhoto? = null
var button: Button? = null
constructor(o: JSONObject): this() {
@@ -29,7 +29,7 @@ class VKLink() : VKModel() {
previewUrl = o.optString("preview_url")
o.optJSONObject("photo")?.let {
photo = VKPhoto(it)
photo = oldVKPhoto(it)
}
o.optJSONObject("button")?.let {
app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKMessage.kt
+6 -6
View File
@@ -1,7 +1,7 @@
package com.meloda.fast.api.model.old
import android.util.ArrayMap
import com.meloda.fast.api.VKUtil
import com.meloda.fast.api.oldVKUtil
import org.json.JSONObject
open class oldVKMessage() : VKModel() {
@@ -11,7 +11,7 @@ open class oldVKMessage() : VKModel() {
companion object {
var profiles = arrayListOf<oldVKUser>()
var groups = arrayListOf<VKGroup>()
var groups = arrayListOf<oldVKGroup>()
var conversations = arrayListOf<oldVKConversation>()
const val serialVersionUID: Long = 1L
@@ -101,11 +101,11 @@ open class oldVKMessage() : VKModel() {
var replyMessage: oldVKMessage? = null
var action: VKMessageAction? = null
var action: oldVKMessageAction? = null
var fromUser: oldVKUser? = null
var fromGroup: VKGroup? = null
var fromGroup: oldVKGroup? = null
constructor(o: JSONObject) : this() {
id = o.optInt("id", -1)
@@ -115,7 +115,7 @@ open class oldVKMessage() : VKModel() {
editTime = o.optInt("edit_time", -1)
isOut = o.optInt("out") == 1
text = VKUtil.prepareMessageText(o.optString("text"))
text = oldVKUtil.prepareMessageText(o.optString("text"))
randomId = o.optInt("random_id", -1)
conversationMessageId = o.optInt("conversation_message_id", -1)
@@ -138,7 +138,7 @@ open class oldVKMessage() : VKModel() {
}
o.optJSONObject("action")?.let {
action = VKMessageAction(it)
action = oldVKMessageAction(it)
}
}
app/src/main/kotlin/com/meloda/fast/api/model/old/VKMessageAction.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKMessageAction.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKMessageAction() : VKModel() {
class oldVKMessageAction() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKPhoto.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKPhoto.kt
+4 -4
View File
@@ -3,7 +3,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
import java.util.*
class VKPhoto() : VKModel() {
class oldVKPhoto() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
@@ -18,7 +18,7 @@ class VKPhoto() : VKModel() {
var date: Int = 0
var width: Int = 0
var height: Int = 0
var sizes: ArrayList<VKPhotoSize>? = null
var sizes: ArrayList<oldVKPhotoSize>? = null
constructor(o: JSONObject) : this() {
id = o.optInt("id", -1)
@@ -30,9 +30,9 @@ class VKPhoto() : VKModel() {
height = o.optInt("height")
o.optJSONArray("sizes")?.let {
val sizes = ArrayList<VKPhotoSize>()
val sizes = ArrayList<oldVKPhotoSize>()
for (i in 0 until it.length()) {
sizes.add(VKPhotoSize(it.optJSONObject(i)))
sizes.add(oldVKPhotoSize(it.optJSONObject(i)))
}
this.sizes = sizes
}
app/src/main/kotlin/com/meloda/fast/api/model/old/VKPhotoSize.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKPhotoSize.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKPhotoSize(o: JSONObject) : VKModel() {
class oldVKPhotoSize(o: JSONObject) : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKPoll.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKPoll.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKPoll() : VKModel() {
class oldVKPoll() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKSticker.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKSticker.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
import java.util.*
class VKSticker() : VKModel() {
class oldVKSticker() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKVideo.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKVideo.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import com.meloda.fast.api.model.old.VKAttachments
import com.meloda.fast.api.model.old.VKModel
import org.json.JSONObject
class VKVideo() : VKModel() {
class oldVKVideo() : VKModel() {
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/model/old/VKWall.kt → app/src/main/kotlin/com/meloda/fast/api/model/old/oldVKWall.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.meloda.fast.api.model.old
import org.json.JSONObject
class VKWall() : VKModel() { //https://vk.com/dev/objects/post
class oldVKWall() : VKModel() { //https://vk.com/dev/objects/post
companion object {
const val serialVersionUID: Long = 1L
app/src/main/kotlin/com/meloda/fast/api/network/repo/ConversationsRepo.kt
+4 -3
View File
@@ -3,14 +3,15 @@ package com.meloda.fast.api.network.repo
import com.meloda.fast.api.base.ApiResponse
import com.meloda.fast.api.network.Answer
import com.meloda.fast.api.network.VKUrls
import com.meloda.fast.api.network.request.ConversationsGetRequest
import com.meloda.fast.api.network.response.ConversationsGetResponse
import retrofit2.http.Body
import retrofit2.http.FieldMap
import retrofit2.http.FormUrlEncoded
import retrofit2.http.POST
interface ConversationsRepo {
@FormUrlEncoded
@POST(VKUrls.Conversations.get)
suspend fun getAllChats(@Body params: ConversationsGetRequest): Answer<ApiResponse<ConversationsGetResponse>>
suspend fun getAllChats(@FieldMap params: Map<String, String>): Answer<ApiResponse<ConversationsGetResponse>>
}
app/src/main/kotlin/com/meloda/fast/api/network/repo/UsersRepo.kt
+8 -4
View File
@@ -4,12 +4,16 @@ import com.meloda.fast.api.base.ApiResponse
import com.meloda.fast.api.model.base.BaseVkUser
import com.meloda.fast.api.network.Answer
import com.meloda.fast.api.network.VKUrls
import retrofit2.http.GET
import retrofit2.http.QueryMap
import retrofit2.http.FieldMap
import retrofit2.http.FormUrlEncoded
import retrofit2.http.POST
interface UsersRepo {
@GET(VKUrls.Users.getById)
suspend fun getById(@QueryMap params: Map<String, String>): Answer<ApiResponse<List<BaseVkUser>>>
@FormUrlEncoded
@POST(VKUrls.Users.getById)
suspend fun getById(
@FieldMap params: Map<String, String>?
): Answer<ApiResponse<List<BaseVkUser>>>
}
app/src/main/kotlin/com/meloda/fast/api/network/request/ConversationsRequest.kt
+13 -1
View File
@@ -13,4 +13,16 @@ data class ConversationsGetRequest(
val extended: Boolean? = true,
@SerializedName("start_message_id")
val startMessageId: Int? = null
) : Parcelable
) : Parcelable {
val map
get() = mutableMapOf(
"fields" to fields,
"filter" to filter
).apply {
count?.let { this["count"] = it.toString() }
offset?.let { this["offset"] = it.toString() }
extended?.let { this["extended"] = it.toString() }
startMessageId?.let { this["start_message_id"] = it.toString() }
}
}
app/src/main/kotlin/com/meloda/fast/api/network/request/UsersRequest.kt
+7 -7
View File
@@ -5,17 +5,17 @@ import kotlinx.parcelize.Parcelize
@Parcelize
data class UsersGetRequest(
val usersIds: List<Int>,
val usersIds: List<Int>? = null,
val fields: String? = null,
val nomCase: String? = null
) : Parcelable {
val map
get() = mutableMapOf(
"user_ids" to usersIds.joinToString { it.toString() }
).apply {
fields?.let { this["fields"] = it }
nomCase?.let { this["nom_case"] = it }
}
get() = mutableMapOf<String, String>()
.apply {
usersIds?.let { this["user_ids"] = it.joinToString { id -> id.toString() } }
fields?.let { this["fields"] = it }
nomCase?.let { this["nom_case"] = it }
}
}
app/src/main/kotlin/com/meloda/fast/api/network/response/ConversationsResponse.kt
+5 -1
View File
@@ -3,7 +3,9 @@ package com.meloda.fast.api.network.response
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.meloda.fast.api.model.base.BaseVkConversation
import com.meloda.fast.api.model.base.BaseVkGroup
import com.meloda.fast.api.model.base.BaseVkMessage
import com.meloda.fast.api.model.base.BaseVkUser
import kotlinx.parcelize.Parcelize
@Parcelize
@@ -11,7 +13,9 @@ data class ConversationsGetResponse(
val count: Int,
val items: List<ConversationsResponseItems>,
@SerializedName("unread_count")
val unreadCount: Int?
val unreadCount: Int?,
val profiles: List<BaseVkUser>?,
val groups: List<BaseVkGroup>?
) : Parcelable
@Parcelize
app/src/main/kotlin/com/meloda/fast/api/VKUtil.kt → app/src/main/kotlin/com/meloda/fast/api/oldVKUtil.kt
+16 -16
View File
@@ -10,7 +10,7 @@ import java.text.SimpleDateFormat
import java.util.*
// TODO: 8/31/2021 review
object VKUtil {
object oldVKUtil {
private const val TAG = "VKUtil"
@@ -122,7 +122,7 @@ object VKUtil {
fun getTitle(
conversation: oldVKConversation,
peerUser: oldVKUser?,
peerGroup: VKGroup?
peerGroup: oldVKGroup?
): String {
return when {
conversation.isUser() -> peerUser?.let { return it.toString() } ?: ""
@@ -140,7 +140,7 @@ object VKUtil {
fun getMessageTitle(
message: oldVKMessage,
fromUser: oldVKUser?,
fromGroup: VKGroup?
fromGroup: oldVKGroup?
): String {
return when {
message.isFromUser() -> {
@@ -158,7 +158,7 @@ object VKUtil {
fun getAvatar(
conversation: oldVKConversation,
peerUser: oldVKUser?,
peerGroup: VKGroup?
peerGroup: oldVKGroup?
): String {
return when {
conversation.isUser() -> {
@@ -180,7 +180,7 @@ object VKUtil {
fun getUserAvatar(
message: oldVKMessage,
fromUser: oldVKUser?,
fromGroup: VKGroup?
fromGroup: oldVKGroup?
): String {
return when {
message.isFromUser() -> {
@@ -211,7 +211,7 @@ object VKUtil {
return ""
}
fun getGroupPhoto(group: VKGroup): String {
fun getGroupPhoto(group: oldVKGroup): String {
if (group.photo200.isEmpty()) {
if (group.photo100.isEmpty()) {
if (group.photo50.isEmpty()) {
@@ -286,19 +286,19 @@ object VKUtil {
}
if (it.has("source_act")) {
message.action = VKMessageAction().also { action ->
message.action = oldVKMessageAction().also { action ->
action.type =
VKMessageAction.Type.fromString(it.optString("source_act"))
oldVKMessageAction.Type.fromString(it.optString("source_act"))
when (action.type) {
VKMessageAction.Type.CHAT_CREATE -> {
oldVKMessageAction.Type.CHAT_CREATE -> {
action.text = it.optString("source_text")
}
VKMessageAction.Type.TITLE_UPDATE -> {
oldVKMessageAction.Type.TITLE_UPDATE -> {
action.oldText = it.optString("source_old_text")
action.text = it.optString("source_text")
}
VKMessageAction.Type.PIN_MESSAGE -> {
oldVKMessageAction.Type.PIN_MESSAGE -> {
action.memberId = it.optInt("source_mid")
action.conversationMessageId = it.optInt("source_chat_local_id")
@@ -306,14 +306,14 @@ object VKUtil {
action.message = oldVKMessage(message)
}
}
VKMessageAction.Type.UNPIN_MESSAGE -> {
oldVKMessageAction.Type.UNPIN_MESSAGE -> {
action.memberId = it.optInt("source_mid")
action.conversationMessageId = it.optInt("source_chat_local_id")
}
VKMessageAction.Type.INVITE_USER,
VKMessageAction.Type.KICK_USER,
VKMessageAction.Type.SCREENSHOT,
VKMessageAction.Type.INVITE_USER_BY_CALL -> {
oldVKMessageAction.Type.INVITE_USER,
oldVKMessageAction.Type.KICK_USER,
oldVKMessageAction.Type.SCREENSHOT,
oldVKMessageAction.Type.INVITE_USER_BY_CALL -> {
action.memberId = it.optInt("source_mid")
}
}