Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve detailed status looks (#4260) 

#4205 did change how the counters for the detailed posts behave and for
a good reason I believe.

However I find the changed order very confusing and not aesthetically
pleasing.

I have tried a few options, including reserving space for it but it was
confusing (when counters are not displayed there would be a danging
separator or if we show separator together with it it would be confusing
as well).

I propose we simply show the counters independent on the counts. I know
we try to de-emphasize the counters but I believe this is fine to do in
detailed view.

One disadvantage is that we need translators to update the translations.

Additionally I've done two spacing changes: I removed a separator
between the counters and the buttons, removed padding around the
counters and increased the space between the counters and the buttons
instead. I believe it's better to use space than separators. This also
makes the space above/below the media/counters separator balanced.

In the second commit I've also made the metadata/counters separators
thinner, I think it looks better.

here's the combined version:


![proposal_final](https://github.com/tuskyapp/Tusky/assets/3099142/ea9d4c0c-fe6a-4f2e-8427-673b2a833e6b)
This commit is contained in:
Willow 2024-02-23 10:25:05 +01:00 committed by GitHub
parent 48afcacd98
commit 22ec78c75a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 167 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -151,10 +151,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
sensitiveMediaWarning = itemView.findViewById(R.id.status_sensitive_media_warning); sensitiveMediaWarning = itemView.findViewById(R.id.status_sensitive_media_warning);
sensitiveMediaShow = itemView.findViewById(R.id.status_sensitive_media_button); sensitiveMediaShow = itemView.findViewById(R.id.status_sensitive_media_button);
mediaLabels = new TextView[]{ mediaLabels = new TextView[]{
itemView.findViewById(R.id.status_media_label_0), itemView.findViewById(R.id.status_media_label_0),
itemView.findViewById(R.id.status_media_label_1), itemView.findViewById(R.id.status_media_label_1),
itemView.findViewById(R.id.status_media_label_2), itemView.findViewById(R.id.status_media_label_2),
itemView.findViewById(R.id.status_media_label_3) itemView.findViewById(R.id.status_media_label_3)
}; };
mediaDescriptions = new CharSequence[mediaLabels.length]; mediaDescriptions = new CharSequence[mediaLabels.length];
contentWarningDescription = itemView.findViewById(R.id.status_content_warning_description); contentWarningDescription = itemView.findViewById(R.id.status_content_warning_description);
@ -193,7 +193,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
protected void setDisplayName(@NonNull String name, @Nullable List<Emoji> customEmojis, @NonNull StatusDisplayOptions statusDisplayOptions) { protected void setDisplayName(@NonNull String name, @Nullable List<Emoji> customEmojis, @NonNull StatusDisplayOptions statusDisplayOptions) {
CharSequence emojifiedName = CustomEmojiHelper.emojify( CharSequence emojifiedName = CustomEmojiHelper.emojify(
name, customEmojis, displayName, statusDisplayOptions.animateEmojis() name, customEmojis, displayName, statusDisplayOptions.animateEmojis()
); );
displayName.setText(emojifiedName); displayName.setText(emojifiedName);
} }
@ -221,7 +221,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
if (sensitive) { if (sensitive) {
CharSequence emojiSpoiler = CustomEmojiHelper.emojify( CharSequence emojiSpoiler = CustomEmojiHelper.emojify(
spoilerText, emojis, contentWarningDescription, statusDisplayOptions.animateEmojis() spoilerText, emojis, contentWarningDescription, statusDisplayOptions.animateEmojis()
); );
contentWarningDescription.setText(emojiSpoiler); contentWarningDescription.setText(emojiSpoiler);
contentWarningDescription.setVisibility(View.VISIBLE); contentWarningDescription.setVisibility(View.VISIBLE);
@ -271,7 +271,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
Status actionable = status.getActionable(); Status actionable = status.getActionable();
Spanned content = status.getContent(); Spanned content = status.getContent();
List<Status.Mention> mentions = actionable.getMentions(); List<Status.Mention> mentions = actionable.getMentions();
List<HashTag> tags =actionable.getTags(); List<HashTag> tags = actionable.getTags();
List<Emoji> emojis = actionable.getEmojis(); List<Emoji> emojis = actionable.getEmojis();
PollViewData poll = PollViewDataKt.toViewData(actionable.getPoll()); PollViewData poll = PollViewDataKt.toViewData(actionable.getPoll());
@ -304,7 +304,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
private void setAvatar(String url, private void setAvatar(String url,
@Nullable String rebloggedUrl, @Nullable String rebloggedUrl,
boolean isBot, boolean isBot,
StatusDisplayOptions statusDisplayOptions) { StatusDisplayOptions statusDisplayOptions) {
@ -315,8 +315,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
if (statusDisplayOptions.showBotOverlay() && isBot) { if (statusDisplayOptions.showBotOverlay() && isBot) {
avatarInset.setVisibility(View.VISIBLE); avatarInset.setVisibility(View.VISIBLE);
Glide.with(avatarInset) Glide.with(avatarInset)
.load(R.drawable.bot_badge) .load(R.drawable.bot_badge)
.into(avatarInset); .into(avatarInset);
} else { } else {
avatarInset.setVisibility(View.GONE); avatarInset.setVisibility(View.GONE);
} }
@ -330,7 +330,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
avatarInset.setVisibility(View.VISIBLE); avatarInset.setVisibility(View.VISIBLE);
avatarInset.setBackground(null); avatarInset.setBackground(null);
ImageLoadingHelper.loadAvatar(rebloggedUrl, avatarInset, avatarRadius24dp, ImageLoadingHelper.loadAvatar(rebloggedUrl, avatarInset, avatarRadius24dp,
statusDisplayOptions.animateAvatars(), null); statusDisplayOptions.animateAvatars(), null);
avatarRadius = avatarRadius36dp; avatarRadius = avatarRadius36dp;
} }
@ -383,8 +383,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
long then = createdAt.getTime(); long then = createdAt.getTime();
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
return DateUtils.getRelativeTimeSpanString(then, now, return DateUtils.getRelativeTimeSpanString(then, now,
DateUtils.SECOND_IN_MILLIS, DateUtils.SECOND_IN_MILLIS,
DateUtils.FORMAT_ABBREV_RELATIVE); DateUtils.FORMAT_ABBREV_RELATIVE);
} }
} }
} }
@ -467,9 +467,9 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
imageView.removeFocalPoint(); imageView.removeFocalPoint();
Glide.with(imageView) Glide.with(imageView)
.load(placeholder) .load(placeholder)
.centerInside() .centerInside()
.into(imageView); .into(imageView);
} else { } else {
Focus focus = meta != null ? meta.getFocus() : null; Focus focus = meta != null ? meta.getFocus() : null;
@ -477,29 +477,29 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
imageView.setFocalPoint(focus); imageView.setFocalPoint(focus);
Glide.with(imageView.getContext()) Glide.with(imageView.getContext())
.load(previewUrl) .load(previewUrl)
.placeholder(placeholder) .placeholder(placeholder)
.centerInside() .centerInside()
.addListener(imageView) .addListener(imageView)
.into(imageView); .into(imageView);
} else { } else {
imageView.removeFocalPoint(); imageView.removeFocalPoint();
Glide.with(imageView) Glide.with(imageView)
.load(previewUrl) .load(previewUrl)
.placeholder(placeholder) .placeholder(placeholder)
.centerInside() .centerInside()
.into(imageView); .into(imageView);
} }
} }
} }
protected void setMediaPreviews( protected void setMediaPreviews(
final @NonNull List<Attachment> attachments, final @NonNull List<Attachment> attachments,
boolean sensitive, boolean sensitive,
final @NonNull StatusActionListener listener, final @NonNull StatusActionListener listener,
boolean showingContent, boolean showingContent,
boolean useBlurhash boolean useBlurhash
) { ) {
mediaPreview.setVisibility(View.VISIBLE); mediaPreview.setVisibility(View.VISIBLE);
@ -518,10 +518,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
loadImage( loadImage(
imageView, imageView,
showingContent ? previewUrl : null, showingContent ? previewUrl : null,
attachment.getMeta(), attachment.getMeta(),
useBlurhash ? attachment.getBlurhash() : null useBlurhash ? attachment.getBlurhash() : null
); );
final Attachment.Type type = attachment.getType(); final Attachment.Type type = attachment.getType();
@ -583,8 +583,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
private void updateMediaLabel(int index, boolean sensitive, boolean showingContent) { private void updateMediaLabel(int index, boolean sensitive, boolean showingContent) {
Context context = itemView.getContext(); Context context = itemView.getContext();
CharSequence label = (sensitive && !showingContent) ? CharSequence label = (sensitive && !showingContent) ?
context.getString(R.string.post_sensitive_media_title) : context.getString(R.string.post_sensitive_media_title) :
mediaDescriptions[index]; mediaDescriptions[index];
mediaLabels[index].setText(label); mediaLabels[index].setText(label);
} }
@ -727,7 +727,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
popup.setOnMenuItemClickListener(item -> { popup.setOnMenuItemClickListener(item -> {
listener.onReblog(!buttonState, position); listener.onReblog(!buttonState, position);
if(!buttonState) { if (!buttonState) {
reblogButton.playAnimation(); reblogButton.playAnimation();
reblogButton.setChecked(true); reblogButton.setChecked(true);
} }
@ -749,7 +749,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
popup.setOnMenuItemClickListener(item -> { popup.setOnMenuItemClickListener(item -> {
listener.onFavourite(!buttonState, position); listener.onFavourite(!buttonState, position);
if(!buttonState) { if (!buttonState) {
favouriteButton.playAnimation(); favouriteButton.playAnimation();
favouriteButton.setChecked(true); favouriteButton.setChecked(true);
} }
@ -775,7 +775,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
setIsReply(actionable.getInReplyToId() != null); setIsReply(actionable.getInReplyToId() != null);
setReplyCount(actionable.getRepliesCount(), statusDisplayOptions.showStatsInline()); setReplyCount(actionable.getRepliesCount(), statusDisplayOptions.showStatsInline());
setAvatar(actionable.getAccount().getAvatar(), status.getRebloggedAvatar(), setAvatar(actionable.getAccount().getAvatar(), status.getRebloggedAvatar(),
actionable.getAccount().getBot(), statusDisplayOptions); actionable.getAccount().getBot(), statusDisplayOptions);
setReblogged(actionable.getReblogged()); setReblogged(actionable.getReblogged());
setFavourited(actionable.getFavourited()); setFavourited(actionable.getFavourited());
setBookmarked(actionable.getBookmarked()); setBookmarked(actionable.getBookmarked());
@ -801,7 +801,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
setupCard(status, status.isExpanded(), statusDisplayOptions.cardViewMode(), statusDisplayOptions, listener); setupCard(status, status.isExpanded(), statusDisplayOptions.cardViewMode(), statusDisplayOptions, listener);
setupButtons(listener, actionable.getAccount().getId(), status.getContent().toString(), setupButtons(listener, actionable.getAccount().getId(), status.getContent().toString(),
statusDisplayOptions); statusDisplayOptions);
setRebloggingEnabled(actionable.rebloggingAllowed(), actionable.getVisibility()); setRebloggingEnabled(actionable.rebloggingAllowed(), actionable.getVisibility());
setSpoilerAndContent(status, statusDisplayOptions, listener); setSpoilerAndContent(status, statusDisplayOptions, listener);
@ -864,21 +864,21 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
Status actionable = status.getActionable(); Status actionable = status.getActionable();
String description = context.getString(R.string.description_status, String description = context.getString(R.string.description_status,
actionable.getAccount().getDisplayName(), actionable.getAccount().getDisplayName(),
getContentWarningDescription(context, status), getContentWarningDescription(context, status),
(TextUtils.isEmpty(actionable.getSpoilerText()) || !actionable.getSensitive() || status.isExpanded() ? status.getContent() : ""), (TextUtils.isEmpty(actionable.getSpoilerText()) || !actionable.getSensitive() || status.isExpanded() ? status.getContent() : ""),
getCreatedAtDescription(actionable.getCreatedAt(), statusDisplayOptions), getCreatedAtDescription(actionable.getCreatedAt(), statusDisplayOptions),
actionable.getEditedAt() != null ? context.getString(R.string.description_post_edited) : "", actionable.getEditedAt() != null ? context.getString(R.string.description_post_edited) : "",
getReblogDescription(context, status), getReblogDescription(context, status),
actionable.getAccount().getUsername(), actionable.getAccount().getUsername(),
actionable.getReblogged() ? context.getString(R.string.description_post_reblogged) : "", actionable.getReblogged() ? context.getString(R.string.description_post_reblogged) : "",
actionable.getFavourited() ? context.getString(R.string.description_post_favourited) : "", actionable.getFavourited() ? context.getString(R.string.description_post_favourited) : "",
actionable.getBookmarked() ? context.getString(R.string.description_post_bookmarked) : "", actionable.getBookmarked() ? context.getString(R.string.description_post_bookmarked) : "",
getMediaDescription(context, status), getMediaDescription(context, status),
getVisibilityDescription(context, actionable.getVisibility()), getVisibilityDescription(context, actionable.getVisibility()),
getFavsText(context, actionable.getFavouritesCount()), getFavsText(context, actionable.getFavouritesCount()),
getReblogsText(context, actionable.getReblogsCount()), getReblogsText(context, actionable.getReblogsCount()),
getPollDescription(status, context, statusDisplayOptions) getPollDescription(status, context, statusDisplayOptions)
); );
itemView.setContentDescription(description); itemView.setContentDescription(description);
} }
@ -888,7 +888,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
Status reblog = status.getRebloggingStatus(); Status reblog = status.getRebloggingStatus();
if (reblog != null) { if (reblog != null) {
return context return context
.getString(R.string.post_boosted_format, reblog.getAccount().getUsername()); .getString(R.string.post_boosted_format, reblog.getAccount().getUsername());
} else { } else {
return ""; return "";
} }
@ -900,18 +900,18 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
return ""; return "";
} }
StringBuilder mediaDescriptions = CollectionsKt.fold( StringBuilder mediaDescriptions = CollectionsKt.fold(
status.getActionable().getAttachments(), status.getActionable().getAttachments(),
new StringBuilder(), new StringBuilder(),
(builder, a) -> { (builder, a) -> {
if (a.getDescription() == null) { if (a.getDescription() == null) {
String placeholder = String placeholder =
context.getString(R.string.description_post_media_no_description_placeholder); context.getString(R.string.description_post_media_no_description_placeholder);
return builder.append(placeholder); return builder.append(placeholder);
} else { } else {
builder.append("; "); builder.append("; ");
return builder.append(a.getDescription()); return builder.append(a.getDescription());
} }
}); });
return context.getString(R.string.description_post_media, mediaDescriptions); return context.getString(R.string.description_post_media, mediaDescriptions);
} }
@ -969,29 +969,21 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
} }
args[4] = getPollInfoText(System.currentTimeMillis(), poll, statusDisplayOptions, args[4] = getPollInfoText(System.currentTimeMillis(), poll, statusDisplayOptions,
context); context);
return context.getString(R.string.description_poll, args); return context.getString(R.string.description_poll, args);
} }
} }
@NonNull @NonNull
protected CharSequence getFavsText(@NonNull Context context, int count) { protected CharSequence getFavsText(@NonNull Context context, int count) {
if (count > 0) { String countString = numberFormat.format(count);
String countString = numberFormat.format(count); return HtmlCompat.fromHtml(context.getResources().getQuantityString(R.plurals.favs, count, countString), HtmlCompat.FROM_HTML_MODE_LEGACY);
return HtmlCompat.fromHtml(context.getResources().getQuantityString(R.plurals.favs, count, countString), HtmlCompat.FROM_HTML_MODE_LEGACY);
} else {
return "";
}
} }
@NonNull @NonNull
protected CharSequence getReblogsText(@NonNull Context context, int count) { protected CharSequence getReblogsText (@NonNull Context context, int count) {
if (count > 0) { String countString = numberFormat.format(count);
String countString = numberFormat.format(count); return HtmlCompat.fromHtml(context.getResources().getQuantityString(R.plurals.reblogs, count, countString), HtmlCompat.FROM_HTML_MODE_LEGACY);
return HtmlCompat.fromHtml(context.getResources().getQuantityString(R.plurals.reblogs, count, countString), HtmlCompat.FROM_HTML_MODE_LEGACY);
} else {
return "";
}
} }
private void setupPoll(PollViewData poll, List<Emoji> emojis, private void setupPoll(PollViewData poll, List<Emoji> emojis,
@ -1014,26 +1006,26 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
}; };
pollAdapter.setup( pollAdapter.setup(
poll.getOptions(), poll.getOptions(),
poll.getVotesCount(), poll.getVotesCount(),
poll.getVotersCount(), poll.getVotersCount(),
emojis, emojis,
PollAdapter.RESULT, PollAdapter.RESULT,
viewThreadListener, viewThreadListener,
statusDisplayOptions.animateEmojis() statusDisplayOptions.animateEmojis()
); );
pollButton.setVisibility(View.GONE); pollButton.setVisibility(View.GONE);
} else { } else {
// voting possible // voting possible
pollAdapter.setup( pollAdapter.setup(
poll.getOptions(), poll.getOptions(),
poll.getVotesCount(), poll.getVotesCount(),
poll.getVotersCount(), poll.getVotersCount(),
emojis, emojis,
poll.getMultiple() ? PollAdapter.MULTIPLE : PollAdapter.SINGLE, poll.getMultiple() ? PollAdapter.MULTIPLE : PollAdapter.SINGLE,
null, null,
statusDisplayOptions.animateEmojis() statusDisplayOptions.animateEmojis()
); );
pollButton.setVisibility(View.VISIBLE); pollButton.setVisibility(View.VISIBLE);
@ -1086,11 +1078,11 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
protected void setupCard( protected void setupCard(
final @NonNull StatusViewData.Concrete status, final @NonNull StatusViewData.Concrete status,
boolean expanded, boolean expanded,
final @NonNull CardViewMode cardViewMode, final @NonNull CardViewMode cardViewMode,
final @NonNull StatusDisplayOptions statusDisplayOptions, final @NonNull StatusDisplayOptions statusDisplayOptions,
final @NonNull StatusActionListener listener final @NonNull StatusActionListener listener
) { ) {
if (cardView == null) { if (cardView == null) {
return; return;
@ -1128,14 +1120,14 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
if (statusDisplayOptions.mediaPreviewEnabled() && !actionable.getSensitive() && !TextUtils.isEmpty(card.getImage())) { if (statusDisplayOptions.mediaPreviewEnabled() && !actionable.getSensitive() && !TextUtils.isEmpty(card.getImage())) {
int radius = cardImage.getContext().getResources() int radius = cardImage.getContext().getResources()
.getDimensionPixelSize(R.dimen.card_radius); .getDimensionPixelSize(R.dimen.card_radius);
ShapeAppearanceModel.Builder cardImageShape = ShapeAppearanceModel.builder(); ShapeAppearanceModel.Builder cardImageShape = ShapeAppearanceModel.builder();
if (card.getWidth() > card.getHeight()) { if (card.getWidth() > card.getHeight()) {
cardView.setOrientation(LinearLayout.VERTICAL); cardView.setOrientation(LinearLayout.VERTICAL);
cardImage.getLayoutParams().height = cardImage.getContext().getResources() cardImage.getLayoutParams().height = cardImage.getContext().getResources()
.getDimensionPixelSize(R.dimen.card_image_vertical_height); .getDimensionPixelSize(R.dimen.card_image_vertical_height);
cardImage.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT; cardImage.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT; cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT; cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
@ -1145,7 +1137,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
cardView.setOrientation(LinearLayout.HORIZONTAL); cardView.setOrientation(LinearLayout.HORIZONTAL);
cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT; cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
cardImage.getLayoutParams().width = cardImage.getContext().getResources() cardImage.getLayoutParams().width = cardImage.getContext().getResources()
.getDimensionPixelSize(R.dimen.card_image_horizontal_width); .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT; cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT; cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
cardImageShape.setTopLeftCorner(CornerFamily.ROUNDED, radius); cardImageShape.setTopLeftCorner(CornerFamily.ROUNDED, radius);
@ -1157,40 +1149,40 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
cardImage.setScaleType(ImageView.ScaleType.CENTER_CROP); cardImage.setScaleType(ImageView.ScaleType.CENTER_CROP);
RequestBuilder<Drawable> builder = Glide.with(cardImage.getContext()) RequestBuilder<Drawable> builder = Glide.with(cardImage.getContext())
.load(card.getImage()) .load(card.getImage())
.dontTransform(); .dontTransform();
if (statusDisplayOptions.useBlurhash() && !TextUtils.isEmpty(card.getBlurhash())) { if (statusDisplayOptions.useBlurhash() && !TextUtils.isEmpty(card.getBlurhash())) {
builder = builder.placeholder(decodeBlurHash(card.getBlurhash())); builder = builder.placeholder(decodeBlurHash(card.getBlurhash()));
} }
builder.into(cardImage); builder.into(cardImage);
} else if (statusDisplayOptions.useBlurhash() && !TextUtils.isEmpty(card.getBlurhash())) { } else if (statusDisplayOptions.useBlurhash() && !TextUtils.isEmpty(card.getBlurhash())) {
int radius = cardImage.getContext().getResources() int radius = cardImage.getContext().getResources()
.getDimensionPixelSize(R.dimen.card_radius); .getDimensionPixelSize(R.dimen.card_radius);
cardView.setOrientation(LinearLayout.HORIZONTAL); cardView.setOrientation(LinearLayout.HORIZONTAL);
cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT; cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
cardImage.getLayoutParams().width = cardImage.getContext().getResources() cardImage.getLayoutParams().width = cardImage.getContext().getResources()
.getDimensionPixelSize(R.dimen.card_image_horizontal_width); .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT; cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT; cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
ShapeAppearanceModel cardImageShape = ShapeAppearanceModel.builder() ShapeAppearanceModel cardImageShape = ShapeAppearanceModel.builder()
.setTopLeftCorner(CornerFamily.ROUNDED, radius) .setTopLeftCorner(CornerFamily.ROUNDED, radius)
.setBottomLeftCorner(CornerFamily.ROUNDED, radius) .setBottomLeftCorner(CornerFamily.ROUNDED, radius)
.build(); .build();
cardImage.setShapeAppearanceModel(cardImageShape); cardImage.setShapeAppearanceModel(cardImageShape);
cardImage.setScaleType(ImageView.ScaleType.CENTER_CROP); cardImage.setScaleType(ImageView.ScaleType.CENTER_CROP);
Glide.with(cardImage.getContext()) Glide.with(cardImage.getContext())
.load(decodeBlurHash(card.getBlurhash())) .load(decodeBlurHash(card.getBlurhash()))
.dontTransform() .dontTransform()
.into(cardImage); .into(cardImage);
} else { } else {
cardView.setOrientation(LinearLayout.HORIZONTAL); cardView.setOrientation(LinearLayout.HORIZONTAL);
cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT; cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
cardImage.getLayoutParams().width = cardImage.getContext().getResources() cardImage.getLayoutParams().width = cardImage.getContext().getResources()
.getDimensionPixelSize(R.dimen.card_image_horizontal_width); .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT; cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT; cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
@ -1199,8 +1191,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
cardImage.setScaleType(ImageView.ScaleType.CENTER); cardImage.setScaleType(ImageView.ScaleType.CENTER);
Glide.with(cardImage.getContext()) Glide.with(cardImage.getContext())
.load(R.drawable.card_image_placeholder) .load(R.drawable.card_image_placeholder)
.into(cardImage); .into(cardImage);
} }
View.OnClickListener visitLink = v -> listener.onViewUrl(card.getUrl()); View.OnClickListener visitLink = v -> listener.onViewUrl(card.getUrl());
@ -1208,8 +1200,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
cardView.setOnClickListener(visitLink); cardView.setOnClickListener(visitLink);
// View embedded photos in our image viewer instead of opening the browser // View embedded photos in our image viewer instead of opening the browser
cardImage.setOnClickListener(card.getType().equals(Card.TYPE_PHOTO) && !TextUtils.isEmpty(card.getEmbedUrl()) ? cardImage.setOnClickListener(card.getType().equals(Card.TYPE_PHOTO) && !TextUtils.isEmpty(card.getEmbedUrl()) ?
v -> cardView.getContext().startActivity(ViewMediaActivity.newSingleImageIntent(cardView.getContext(), card.getEmbedUrl())) : v -> cardView.getContext().startActivity(ViewMediaActivity.newSingleImageIntent(cardView.getContext(), card.getEmbedUrl())) :
visitLink); visitLink);
cardView.setClipToOutline(true); cardView.setClipToOutline(true);
} else { } else {

43
app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
View File

@ -57,8 +57,8 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
if (visibilityIcon != null) { if (visibilityIcon != null) {
ImageSpan visibilityIconSpan = new ImageSpan( ImageSpan visibilityIconSpan = new ImageSpan(
visibilityIcon, visibilityIcon,
Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ? DynamicDrawableSpan.ALIGN_CENTER : DynamicDrawableSpan.ALIGN_BASELINE Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q ? DynamicDrawableSpan.ALIGN_CENTER : DynamicDrawableSpan.ALIGN_BASELINE
); );
sb.setSpan(visibilityIconSpan, 0, visibilityString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); sb.setSpan(visibilityIconSpan, 0, visibilityString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
@ -67,7 +67,6 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
Date createdAt = status.getCreatedAt(); Date createdAt = status.getCreatedAt();
if (createdAt != null) { if (createdAt != null) {
sb.append(" "); sb.append(" ");
sb.append(dateFormat.format(createdAt)); sb.append(dateFormat.format(createdAt));
} }
@ -105,7 +104,6 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
Status.Application app = status.getApplication(); Status.Application app = status.getApplication();
if (app != null) { if (app != null) {
sb.append(metadataJoiner); sb.append(metadataJoiner);
if (app.getWebsite() != null) { if (app.getWebsite() != null) {
@ -121,25 +119,8 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
} }
private void setReblogAndFavCount(int reblogCount, int favCount, StatusActionListener listener) { private void setReblogAndFavCount(int reblogCount, int favCount, StatusActionListener listener) {
reblogs.setText(getReblogsText(reblogs.getContext(), reblogCount));
if (reblogCount > 0) { favourites.setText(getFavsText(favourites.getContext(), favCount));
reblogs.setText(getReblogsText(reblogs.getContext(), reblogCount));
reblogs.setVisibility(View.VISIBLE);
} else {
reblogs.setVisibility(View.GONE);
}
if (favCount > 0) {
favourites.setText(getFavsText(favourites.getContext(), favCount));
favourites.setVisibility(View.VISIBLE);
} else {
favourites.setVisibility(View.GONE);
}
if (reblogs.getVisibility() == View.GONE && favourites.getVisibility() == View.GONE) {
infoDivider.setVisibility(View.GONE);
} else {
infoDivider.setVisibility(View.VISIBLE);
}
reblogs.setOnClickListener(v -> { reblogs.setOnClickListener(v -> {
int position = getBindingAdapterPosition(); int position = getBindingAdapterPosition();
@ -162,8 +143,8 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
@Nullable Object payloads) { @Nullable Object payloads) {
// We never collapse statuses in the detail view // We never collapse statuses in the detail view
StatusViewData.Concrete uncollapsedStatus = (status.isCollapsible() && status.isCollapsed()) ? StatusViewData.Concrete uncollapsedStatus = (status.isCollapsible() && status.isCollapsed()) ?
status.copyWithCollapsed(false) : status.copyWithCollapsed(false) :
status; status;
super.setupWithStatus(uncollapsedStatus, listener, statusDisplayOptions, payloads); super.setupWithStatus(uncollapsedStatus, listener, statusDisplayOptions, payloads);
setupCard(uncollapsedStatus, status.isExpanded(), CardViewMode.FULL_WIDTH, statusDisplayOptions, listener); // Always show card for detailed status setupCard(uncollapsedStatus, status.isExpanded(), CardViewMode.FULL_WIDTH, statusDisplayOptions, listener); // Always show card for detailed status
@ -172,7 +153,7 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
if (!statusDisplayOptions.hideStats()) { if (!statusDisplayOptions.hideStats()) {
setReblogAndFavCount(actionable.getReblogsCount(), setReblogAndFavCount(actionable.getReblogsCount(),
actionable.getFavouritesCount(), listener); actionable.getFavouritesCount(), listener);
} else { } else {
hideQuantitativeStats(); hideQuantitativeStats();
} }
@ -204,7 +185,7 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
} }
final Drawable visibilityDrawable = AppCompatResources.getDrawable( final Drawable visibilityDrawable = AppCompatResources.getDrawable(
this.metaInfo.getContext(), visibilityIcon this.metaInfo.getContext(), visibilityIcon
); );
if (visibilityDrawable == null) { if (visibilityDrawable == null) {
return null; return null;
@ -212,10 +193,10 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder {
final int size = (int) this.metaInfo.getTextSize(); final int size = (int) this.metaInfo.getTextSize();
visibilityDrawable.setBounds( visibilityDrawable.setBounds(
0, 0,
0, 0,
size, size,
size size
); );
visibilityDrawable.setTint(this.metaInfo.getCurrentTextColor()); visibilityDrawable.setTint(this.metaInfo.getCurrentTextColor());

93
app/src/main/res/layout/item_status_detailed.xml
View File

@ -283,17 +283,11 @@
app:layout_constraintTop_toBottomOf="@id/status_poll_description" app:layout_constraintTop_toBottomOf="@id/status_poll_description"
tools:text="21 Dec 2018 18:45" /> tools:text="21 Dec 2018 18:45" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/status_counters_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="status_reblogs,status_favourites" />
<View <View
android:id="@+id/status_buttons_divider" android:id="@+id/status_info_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="0.5dp"
android:layout_below="@id/status_meta_info"
android:layout_marginStart="14dp" android:layout_marginStart="14dp"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
@ -303,18 +297,56 @@
android:paddingEnd="16dp" android:paddingEnd="16dp"
app:layout_constraintTop_toBottomOf="@id/status_meta_info" /> app:layout_constraintTop_toBottomOf="@id/status_meta_info" />
<TextView
android:id="@+id/status_reblogs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:background="?attr/selectableItemBackground"
android:importantForAccessibility="no"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toStartOf="@id/status_info_divider"
app:layout_constraintTop_toBottomOf="@id/status_info_divider"
tools:text="4 Boosts"
tools:visibility="visible" />
<TextView
android:id="@+id/status_favourites"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="6dp"
android:background="?attr/selectableItemBackground"
android:importantForAccessibility="no"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toEndOf="@id/status_reblogs"
app:layout_constraintTop_toBottomOf="@id/status_info_divider"
app:layout_goneMarginStart="0dp"
tools:text="8 Favorites"
tools:visibility="visible" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/status_counters_barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="status_reblogs,status_favourites" />
<ImageButton <ImageButton
android:id="@+id/status_reply" android:id="@+id/status_reply"
style="@style/TuskyImageButton" style="@style/TuskyImageButton"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginTop="4dp"
android:contentDescription="@string/action_reply" android:contentDescription="@string/action_reply"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:padding="4dp" android:padding="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/status_inset" app:layout_constraintEnd_toStartOf="@id/status_inset"
app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_buttons_divider" app:layout_constraintTop_toBottomOf="@id/status_counters_barrier"
app:srcCompat="@drawable/ic_reply_24dp" /> app:srcCompat="@drawable/ic_reply_24dp" />
<at.connyduck.sparkbutton.SparkButton <at.connyduck.sparkbutton.SparkButton
@ -382,45 +414,4 @@
app:layout_constraintTop_toTopOf="@id/status_reply" app:layout_constraintTop_toTopOf="@id/status_reply"
app:srcCompat="@drawable/ic_more_horiz_24dp" /> app:srcCompat="@drawable/ic_more_horiz_24dp" />
<View
android:id="@+id/status_info_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/status_meta_info"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp"
android:background="?android:attr/listDivider"
android:importantForAccessibility="no"
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:layout_constraintTop_toBottomOf="@id/status_reply" />
<TextView
android:id="@+id/status_reblogs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:importantForAccessibility="no"
android:padding="4dp"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toStartOf="@id/status_info_divider"
app:layout_constraintTop_toBottomOf="@id/status_info_divider"
tools:text="4 reblogs"
tools:visibility="visible" />
<TextView
android:id="@+id/status_favourites"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:background="?attr/selectableItemBackground"
android:importantForAccessibility="no"
android:padding="4dp"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toEndOf="@id/status_reblogs"
app:layout_constraintTop_toBottomOf="@id/status_info_divider"
app:layout_goneMarginStart="0dp"
tools:text="8 favs"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/values/strings.xml
View File

@ -546,11 +546,13 @@
<string name="failed_to_unpin">Failed to Unpin</string> <string name="failed_to_unpin">Failed to Unpin</string>
<plurals name="favs"> <plurals name="favs">
<item quantity="zero"><b>%1$s</b> Favorites</item>
<item quantity="one">&lt;b>%1$s&lt;/b> Favorite</item> <item quantity="one">&lt;b>%1$s&lt;/b> Favorite</item>
<item quantity="other">&lt;b>%1$s&lt;/b> Favorites</item> <item quantity="other">&lt;b>%1$s&lt;/b> Favorites</item>
</plurals> </plurals>
<plurals name="reblogs"> <plurals name="reblogs">
<item quantity="zero"><b>%s</b> Boosts</item>
<item quantity="one">&lt;b>%s&lt;/b> Boost</item> <item quantity="one">&lt;b>%s&lt;/b> Boost</item>
<item quantity="other">&lt;b>%s&lt;/b> Boosts</item> <item quantity="other">&lt;b>%s&lt;/b> Boosts</item>
</plurals> </plurals>