feat(StatusDisplayItem/WarningFiltered): apply inset
This commit is contained in:
@@ -396,6 +396,8 @@ public abstract class StatusDisplayItem{
|
||||
List<StatusDisplayItem> nonGapItems=gap!=null ? items.subList(0, items.size()-1) : items;
|
||||
WarningFilteredStatusDisplayItem warning=applyingFilter==null ? null :
|
||||
new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, nonGapItems, applyingFilter);
|
||||
if(warning!=null)
|
||||
warning.inset=inset;
|
||||
return applyingFilter==null ? items : new ArrayList<>(gap!=null
|
||||
? List.of(warning, gap)
|
||||
: Collections.singletonList(warning)
|
||||
|
||||
@@ -10,6 +10,7 @@ import org.joinmastodon.android.R;
|
||||
import org.joinmastodon.android.fragments.BaseStatusListFragment;
|
||||
import org.joinmastodon.android.model.LegacyFilter;
|
||||
import org.joinmastodon.android.model.Status;
|
||||
import org.joinmastodon.android.ui.OutlineProviders;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -50,6 +51,9 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
|
||||
filteredItems=item.filteredItems;
|
||||
String title=item.applyingFilter.title;
|
||||
text.setText(item.parentFragment.getString(R.string.sk_filtered, title));
|
||||
|
||||
itemView.setClipToOutline(item.inset);
|
||||
itemView.setOutlineProvider(item.inset ? OutlineProviders.roundedRect(12) : null);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -29,8 +29,7 @@
|
||||
android:layout_weight="1"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:visibility="visible"
|
||||
/>
|
||||
android:visibility="visible"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
Reference in New Issue
Block a user