mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add rounded corners back to secondary story.

fork-5.53.8
Alex Hart 2022-04-06 10:46:12 -03:00 zatwierdzone przez Cody Henthorne
rodzic 283e3e99a5
commit aa60247e42
2 zmienionych plików z 16 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
Wyświetl plik

@ -13,7 +13,6 @@ import com.bumptech.glide.request.target.Target
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.avatar.view.AvatarView
import org.thoughtcrime.securesms.badges.BadgeImageView
import org.thoughtcrime.securesms.components.ThumbnailView
import org.thoughtcrime.securesms.components.settings.PreferenceModel
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader
@ -94,7 +93,7 @@ object StoriesLandingItem {
isClickable = false
}
private val storyOutline: ImageView = itemView.findViewById(R.id.story_outline)
private val storyMulti: ThumbnailView = itemView.findViewById<ThumbnailView>(R.id.story_multi).apply {
private val storyMulti: ImageView = itemView.findViewById<ImageView>(R.id.story_multi).apply {
isClickable = false
}
private val sender: TextView = itemView.findViewById(R.id.sender)
@ -153,23 +152,32 @@ object StoriesLandingItem {
if (model.data.secondaryStory != null) {
val secondaryRecord = model.data.secondaryStory.messageRecord as MediaMmsMessageRecord
val secondaryThumb = secondaryRecord.slideDeck.thumbnailSlide?.uri
storyOutline.setBackgroundColor(ContextCompat.getColor(context, R.color.signal_background_primary))
@Suppress("CascadeIf")
if (secondaryRecord.storyType.isTextStory) {
storyMulti.setImageResource(GlideApp.with(storyPreview), StoryTextPostModel.parseFrom(secondaryRecord), 0, 0)
val storyTextPostModel = StoryTextPostModel.parseFrom(secondaryRecord)
GlideApp.with(storyMulti)
.load(storyTextPostModel)
.placeholder(storyTextPostModel.getPlaceholder())
.centerCrop()
.into(storyMulti)
storyMulti.visible = true
} else if (secondaryRecord.slideDeck.thumbnailSlide != null) {
storyMulti.setImageResource(GlideApp.with(storyPreview), secondaryRecord.slideDeck.thumbnailSlide!!, false, true)
} else if (secondaryThumb != null) {
GlideApp.with(storyMulti)
.load(DecryptableStreamUriLoader.DecryptableUri(secondaryThumb))
.centerCrop()
.into(storyMulti)
storyMulti.visible = true
} else {
storyOutline.setBackgroundColor(Color.TRANSPARENT)
storyMulti.clear(GlideApp.with(storyPreview))
GlideApp.with(storyMulti).clear(storyMulti)
storyMulti.visible = false
}
} else {
storyOutline.setBackgroundColor(Color.TRANSPARENT)
storyMulti.clear(GlideApp.with(storyPreview))
GlideApp.with(storyMulti).clear(storyMulti)
storyMulti.visible = false
}

2
app/src/main/res/layout/stories_landing_item.xml
Wyświetl plik

@ -81,7 +81,7 @@
app:srcCompat="@drawable/ic_messages_solid_20"
app:tint="@color/signal_text_primary_disabled" />
<org.thoughtcrime.securesms.components.ThumbnailView
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/story_multi"
android:layout_width="@dimen/stories_landing_item_thumb_secondary_width"
android:layout_height="@dimen/stories_landing_item_thumb_secondary_height"