From 4940eff7f92af71040d9627622711c6fa19f6219 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Wed, 1 Feb 2023 21:39:54 -0300 Subject: [PATCH] Its pretty much done i think --- .../WarningFilteredStatusDisplayItem.java | 8 +++--- .../main/res/layout/display_item_warning.xml | 26 ++++++++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) 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 c77a0ea4d..89ad2f56b 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 @@ -3,6 +3,7 @@ package org.joinmastodon.android.ui.displayitems; import android.content.Context; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; @@ -34,14 +35,15 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{ public static class Holder extends StatusDisplayItem.Holder{ public final View warningWrap; - public final ProgressBar progress; + public final Button showBtn; public final TextView text; public ArrayList filteredItems; public Holder(Context context, ViewGroup parent){ super(context, R.layout.display_item_warning, parent); warningWrap=findViewById(R.id.warning_wrap); - progress=findViewById(R.id.progress); + showBtn=findViewById(R.id.reveal_btn); + showBtn.setOnClickListener(i -> item.parentFragment.onWarningClick(this)); text=findViewById(R.id.text); // itemView.setOnClickListener(v->item.parentFragment.onRevealFilteredClick(this)); } @@ -54,7 +56,7 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{ @Override public void onClick(){ - 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 c0bc627d5..d618c2bd3 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 @@ @@ -9,17 +9,23 @@ android:id="@+id/text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="center_horizontal" + android:layout_marginStart="16dp" + android:layout_gravity="start|center_vertical" android:textAppearance="@style/m3_title_medium" android:textColor="?android:textColorSecondary" - android:text="@string/load_missing_posts"/> + android:text="@string/mo_filtered"/> + +