owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show thread reply line

Browse Source
This commit is contained in:
sk
2023-03-15 19:23:20 +01:00
parent 584700225c
commit 16f907c91f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View File

@@ -135,13 +135,20 @@ public abstract class StatusDisplayItem{
} }
ReblogOrReplyLineStatusDisplayItem replyLine = null; ReblogOrReplyLineStatusDisplayItem replyLine = null;
if(statusForContent.inReplyToAccountId!=null){ boolean threadReply = statusForContent.inReplyToAccountId != null &&
statusForContent.inReplyToAccountId.equals(status.account.id);
if(statusForContent.inReplyToAccountId!=null && !(threadReply && fragment instanceof ThreadFragment)){
Account account = knownAccounts.get(statusForContent.inReplyToAccountId); Account account = knownAccounts.get(statusForContent.inReplyToAccountId);
View.OnClickListener handleClick = account == null ? null : i -> { View.OnClickListener handleClick = account == null || threadReply ? null : i -> {
args.putParcelable("profileAccount", Parcels.wrap(account)); args.putParcelable("profileAccount", Parcels.wrap(account));
Nav.go(fragment.getActivity(), ProfileFragment.class, args); Nav.go(fragment.getActivity(), ProfileFragment.class, args);
}; };
String text = account != null ? fragment.getString(R.string.in_reply_to, account.displayName) : fragment.getString(R.string.sk_in_reply);
String text = threadReply ?
fragment.getString(R.string.sk_show_thread) : account != null ?
fragment.getString(R.string.in_reply_to, account.displayName) : fragment.getString(R.string.sk_in_reply);
replyLine = new ReblogOrReplyLineStatusDisplayItem( replyLine = new ReblogOrReplyLineStatusDisplayItem(
parentID, fragment, text, account == null ? List.of() : account.emojis, parentID, fragment, text, account == null ? List.of() : account.emojis,
R.drawable.ic_fluent_arrow_reply_20_filled, null, handleClick R.drawable.ic_fluent_arrow_reply_20_filled, null, handleClick

1
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -264,4 +264,5 @@
<string name="sk_settings_hide_fab">Auto-hide Compose button</string> <string name="sk_settings_hide_fab">Auto-hide Compose button</string>
<string name="sk_in_reply">In reply</string> <string name="sk_in_reply">In reply</string>
<string name="sk_reply_line_below_avatar">“In reply to” line below avatar</string> <string name="sk_reply_line_below_avatar">“In reply to” line below avatar</string>
<string name="sk_show_thread">Show thread</string>
</resources> </resources>