Use blurhash for preview cards (#1960)
This commit is contained in:
parent
029513205b
commit
94dba04216
|
@ -29,6 +29,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.bumptech.glide.Glide;
|
import com.bumptech.glide.Glide;
|
||||||
|
import com.bumptech.glide.RequestBuilder;
|
||||||
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
|
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
|
||||||
import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners;
|
import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners;
|
||||||
import com.google.android.material.button.MaterialButton;
|
import com.google.android.material.button.MaterialButton;
|
||||||
|
@ -806,7 +807,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cardView != null) {
|
if (cardView != null) {
|
||||||
setupCard(status, statusDisplayOptions.cardViewMode());
|
setupCard(status, statusDisplayOptions.cardViewMode(), statusDisplayOptions);
|
||||||
}
|
}
|
||||||
|
|
||||||
setupButtons(listener, status.getSenderId(), status.getContent().toString(),
|
setupButtons(listener, status.getSenderId(), status.getContent().toString(),
|
||||||
|
@ -1052,7 +1053,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
|
||||||
return pollDescription.getContext().getString(R.string.poll_info_format, votesText, pollDurationInfo);
|
return pollDescription.getContext().getString(R.string.poll_info_format, votesText, pollDurationInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setupCard(StatusViewData.Concrete status, CardViewMode cardViewMode) {
|
protected void setupCard(StatusViewData.Concrete status, CardViewMode cardViewMode, StatusDisplayOptions statusDisplayOptions) {
|
||||||
if (cardViewMode != CardViewMode.NONE &&
|
if (cardViewMode != CardViewMode.NONE &&
|
||||||
status.getAttachments().size() == 0 &&
|
status.getAttachments().size() == 0 &&
|
||||||
status.getCard() != null &&
|
status.getCard() != null &&
|
||||||
|
@ -1074,7 +1075,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
|
||||||
cardUrl.setText(card.getUrl());
|
cardUrl.setText(card.getUrl());
|
||||||
|
|
||||||
if (!TextUtils.isEmpty(card.getImage())) {
|
// Statuses from other activitypub sources can be marked sensitive even if there's no media,
|
||||||
|
// so let's blur the preview in that case
|
||||||
|
// If media previews are disabled, show placeholder for cards as well
|
||||||
|
if (statusDisplayOptions.mediaPreviewEnabled() && !status.isSensitive() && !TextUtils.isEmpty(card.getImage())) {
|
||||||
|
|
||||||
int topLeftRadius = 0;
|
int topLeftRadius = 0;
|
||||||
int topRightRadius = 0;
|
int topRightRadius = 0;
|
||||||
|
@ -1105,12 +1109,29 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
|
||||||
bottomLeftRadius = radius;
|
bottomLeftRadius = radius;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RequestBuilder<Drawable> builder = Glide.with(cardImage).load(card.getImage());
|
||||||
|
if (statusDisplayOptions.useBlurhash() && !TextUtils.isEmpty(card.getBlurhash())) {
|
||||||
|
builder = builder.placeholder(decodeBlurHash(card.getBlurhash()));
|
||||||
|
}
|
||||||
|
builder.transform(
|
||||||
|
new CenterCrop(),
|
||||||
|
new GranularRoundedCorners(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius)
|
||||||
|
)
|
||||||
|
.into(cardImage);
|
||||||
|
} else if (statusDisplayOptions.useBlurhash() && !TextUtils.isEmpty(card.getBlurhash())) {
|
||||||
|
int radius = cardImage.getContext().getResources()
|
||||||
|
.getDimensionPixelSize(R.dimen.card_radius);
|
||||||
|
|
||||||
Glide.with(cardImage)
|
cardView.setOrientation(LinearLayout.HORIZONTAL);
|
||||||
.load(card.getImage())
|
cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||||
|
cardImage.getLayoutParams().width = cardImage.getContext().getResources()
|
||||||
|
.getDimensionPixelSize(R.dimen.card_image_horizontal_width);
|
||||||
|
cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
|
||||||
|
cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
|
||||||
|
Glide.with(cardImage).load(decodeBlurHash(card.getBlurhash()))
|
||||||
.transform(
|
.transform(
|
||||||
new CenterCrop(),
|
new CenterCrop(),
|
||||||
new GranularRoundedCorners(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius)
|
new GranularRoundedCorners(radius, 0, 0, radius)
|
||||||
)
|
)
|
||||||
.into(cardImage);
|
.into(cardImage);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -112,7 +112,7 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
|
||||||
StatusDisplayOptions statusDisplayOptions,
|
StatusDisplayOptions statusDisplayOptions,
|
||||||
@Nullable Object payloads) {
|
@Nullable Object payloads) {
|
||||||
super.setupWithStatus(status, listener, statusDisplayOptions, payloads);
|
super.setupWithStatus(status, listener, statusDisplayOptions, payloads);
|
||||||
setupCard(status, CardViewMode.FULL_WIDTH); // Always show card for detailed status
|
setupCard(status, CardViewMode.FULL_WIDTH, statusDisplayOptions); // Always show card for detailed status
|
||||||
if (payloads == null) {
|
if (payloads == null) {
|
||||||
setReblogAndFavCount(status.getReblogsCount(), status.getFavouritesCount(), listener);
|
setReblogAndFavCount(status.getReblogsCount(), status.getFavouritesCount(), listener);
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,8 @@ data class Card(
|
||||||
val image: String,
|
val image: String,
|
||||||
val type: String,
|
val type: String,
|
||||||
val width: Int,
|
val width: Int,
|
||||||
val height: Int
|
val height: Int,
|
||||||
|
val blurhash: String?
|
||||||
) {
|
) {
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
override fun hashCode(): Int {
|
||||||
|
|
Loading…
Reference in New Issue