chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Show display names for reposts (#2041)

Browse source 
* WIP: Show display names for reposts

* Display emojis on reposts

* Move unicode wrapping

Co-authored-by: Garrit Franke <garrit@slashdev.space>
This commit is contained in:
Garrit Franke 2021-01-15 21:16:32 +01:00 • committed by GitHub
commit 4c7d09b1e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java
View file

@ -16,10 +16,11 @@
package com.keylesspalace.tusky.viewdata;
import android.os.Build;
import androidx.annotation.Nullable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import androidx.annotation.Nullable;
import com.keylesspalace.tusky.entity.Attachment;
import com.keylesspalace.tusky.entity.Card;
import com.keylesspalace.tusky.entity.Emoji;
@ -85,6 +86,7 @@ public abstract class StatusViewData {
private final Status.Application application;
private final List<Emoji> statusEmojis;
private final List<Emoji> accountEmojis;
private final List<Emoji> rebloggedByAccountEmojis;
@Nullable
private final Card card;
private final boolean isCollapsible; /** Whether the status meets the requirement to be collapse */
@ -99,7 +101,7 @@ public abstract class StatusViewData {
boolean isShowingContent, String userFullName, String nickname, String avatar,
Date createdAt, int reblogsCount, int favouritesCount, @Nullable String inReplyToId,
@Nullable Status.Mention[] mentions, String senderId, boolean rebloggingEnabled,
Status.Application application, List<Emoji> statusEmojis, List<Emoji> accountEmojis, @Nullable Card card,
Status.Application application, List<Emoji> statusEmojis, List<Emoji> accountEmojis, List<Emoji> rebloggedByAccountEmojis, @Nullable Card card,
boolean isCollapsible, boolean isCollapsed, @Nullable PollViewData poll, boolean isBot) {
this.id = id;
@ -136,6 +138,7 @@ public abstract class StatusViewData {
this.application = application;
this.statusEmojis = statusEmojis;
this.accountEmojis = accountEmojis;
this.rebloggedByAccountEmojis = rebloggedByAccountEmojis;
this.card = card;
this.isCollapsible = isCollapsible;
this.isCollapsed = isCollapsed;
@ -258,6 +261,10 @@ public abstract class StatusViewData {
return accountEmojis;
}
public List<Emoji> getRebloggedByAccountEmojis() {
return rebloggedByAccountEmojis;
}
@Nullable
public Card getCard() {
return card;
@ -324,6 +331,7 @@ public abstract class StatusViewData {
Objects.equals(application, concrete.application) &&
Objects.equals(statusEmojis, concrete.statusEmojis) &&
Objects.equals(accountEmojis, concrete.accountEmojis) &&
Objects.equals(rebloggedByAccountEmojis, concrete.rebloggedByAccountEmojis) &&
Objects.equals(card, concrete.card) &&
Objects.equals(poll, concrete.poll)
&& isCollapsed == concrete.isCollapsed;
@ -429,6 +437,7 @@ public abstract class StatusViewData {
private Status.Application application;
private List<Emoji> statusEmojis;
private List<Emoji> accountEmojis;
private List<Emoji> rebloggedByAccountEmojis;
private Card card;
private boolean isCollapsible; /** Whether the status meets the requirement to be collapsed */
private boolean isCollapsed; /** Whether the status is shown partially or fully */
@ -613,6 +622,11 @@ public abstract class StatusViewData {
return this;
}
public Builder setRebloggedByEmojis(List<Emoji> emojis) {
this.rebloggedByAccountEmojis = emojis;
return this;
}
public Builder setCard(Card card) {
this.card = card;
return this;
@ -656,7 +670,7 @@ public abstract class StatusViewData {
visibility, attachments, rebloggedByUsername, rebloggedAvatar, isSensitive, isExpanded,
isShowingContent, userFullName, nickname, avatar, createdAt, reblogsCount,
favouritesCount, inReplyToId, mentions, senderId, rebloggingEnabled, application,
statusEmojis, accountEmojis, card, isCollapsible, isCollapsed, poll, isBot);
statusEmojis, accountEmojis, rebloggedByAccountEmojis, card, isCollapsible, isCollapsed, poll, isBot);
}
}
}