Mastodon
/
Husky-app-android
mirror of https://github.com/FWGS/Husky.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Code cleanup, put everything into one method in StatusViewData

This commit is contained in:
DMTbvr 2022-01-08 02:26:35 +01:00
parent 79246ba461
commit ad42cab00a
5 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/husky/res/values-pl/strings.xml
View File

@ -71,8 +71,8 @@
<string name="attachment_type_audio">Audio</string>
<string name="attachment_type_unknown">Załącznik</string>
<string name="link">Odnośnik</string>
<string name="status_replied_to_format">Odpowiedź dla %s</string>
<string name="status_replied_to_format">Odpowiedź dla @%s</string>
<string name="chat_our_last_message"><b>Ty</b></string>
<string name="pref_title_other">Inne</string>
<string name="status_replied_to_and_more_format">i %d więcej.</string>
<string name="status_replied_to_and_more_format">" i %d więcej."</string>
</resources>

4
app/src/husky/res/values/strings.xml
View File

@ -119,8 +119,8 @@
<string name="status_share_content">Share content of post</string>
<string name="status_share_link">Share link to post</string>
<string name="status_boosted_format">%s repeated</string>
<string name="status_replied_to_format">Reply to %s</string>
<string name="status_replied_to_and_more_format">and %d more.</string>
<string name="status_replied_to_format">Reply to @%s</string>
<string name="status_replied_to_and_more_format">" and %d more."</string>
<string name="title_scheduled_toot">Scheduled posts</string>
<string name="title_reblogged_by">Repeated by</string>

19
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View File

@ -714,26 +714,11 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
contentWarningDescriptionTextView.setText(emojifiedContentWarning);
}
private String getReplyToAccountString(Context context, Status.Mention[] mentions){
String replyToAccountString = "";
String format = context.getString(R.string.status_replied_to_and_more_format);
if(mentions != null) {
if (mentions.length > 1) {
replyToAccountString = String.format(Locale.getDefault(),"@%s "+format, mentions[0].getLocalUsername(), mentions.length - 1);
} else if (mentions.length == 1) {
replyToAccountString = String.format("@%s", mentions[0].getLocalUsername());
}
}
return replyToAccountString;
}
private void setupReplyInfo() {
if (statusViewData.getInReplyToId() != null) {
Context context = replyInfo.getContext();
String replyToAccount = statusViewData.getInReplyToAccountAcct();
Status.Mention[] mentions = statusViewData.getMentions();
String replyToString = getReplyToAccountString(context, mentions);
replyInfo.setText(context.getString(R.string.status_replied_to_format, replyToAccount+replyToString));
String replyToAccount = statusViewData.getReplyToAccountString(context);
replyInfo.setText(replyToAccount);
if (!statusViewData.getParentVisible()) {
replyInfo.setPaintFlags(replyInfo.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
replyInfo.setOnClickListener(null);

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

@ -383,26 +383,11 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
}
private String getReplyToAccountString(Context context, Status.Mention[] mentions){
String replyToAccountString = "";
String format = context.getString(R.string.status_replied_to_and_more_format);
if(mentions != null) {
if (mentions.length > 1) {
replyToAccountString = String.format(Locale.getDefault(),"@%s "+format, mentions[0].getLocalUsername(), mentions.length - 1);
} else if (mentions.length == 1) {
replyToAccountString = String.format("@%s", mentions[0].getLocalUsername());
}
}
return replyToAccountString;
}
protected void setReplyInfo(StatusViewData.Concrete status, StatusActionListener listener) {
if (status.getInReplyToId() != null) {
Context context = replyInfo.getContext();
String replyToAccount = status.getInReplyToAccountAcct();
Status.Mention[] mentions = status.getMentions();
String replyToString = getReplyToAccountString(context, mentions);
replyInfo.setText(context.getString(R.string.status_replied_to_format, replyToAccount+replyToString));
String replyToAccount = status.getReplyToAccountString(context);
replyInfo.setText(replyToAccount);
if (!status.getParentVisible()) {
replyInfo.setPaintFlags(replyInfo.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
replyInfo.setOnClickListener(null);

15
app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java
View File

@ -15,6 +15,7 @@
package com.keylesspalace.tusky.viewdata;
import android.content.Context;
import android.content.res.Resources;
import android.os.Build;
import android.text.SpannableStringBuilder;
@ -108,6 +109,20 @@ public abstract class StatusViewData {
private final List<EmojiReaction> emojiReactions;
private final boolean parentVisible;
public String getReplyToAccountString(Context context){
String replyToAccountString = "";
String replyTo = context.getString(R.string.status_replied_to_format);
String format = context.getString(R.string.status_replied_to_and_more_format);
if(this.mentions != null) {
if (this.mentions.length > 1) {
replyToAccountString = String.format(Locale.getDefault(),replyTo+format, this.mentions[0].getLocalUsername(), this.mentions.length - 1);
} else if (this.mentions.length == 1) {
replyToAccountString = String.format(replyTo, this.mentions[0].getLocalUsername());
}
}
return replyToAccountString;
}
public Concrete(String id, Spanned content, boolean reblogged, boolean favourited, boolean bookmarked,
@Nullable String spoilerText, Status.Visibility visibility, List<Attachment> attachments,
@Nullable String rebloggedByUsername, @Nullable String rebloggedAvatar, boolean sensitive, boolean isExpanded,