Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement media messages on Threads #630

Merged
merged 11 commits into from
Aug 17, 2023
Merged

Implement media messages on Threads #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d4eb0c
Add image, video and pdf on Threads header
ariel10aguero Aug 14, 2023
7936c16
Add image, video, pdf on thread list message
ariel10aguero Aug 14, 2023
f724c06
Add thumbnail on basic thread header
ariel10aguero Aug 14, 2023
1232e51
Bind media messages on Threads
ariel10aguero Aug 14, 2023
ed36f2d
Bind media on thread header on MessageListAdapter
ariel10aguero Aug 14, 2023
d83981f
- Change mapping the way of mapping messages on getAllMessagesByUUID
ariel10aguero Aug 15, 2023
2171196
Implement header with image and pdf thumbnail
ariel10aguero Aug 15, 2023
38b8a5a
Implement full screen for images and videos on thread header chat
ariel10aguero Aug 16, 2023
dbf1dec
Add background to pdf file on threads and allow pdf visualization
ariel10aguero Aug 16, 2023
18c30b5
Change thread bubble sent background color
ariel10aguero Aug 16, 2023
4ca4e8a
Fixes and UI adjustments on thread media support
tomastiminskas Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .../application/common/resources/src/main/res/drawable/background_thread_file_attachment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12dp" />
<solid android:color="@color/receivedMsgBG" />
</shape>
1 change: 1 addition & 0 deletions sphinx/application/common/resources/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,5 +189,6 @@
<dimen name="thread_reply_height">36dp</dimen>
<dimen name="thread_reply_double_height">72dp</dimen>
<dimen name="thread_reply_half_height">18dp</dimen>
<dimen name="thread_thumbnail_height">230dp</dimen>

</resources>
4 changes: 4 additions & 0 deletions ...ation/common/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/DateTime.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ inline fun DateTime.chatTimeFormat(
}
}

@Suppress("NOTHING_TO_INLINE", "SpellCheckingInspection")
inline fun DateTime.messageTimeFormat(): String =
DateTime.getFormathmma().format(value)

@Suppress("NOTHING_TO_INLINE", "SpellCheckingInspection")
inline fun DateTime.invoiceExpirationTimeFormat(): String =
DateTime.getFormathmma().format(value)
Expand Down
7 changes: 4 additions & 3 deletions ...tures/feature-repository/src/main/java/chat/sphinx/feature_repository/SphinxRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2347,10 +2347,11 @@ abstract class SphinxRepository(
}

override suspend fun getAllMessagesByUUID(messageUUIDs: List<MessageUUID>): List<Message> {
return coreDB.getSphinxDatabaseQueries()
.messageGetAllByUUID(messageUUIDs)
val queries = coreDB.getSphinxDatabaseQueries()

return queries.messageGetAllByUUID(messageUUIDs)
.executeAsList()
.map { messageDboPresenterMapper.mapFrom(it) }
.map { mapMessageDboAndDecryptContentIfNeeded(queries, it) }
}

