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

fix warning not clickable if main status

Browse Source
This commit is contained in:
sk
2023-10-07 17:50:24 +02:00
parent b0a5aa93e1
commit 67e3a5bb47
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
View File

@@ -31,13 +31,11 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
} }
public static class Holder extends StatusDisplayItem.Holder<WarningFilteredStatusDisplayItem>{ public static class Holder extends StatusDisplayItem.Holder<WarningFilteredStatusDisplayItem>{
public final View warningWrap;
public final TextView text; public final TextView text;
public List<StatusDisplayItem> filteredItems; public List<StatusDisplayItem> filteredItems;
public Holder(Context context, ViewGroup parent) { public Holder(Context context, ViewGroup parent) {
super(context, R.layout.display_item_filter_warning, parent); super(context, R.layout.display_item_filter_warning, parent);
warningWrap=findViewById(R.id.warning_wrap);
text=findViewById(R.id.text); text=findViewById(R.id.text);
} }
@@ -45,11 +43,7 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
public void onBind(WarningFilteredStatusDisplayItem item) { public void onBind(WarningFilteredStatusDisplayItem item) {
filteredItems = item.filteredItems; filteredItems = item.filteredItems;
text.setText(item.parentFragment.getString(R.string.sk_filtered, item.applyingFilter.title)); text.setText(item.parentFragment.getString(R.string.sk_filtered, item.applyingFilter.title));
} itemView.setOnClickListener(v->item.parentFragment.onWarningClick(this));
@Override
public void onClick() {
item.parentFragment.onWarningClick(this);
} }
} }
} }

1
mastodon/src/main/res/layout/display_item_filter_warning.xml
View File

@@ -3,7 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/warning_wrap"
android:background="@drawable/bg_filter_warning"> android:background="@drawable/bg_filter_warning">
<TextView <TextView