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

round inset notifications

Browse Source 
closes sk22#665
This commit is contained in:
sk
2023-07-18 12:54:04 +02:00
parent ee0048a406
commit 8d55f62da9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
View File

@@ -27,7 +27,7 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
public InsetStatusItemDecoration(BaseStatusListFragment<?> listFragment){ public InsetStatusItemDecoration(BaseStatusListFragment<?> listFragment){
this.listFragment=listFragment; this.listFragment=listFragment;
bgColor=UiUtils.getThemeColor(listFragment.getActivity(), R.attr.colorM3SurfaceVariant); bgColor=UiUtils.getThemeColor(listFragment.getActivity(), R.attr.colorM3Surface);
borderColor=UiUtils.getThemeColor(listFragment.getActivity(), R.attr.colorM3OutlineVariant); borderColor=UiUtils.getThemeColor(listFragment.getActivity(), R.attr.colorM3OutlineVariant);
} }
@@ -65,13 +65,13 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
paint.setColor(bgColor); paint.setColor(bgColor);
rect.left=V.dp(12); rect.left=V.dp(12);
rect.right=list.getWidth()-V.dp(12); rect.right=list.getWidth()-V.dp(12);
rect.inset(V.dp(4), V.dp(4)); rect.inset(V.dp(4), V.dp(0));
c.drawRoundRect(rect, V.dp(4), V.dp(4), paint); c.drawRoundRect(rect, V.dp(12), V.dp(12), paint);
paint.setStyle(Paint.Style.STROKE); paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(V.dp(1)); paint.setStrokeWidth(V.dp(1));
paint.setColor(borderColor); paint.setColor(borderColor);
rect.inset(paint.getStrokeWidth()/2f, paint.getStrokeWidth()/2f); rect.inset(paint.getStrokeWidth()/2f, paint.getStrokeWidth()/2f);
c.drawRoundRect(rect, V.dp(4), V.dp(4), paint); c.drawRoundRect(rect, V.dp(12), V.dp(12), paint);
} }
@Override @Override
@@ -85,10 +85,10 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
boolean topSiblingInset=pos>0 && displayItems.get(pos-1).inset; boolean topSiblingInset=pos>0 && displayItems.get(pos-1).inset;
boolean bottomSiblingInset=pos<displayItems.size()-1 && displayItems.get(pos+1).inset; boolean bottomSiblingInset=pos<displayItems.size()-1 && displayItems.get(pos+1).inset;
int pad; int pad;
if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder) // if(holder instanceof MediaGridStatusDisplayItem.Holder || holder instanceof LinkCardStatusDisplayItem.Holder)
pad=V.dp(16); pad=V.dp(16);
else // else
pad=V.dp(12); // pad=V.dp(12);
boolean insetLeft=true, insetRight=true; boolean insetLeft=true, insetRight=true;
if(insetLeft) if(insetLeft)
outRect.left=pad; outRect.left=pad;
@@ -97,7 +97,7 @@ public class InsetStatusItemDecoration extends RecyclerView.ItemDecoration{
// had to comment this out because animations with offsets aren't handled properly. // had to comment this out because animations with offsets aren't handled properly.
// can be worked around by manually applying top margins to items // can be worked around by manually applying top margins to items
// see InsetDummyStatusDisplayItem#onBinds // see InsetDummyStatusDisplayItem#onBind
// if(!topSiblingInset) // if(!topSiblingInset)
// outRect.top=pad; // outRect.top=pad;
// if(!bottomSiblingInset) // if(!bottomSiblingInset)