feat(StatusDisplayItem/WarningFiltered): apply inset

LucasGGamerM · Jul 25, 2024 · ec49575 · ec49575
1 parent af33c59
commit ec49575
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -396,6 +396,8 @@ public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment<?>
 			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)

diff --git a/.../main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java b/.../main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
@@ -10,6 +10,7 @@
 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 void onBind(WarningFilteredStatusDisplayItem item){
 			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

diff --git a/mastodon/src/main/res/layout/display_item_warning.xml b/mastodon/src/main/res/layout/display_item_warning.xml
@@ -29,8 +29,7 @@
 		android:layout_weight="1"
         android:singleLine="true"
         android:ellipsize="end"
-        android:visibility="visible"
-        />
+        android:visibility="visible"/>
 
 
 </LinearLayout>