forked from melod1n/fast-messenger
(fix) ability to use system font
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
package dev.meloda.fast.model.api.data
|
||||
|
||||
import dev.meloda.fast.model.api.domain.OnlineStatus
|
||||
import dev.meloda.fast.model.api.domain.VkUser
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
import dev.meloda.fast.model.api.domain.OnlineStatus
|
||||
import dev.meloda.fast.model.api.domain.VkUser
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class VkUserData(
|
||||
@@ -17,6 +17,7 @@ data class VkUserData(
|
||||
@Json(name = "photo_50") val photo50: String?,
|
||||
@Json(name = "photo_100") val photo100: String?,
|
||||
@Json(name = "photo_200") val photo200: String?,
|
||||
@Json(name = "photo_400_orig") val photo400Orig: String?,
|
||||
@Json(name = "online") val online: Int?,
|
||||
@Json(name = "online_info") val onlineInfo: OnlineInfo?,
|
||||
@Json(name = "screen_name") val screenName: String,
|
||||
@@ -52,6 +53,7 @@ data class VkUserData(
|
||||
photo50 = photo50,
|
||||
photo100 = photo100,
|
||||
photo200 = photo200,
|
||||
photo400Orig = photo400Orig,
|
||||
lastSeen = onlineInfo?.lastSeen,
|
||||
lastSeenStatus = onlineInfo?.status,
|
||||
birthday = birthday
|
||||
|
||||
@@ -10,6 +10,7 @@ data class VkUser(
|
||||
val photo50: String?,
|
||||
val photo100: String?,
|
||||
val photo200: String?,
|
||||
val photo400Orig: String?,
|
||||
val lastSeen: Int?,
|
||||
val lastSeenStatus: String?,
|
||||
val birthday: String?,
|
||||
@@ -40,5 +41,6 @@ fun VkUser.asEntity(): VkUserEntity = VkUserEntity(
|
||||
birthday = birthday,
|
||||
photo50 = photo50,
|
||||
photo100 = photo100,
|
||||
photo200 = photo200
|
||||
photo200 = photo200,
|
||||
photo400Orig = photo400Orig
|
||||
)
|
||||
|
||||
@@ -18,7 +18,8 @@ data class VkUserEntity(
|
||||
val birthday: String?,
|
||||
val photo50: String?,
|
||||
val photo100: String?,
|
||||
val photo200: String?
|
||||
val photo200: String?,
|
||||
val photo400Orig: String?
|
||||
)
|
||||
|
||||
fun VkUserEntity.asExternalModel(): VkUser = VkUser(
|
||||
@@ -33,6 +34,7 @@ fun VkUserEntity.asExternalModel(): VkUser = VkUser(
|
||||
photo50 = photo50,
|
||||
photo100 = photo100,
|
||||
photo200 = photo200,
|
||||
photo400Orig = photo400Orig,
|
||||
lastSeen = lastSeen,
|
||||
lastSeenStatus = lastSeenStatus,
|
||||
birthday = birthday
|
||||
|
||||
Reference in New Issue
Block a user