From 2549c1f97d7e2bc2e7d7ec8c1750f73eab0b66e5 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 25 Mar 2022 09:14:12 -0300 Subject: [PATCH] Add placeholder for text post thumbs. --- .../securesms/components/ThumbnailView.java | 1 + .../securesms/stories/StoryTextPostModel.kt | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 6f502b19f..d1bb3580b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -399,6 +399,7 @@ public class ThumbnailView extends FrameLayout { GlideRequest request = glideRequests.load(model) .diskCacheStrategy(DiskCacheStrategy.NONE) + .placeholder(model.getPlaceholder()) .transition(withCrossFade()); if (width > 0 && height > 0) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt index 0ceb9b1f7..28a094951 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/StoryTextPostModel.kt @@ -1,6 +1,9 @@ package org.thoughtcrime.securesms.stories import android.graphics.Bitmap +import android.graphics.Color +import android.graphics.drawable.ColorDrawable +import android.graphics.drawable.Drawable import android.view.View import androidx.core.graphics.scale import androidx.core.view.drawToBitmap @@ -9,6 +12,7 @@ import com.bumptech.glide.load.Options import com.bumptech.glide.load.ResourceDecoder import com.bumptech.glide.load.engine.Resource import com.bumptech.glide.load.resource.SimpleResource +import org.thoughtcrime.securesms.conversation.colors.ChatColors import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MmsMessageRecord @@ -36,6 +40,14 @@ data class StoryTextPostModel( val text: String = storyTextPost.body + fun getPlaceholder(): Drawable { + return if (storyTextPost.hasBackground()) { + ChatColors.forChatColor(ChatColors.Id.NotSet, storyTextPost.background).chatBubbleMask + } else { + ColorDrawable(Color.TRANSPARENT) + } + } + companion object { fun parseFrom(messageRecord: MessageRecord): StoryTextPostModel {