notfire/moshidon
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

feat(StatusDisplayItem/WarningFiltered): apply inset

Browse source
This commit is contained in:
FineFindus 2024-07-25 13:53:39 +02:00
parent af33c593b5
commit ec495750fe
No known key found for this signature in database
GPG key ID: 64873EE210FF8E6B
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View file

@ -396,6 +396,8 @@ public abstract class StatusDisplayItem{
List<StatusDisplayItem> nonGapItems=gap!=null ? items.subList(0, items.size()-1) : items; List<StatusDisplayItem> nonGapItems=gap!=null ? items.subList(0, items.size()-1) : items;
WarningFilteredStatusDisplayItem warning=applyingFilter==null ? null : WarningFilteredStatusDisplayItem warning=applyingFilter==null ? null :
new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, nonGapItems, applyingFilter); new WarningFilteredStatusDisplayItem(parentID, fragment, statusForContent, nonGapItems, applyingFilter);
if(warning!=null)
warning.inset=inset;
return applyingFilter==null ? items : new ArrayList<>(gap!=null return applyingFilter==null ? items : new ArrayList<>(gap!=null
? List.of(warning, gap) ? List.of(warning, gap)
: Collections.singletonList(warning) : Collections.singletonList(warning)

4
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
View file

@ -10,6 +10,7 @@ import org.joinmastodon.android.R;
import org.joinmastodon.android.fragments.BaseStatusListFragment; import org.joinmastodon.android.fragments.BaseStatusListFragment;
import org.joinmastodon.android.model.LegacyFilter; import org.joinmastodon.android.model.LegacyFilter;
import org.joinmastodon.android.model.Status; import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.OutlineProviders;
import java.util.List; import java.util.List;
@ -50,6 +51,9 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
filteredItems=item.filteredItems; filteredItems=item.filteredItems;
String title=item.applyingFilter.title; String title=item.applyingFilter.title;
text.setText(item.parentFragment.getString(R.string.sk_filtered, title)); text.setText(item.parentFragment.getString(R.string.sk_filtered, title));
itemView.setClipToOutline(item.inset);
itemView.setOutlineProvider(item.inset ? OutlineProviders.roundedRect(12) : null);
} }
@Override @Override

3
mastodon/src/main/res/layout/display_item_warning.xml
View file

@ -29,8 +29,7 @@
android:layout_weight="1" android:layout_weight="1"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:visibility="visible" android:visibility="visible"/>
/>
</LinearLayout> </LinearLayout>