override suspend fun fetchPinnedMessageByUUID(
Expand Down
192 changes: 159 additions & 33 deletions ...t-common/chat-common/src/main/java/chat/sphinx/chat_common/adapters/MessageListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,29 @@ import chat.sphinx.chat_common.model.NodeDescriptor
import chat.sphinx.chat_common.model.TribeLink
import chat.sphinx.chat_common.ui.ChatViewModel
import chat.sphinx.chat_common.ui.isMessageSelected
import chat.sphinx.chat_common.ui.viewstate.InitialHolderViewState
import chat.sphinx.chat_common.ui.viewstate.messageholder.*
import chat.sphinx.chat_common.ui.viewstate.selected.SelectedMessageViewState
import chat.sphinx.chat_common.util.*
import chat.sphinx.concept_image_loader.Disposable
import chat.sphinx.concept_image_loader.ImageLoader
import chat.sphinx.concept_image_loader.ImageLoaderOptions
import chat.sphinx.concept_image_loader.Transformation
import chat.sphinx.concept_image_loader.*
import chat.sphinx.concept_user_colors_helper.UserColorsHelper
import chat.sphinx.resources.getRandomHexCode
import chat.sphinx.resources.getString
import chat.sphinx.resources.setBackgroundRandomColor
import chat.sphinx.wrapper_common.PhotoUrl
import chat.sphinx.wrapper_common.asFormattedString
import chat.sphinx.wrapper_common.dashboard.ContactId
import chat.sphinx.wrapper_common.message.MessageId
import chat.sphinx.wrapper_common.util.getInitials
import chat.sphinx.wrapper_contact.ContactAlias
import chat.sphinx.wrapper_message.Message
import chat.sphinx.wrapper_message.MessageType
import chat.sphinx.wrapper_view.Px
import io.matthewnelson.android_feature_screens.util.gone
import io.matthewnelson.android_feature_screens.util.goneIfFalse
import io.matthewnelson.android_feature_screens.util.visible
import io.matthewnelson.android_feature_viewmodel.util.OnStopSupervisor
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
Expand Down Expand Up @@ -684,59 +685,184 @@ internal class MessageListAdapter<ARGS : NavArgs>(
inner class ThreadHeaderViewHolder(
private val binding: LayoutThreadMessageHeaderBinding
) : RecyclerView.ViewHolder(binding.root), DefaultLifecycleObserver {
private var threadHeaderViewState: MessageHolderViewState.ThreadHeader? = null

init {
binding.constraintShowMoreContainer.setOnClickListener {
viewModel.toggleThreadDescriptionExpanded()
binding.apply {

constraintShowMoreContainer.setOnClickListener {
viewModel.toggleThreadDescriptionExpanded()
}

includeMessageTypeImageAttachment.imageViewAttachmentImage.setOnClickListener {
threadHeaderViewState?.message?.let { message ->
viewModel.showAttachmentImageFullscreen(message)
}
}

includeMessageTypeVideoAttachment.apply {
textViewAttachmentPlayButton.setOnClickListener {
threadHeaderViewState?.message?.let { message ->
viewModel.goToFullscreenVideo(message.id)
}
}
}
includeMessageTypeFileAttachment.apply {
buttonAttachmentFileDownload.setOnClickListener {
threadHeaderViewState?.message?.let { message ->
viewModel.saveFile(message, null)
}
}
layoutConstraintAttachmentFileMainInfoGroup.setOnClickListener {
threadHeaderViewState?.message?.let { message ->
viewModel.showAttachmentPdfFullscreen(message, 0)
}
}
}

includeMessageTypeFileAttachment.root.setBackgroundResource(R.drawable.background_thread_file_attachment)
}
}

fun bind(position: Int) {
val threadHeader = messages.getOrNull(position) as MessageHolderViewState.ThreadHeader
threadHeaderViewState = threadHeader

binding.apply {
root.visible

textViewContactMessageHeaderName.text = threadHeader.aliasAndColorKey.first?.value
textViewThreadDate.text = threadHeader.date
textViewThreadMessageContent.text = threadHeader.messageText

if (threadHeader.messageText.length < 165) {
textViewShowMore.gone
val senderInfo: Triple<PhotoUrl?, ContactAlias?, String>? = if (threadHeader.message != null) {
threadHeader.messageSenderInfo(threadHeader.message!!)
} else {
null
}

if (threadHeader.isExpanded) {
textViewThreadMessageContent.maxLines = Int.MAX_VALUE
textViewShowMore.text =
getString(R.string.episode_description_show_less)
textViewContactMessageHeaderName.text = senderInfo?.second?.value ?: ""
textViewThreadDate.text = threadHeader.timestamp
textViewThreadMessageContent.text = threadHeader.bubbleMessage?.text ?: ""
textViewThreadMessageContent.goneIfFalse(threadHeader.bubbleMessage?.text?.isNotEmpty() == true)

textViewThreadDate.post(Runnable {
val linesCount: Int = textViewThreadDate.lineCount

if (linesCount <= 12) {
textViewShowMore.gone
} else {
textViewThreadMessageContent.maxLines = 4
textViewShowMore.text =
getString(R.string.episode_description_show_more)
if (threadHeader.isExpanded) {
textViewThreadMessageContent.maxLines = Int.MAX_VALUE
textViewShowMore.text =
getString(R.string.episode_description_show_less)
} else {
textViewThreadMessageContent.maxLines = 12
textViewShowMore.text =
getString(R.string.episode_description_show_more)
}
}
}
})

onStopSupervisor.scope.launch(viewModel.mainImmediate) {

binding.layoutContactInitialHolder.apply {
textViewInitialsName.visible
imageViewChatPicture.gone

textViewInitialsName.apply {
text = threadHeader.aliasAndColorKey.first?.value?.getInitials()
setBackgroundRandomColor(
R.drawable.chat_initials_circle,
Color.parseColor(
threadHeader.aliasAndColorKey.second?.let {
senderInfo?.third?.let {
textViewInitialsName.visible
imageViewChatPicture.gone

textViewInitialsName.apply {
text = (senderInfo?.second?.value ?: "")?.getInitials()

setBackgroundRandomColor(
R.drawable.chat_initials_circle,
Color.parseColor(
userColorsHelper.getHexCodeForKey(
it,
root.context.getRandomHexCode(),
)
),
)
}
}

binding.constraintMediaThreadContainer.gone
binding.includeMessageTypeFileAttachment.root.gone
binding.includeMessageTypeVideoAttachment.root.gone
binding.includeMessageTypeImageAttachment.root.gone

binding.includeMessageTypeImageAttachment.apply {
threadHeader.bubbleImageAttachment?.let {
binding.constraintMediaThreadContainer.visible
root.visible
layoutConstraintPaidImageOverlay.gone
loadingImageProgressContainer.visible
imageViewAttachmentImage.visible

onStopSupervisor.scope.launch(viewModel.mainImmediate) {
imageViewAttachmentImage.scaleType = ImageView.ScaleType.CENTER_CROP

it.media?.localFile?.let {
imageLoader.load(
imageViewAttachmentImage,
it,
ImageLoaderOptions.Builder().build()
)
} ?: it?.url?.let {
imageLoader.load(
imageViewAttachmentImage,
it,
ImageLoaderOptions.Builder().build()
)
}
),
)
}
}
}

binding.includeMessageTypeVideoAttachment.apply {
(threadHeader.bubbleVideoAttachment as? LayoutState.Bubble.ContainerSecond.VideoAttachment.FileAvailable)?.let {
VideoThumbnailUtil.loadThumbnail(it.file)?.let { thumbnail ->
binding.constraintMediaThreadContainer.visible
root.visible

imageViewAttachmentThumbnail.setImageBitmap(thumbnail)
imageViewAttachmentThumbnail.visible
layoutConstraintVideoPlayButton.visible
}
}
}

binding.includeMessageTypeFileAttachment.apply {
(threadHeader.bubbleFileAttachment as? LayoutState.Bubble.ContainerSecond.FileAttachment.FileAvailable)?.let { fileAttachment ->
binding.constraintMediaThreadContainer.visible
root.visible
progressBarAttachmentFileDownload.gone
buttonAttachmentFileDownload.visible

textViewAttachmentFileIcon.text =
if (fileAttachment.isPdf) {
getString(chat.sphinx.chat_common.R.string.material_icon_name_file_pdf)
} else {
getString(chat.sphinx.chat_common.R.string.material_icon_name_file_attachment)
}

textViewAttachmentFileName.text =
fileAttachment.fileName?.value ?: "File.txt"

textViewAttachmentFileSize.text =
if (fileAttachment.isPdf) {
if (fileAttachment.pageCount > 1) {
"${fileAttachment.pageCount} ${getString(
chat.sphinx.chat_common.R.string.pdf_pages
)}"
} else {
"${fileAttachment.pageCount} ${getString(
chat.sphinx.chat_common.R.string.pdf_page
)}"
}
} else {
fileAttachment.fileSize.asFormattedString()
}
}
}

threadHeader.photoUrl?.let { photoUrl ->
senderInfo?.first?.let { photoUrl ->
textViewInitialsName.gone
imageViewChatPicture.visible

Expand Down
Loading
Loading