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

new attachments: gift, graffiti

Browse Source 
fix NullPointerException on VkPhoto.kt text param
This commit is contained in:
Danil Nikolaev
2021-10-11 00:33:38 +03:00
parent 63de514975
commit 1bba8ee4e6
10 changed files with 108 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/meloda/fast/api/VkUtils.kt
+2 -6
View File
@@ -150,9 +150,7 @@ object VkUtils {
}
BaseVkAttachmentItem.AttachmentType.GIFT -> {
val gift = baseAttachment.gift ?: continue
attachments += VkGift(
link = gift.thumb_48
)
attachments += gift.asVkGift()
}
BaseVkAttachmentItem.AttachmentType.WALL -> {
val wall = baseAttachment.wall ?: continue
@@ -160,9 +158,7 @@ object VkUtils {
}
BaseVkAttachmentItem.AttachmentType.GRAFFITI -> {
val graffiti = baseAttachment.graffiti ?: continue
attachments += VkGraffiti(
link = graffiti.url
)
attachments += graffiti.asVkGraffiti()
}
BaseVkAttachmentItem.AttachmentType.POLL -> {
val poll = baseAttachment.poll ?: continue
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGift.kt
+4 -1
View File
@@ -5,7 +5,10 @@ import kotlinx.parcelize.Parcelize
@Parcelize
data class VkGift(
val link: String
val id: Int,
val thumb256: String?,
val thumb96: String?,
val thumb48: String
) : VkAttachment() {
@IgnoredOnParcel
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkGraffiti.kt
+6 -1
View File
@@ -5,7 +5,12 @@ import kotlinx.parcelize.Parcelize
@Parcelize
data class VkGraffiti(
val link: String
val id: Int,
val ownerId: Int,
val url: String,
val width: Int,
val height: Int,
val accessKey: String
) : VkAttachment() {
@IgnoredOnParcel
app/src/main/kotlin/com/meloda/fast/api/model/attachments/VkPhoto.kt
+1 -1
View File
@@ -15,7 +15,7 @@ data class VkPhoto(
val hasTags: Boolean,
val accessKey: String?,
val sizes: List<BaseVkPhoto.Size>,
val text: String,
val text: String?,
val userId: Int?
) : VkAttachment() {
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkGift.kt
+11 -1
View File
@@ -1,6 +1,7 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.meloda.fast.api.model.attachments.VkGift
import kotlinx.parcelize.Parcelize
@Parcelize
@@ -9,4 +10,13 @@ data class BaseVkGift(
val thumb_256: String?,
val thumb_96: String?,
val thumb_48: String
) : Parcelable
) : Parcelable {
fun asVkGift() = VkGift(
id = id,
thumb256 = thumb_256,
thumb96 = thumb_96,
thumb48 = thumb_48
)
}
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkGraffiti.kt
+13 -1
View File
@@ -1,6 +1,7 @@
package com.meloda.fast.api.model.base.attachments
import android.os.Parcelable
import com.meloda.fast.api.model.attachments.VkGraffiti
import kotlinx.parcelize.Parcelize
@Parcelize
@@ -11,4 +12,15 @@ data class BaseVkGraffiti(
val width: Int,
val height: Int,
val access_key: String
) : Parcelable
) : Parcelable {
fun asVkGraffiti() = VkGraffiti(
id = id,
ownerId = owner_id,
url = url,
width = width,
height = height,
accessKey = access_key
)
}
app/src/main/kotlin/com/meloda/fast/api/model/base/attachments/BaseVkPhoto.kt
+1 -1
View File
@@ -13,7 +13,7 @@ data class BaseVkPhoto(
val has_tags: Boolean,
val access_key: String?,
val sizes: List<Size>,
val text: String,
val text: String?,
val user_id: Int?,
val lat: Double?,
val long: Double?,
app/src/main/kotlin/com/meloda/fast/screens/messages/AttachmentInflater.kt
+38 -2
View File
@@ -66,6 +66,10 @@ class AttachmentInflater constructor(
when (val attachment = attachments[0]) {
is VkSticker -> return sticker(attachment)
is VkWall -> return wall(attachment)
is VkVoiceMessage -> return voice(attachment)
is VkCall -> return call(attachment)
is VkGraffiti -> return graffiti(attachment)
is VkGift -> return gift(attachment)
}
}
@@ -94,8 +98,6 @@ class AttachmentInflater constructor(
is VkAudio -> audio(attachment)
is VkFile -> file(attachment)
is VkLink -> link(attachment)
is VkVoiceMessage -> voice(attachment)
is VkCall -> call(attachment)
else -> Log.e(
"Attachment inflater",
@@ -370,4 +372,38 @@ class AttachmentInflater constructor(
binding.state.text = callState
}
private fun graffiti(graffiti: VkGraffiti) {
val binding = ItemMessageAttachmentGraffitiBinding.inflate(inflater, container, true)
val url = graffiti.url
val heightCoefficient = graffiti.height / AndroidUtils.px(140)
with(binding.image) {
layoutParams = LinearLayoutCompat.LayoutParams(
AndroidUtils.px(140).roundToInt(),
(graffiti.height / heightCoefficient).roundToInt()
)
load(url) { crossfade(150) }
}
}
private fun gift(gift: VkGift) {
val binding = ItemMessageAttachmentGiftBinding.inflate(inflater, container, true)
val url = gift.thumb256 ?: gift.thumb96 ?: gift.thumb48
with(binding.image) {
shapeAppearanceModel = shapeAppearanceModel.withCornerSize { AndroidUtils.px(12) }
layoutParams = LinearLayoutCompat.LayoutParams(
AndroidUtils.px(140).roundToInt(),
AndroidUtils.px(140).roundToInt()
)
load(url) { crossfade(150) }
}
}
}
app/src/main/res/layout/item_message_attachment_gift.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</androidx.appcompat.widget.LinearLayoutCompat>
</layout>
app/src/main/res/layout/item_message_attachment_graffiti.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/image"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</androidx.appcompat.widget.LinearLayoutCompat>
</layout>