diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Filter.java b/mastodon/src/main/java/org/joinmastodon/android/model/Filter.java index f7b394765..ea34b8402 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Filter.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Filter.java @@ -18,6 +18,8 @@ public class Filter extends BaseModel{ @RequiredField public String id; @RequiredField + public String title; + @RequiredField public String phrase; public transient EnumSet context=EnumSet.noneOf(FilterContext.class); public Instant expiresAt; @@ -61,6 +63,7 @@ public class Filter extends BaseModel{ public String toString(){ return "Filter{"+ "id='"+id+'\''+ + ", title='"+title+'\''+ ", phrase='"+phrase+'\''+ ", context="+context+ ", expiresAt="+expiresAt+ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java index 7c7c2b77a..c77a0ea4d 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java @@ -49,15 +49,11 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{ @Override public void onBind(WarningFilteredStatusDisplayItem item){ filteredItems = item.filteredItems; + text.setText(item.parentFragment.getString(R.string.mo_filtered, item.status.filtered.get(item.status.filtered.size() -1).filter.title)); } @Override public void onClick(){ -// this.itemView.setVisibility(View.GONE); -// ViewGroup.LayoutParams params = this.itemView.getLayoutParams(); -// params.height = 0; -// params.width = 0; -// this.itemView.setLayoutParams(params); item.parentFragment.onWarningClick(this); } } diff --git a/mastodon/src/main/res/layout/display_item_warning.xml b/mastodon/src/main/res/layout/display_item_warning.xml index 0549861c0..c0bc627d5 100644 --- a/mastodon/src/main/res/layout/display_item_warning.xml +++ b/mastodon/src/main/res/layout/display_item_warning.xml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="center_horizontal" - android:textAppearance="@style/m3_body_large" + android:textAppearance="@style/m3_title_medium" android:textColor="?android:textColorSecondary" android:text="@string/load_missing_posts"/> diff --git a/mastodon/src/main/res/values/strings_mo.xml b/mastodon/src/main/res/values/strings_mo.xml index a7bc9bd10..bf2831084 100644 --- a/mastodon/src/main/res/values/strings_mo.xml +++ b/mastodon/src/main/res/values/strings_mo.xml @@ -22,6 +22,7 @@ The included images have no description. Please consider adding one, to allow visually impaired people to participate. Recently used Clear recently used emoji + Filtered: %s Disable "Relocate publish button" to allow customization