From 3c78d8619abb40e55a9cb70854d48ca619fa9fc9 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 26 Jul 2022 13:24:15 -0300 Subject: [PATCH] Add sending state to story viewer. --- .../stories/viewer/page/StoryViewerPageFragment.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index edf1b20542..82dc539723 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -700,6 +700,12 @@ class StoryViewerPageFragment : private fun presentSlate(post: StoryPost) { storySlate.setBackground((post.conversationMessage.messageRecord as? MediaMmsMessageRecord)?.slideDeck?.thumbnailSlide?.placeholderBlur) + if (post.conversationMessage.messageRecord.isOutgoing) { + storySlate.moveToState(StorySlateView.State.HIDDEN, post.id) + viewModel.setIsDisplayingSlate(false) + return + } + when (post.content.transferState) { AttachmentDatabase.TRANSFER_PROGRESS_DONE -> { storySlate.moveToState(StorySlateView.State.HIDDEN, post.id) @@ -837,7 +843,11 @@ class StoryViewerPageFragment : } private fun presentDate(date: TextView, storyPost: StoryPost) { - date.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), storyPost.dateInMilliseconds) + val messageRecord = storyPost.conversationMessage.messageRecord + date.text = when { + messageRecord.isOutgoing && !messageRecord.isSent -> getString(R.string.StoriesLandingItem__sending) + else -> DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), storyPost.dateInMilliseconds) + } } private fun presentSenderAvatar(senderAvatar: AvatarImageView, post: StoryPost) {