Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

Show filter title instead of filter keywords (#3589) 

Avoid showing the user the things they have filtered on when showing a filter placeholder in a timeline.
This commit is contained in:
Nik Clayton 2023-04-29 18:56:27 +02:00 committed by GitHub
parent 5c28cba57d
commit 152318ce85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,18 +827,17 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
showFilteredPlaceholder(true); showFilteredPlaceholder(true);
String matchedKeyword = null; Filter matchedFilter = null;
for (FilterResult result : status.getActionable().getFiltered()) { for (FilterResult result : status.getActionable().getFiltered()) {
Filter filter = result.getFilter(); Filter filter = result.getFilter();
List<String> keywords = result.getKeywordMatches(); if (filter.getAction() == Filter.Action.WARN) {
if (filter.getAction() == Filter.Action.WARN && !keywords.isEmpty()) { matchedFilter = filter;
matchedKeyword = keywords.get(0);
break; break;
} }
} }
filteredPlaceholderLabel.setText(itemView.getContext().getString(R.string.status_filter_placeholder_label_format, matchedKeyword)); filteredPlaceholderLabel.setText(itemView.getContext().getString(R.string.status_filter_placeholder_label_format, matchedFilter.getTitle()));
filteredPlaceholderShowButton.setOnClickListener(view -> { filteredPlaceholderShowButton.setOnClickListener(view -> {
listener.clearWarningAction(getBindingAdapterPosition()); listener.clearWarningAction(getBindingAdapterPosition());
}); });