From e66078e52e3f048445f55c24da0c9b38c70d9bd5 Mon Sep 17 00:00:00 2001 From: sk Date: Tue, 29 Aug 2023 00:53:02 +0200 Subject: [PATCH] fix poll options outline provider closes sk22#702 --- .../org/joinmastodon/android/ui/OutlineProviders.java | 10 ++++++++++ .../ui/displayitems/PollOptionStatusDisplayItem.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/OutlineProviders.java b/mastodon/src/main/java/org/joinmastodon/android/ui/OutlineProviders.java index afe2ab91e..f5c4239f0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/OutlineProviders.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/OutlineProviders.java @@ -37,6 +37,16 @@ public class OutlineProviders{ } }; + private final static int BUTTON_BG_HEIGHT=V.dp(40); + public static final ViewOutlineProvider M3_BUTTON=new ViewOutlineProvider(){ + @Override + public void getOutline(View view, Outline outline){ + int viewHeight=view.getHeight(); + int top=Math.floorDiv(viewHeight - BUTTON_BG_HEIGHT, 2); + outline.setRoundRect(0, top, view.getWidth(), top + BUTTON_BG_HEIGHT, V.dp(20)); + } + }; + public static ViewOutlineProvider roundedRect(int dp){ ViewOutlineProvider provider=roundedRects.get(dp); if(provider!=null) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java index c7739ae80..330af7921 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java @@ -79,7 +79,7 @@ public class PollOptionStatusDisplayItem extends StatusDisplayItem{ progressBg=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted, activity.getTheme()).mutate(); progressBgInset=activity.getResources().getDrawable(R.drawable.bg_poll_option_voted_inset, activity.getTheme()).mutate(); itemView.setOnClickListener(this::onButtonClick); - button.setOutlineProvider(OutlineProviders.roundedRect(24)); + button.setOutlineProvider(OutlineProviders.M3_BUTTON); button.setClipToOutline(true); }