Merge pull request #114 from Alfons109/issue-112-rounded-corner

issue-112-support-for-rounded-corner

Author: douglasjunior

library/src/main/java/io/github/douglasjunior/androidSimpleTooltip/OverlayView.java

@@ -46,6 +46,7 @@ public class OverlayView extends View {
 
     public static final int HIGHLIGHT_SHAPE_OVAL = 0;
     public static final int HIGHLIGHT_SHAPE_RECTANGULAR = 1;
+    public static final int HIGHLIGHT_SHAPE_RECTANGULAR_ROUNDED = 2;
     private static final int mDefaultOverlayAlphaRes = R.integer.simpletooltip_overlay_alpha;
 
 
@@ -56,13 +57,15 @@ public class OverlayView extends View {
     private final int highlightShape;
     private final float mOffset;
     private final int overlayWindowBackground;
+    private final float cornerRadius;
 
-    OverlayView(Context context, View anchorView, int highlightShape, float offset,int overlayWindowBackground) {
+    OverlayView(Context context, View anchorView, int highlightShape, float offset,int overlayWindowBackground, float cornerRadius) {
         super(context);
         this.mAnchorView = anchorView;
         this.mOffset = offset;
         this.highlightShape = highlightShape;
         this.overlayWindowBackground=overlayWindowBackground;
+        this.cornerRadius = cornerRadius;
     }
 
     @Override
@@ -106,6 +109,8 @@ private void createWindowFrame() {
 
         if (highlightShape == HIGHLIGHT_SHAPE_RECTANGULAR) {
             osCanvas.drawRect(rect, paint);
+        } else if (highlightShape == HIGHLIGHT_SHAPE_RECTANGULAR_ROUNDED) {
+            osCanvas.drawRoundRect(rect, cornerRadius, cornerRadius, paint);
         } else {
             osCanvas.drawOval(rect, paint);
         }

library/src/main/java/io/github/douglasjunior/androidSimpleTooltip/SimpleTooltip.java

@@ -125,6 +125,7 @@ public class SimpleTooltip implements PopupWindow.OnDismissListener {
     private int width;
     private int height;
     private boolean mIgnoreOverlay;
+    private float cornerRadius;
 
 
     private SimpleTooltip(Builder builder) {
@@ -160,6 +161,7 @@ private SimpleTooltip(Builder builder) {
         mIgnoreOverlay = builder.ignoreOverlay;
         this.width = builder.width;
         this.height = builder.height;
+        this.cornerRadius = builder.cornerRadius;
         init();
     }
 
@@ -230,7 +232,7 @@ private void createOverlay() {
         if (mIgnoreOverlay) {
             return;
         }
-        mOverlay = mTransparentOverlay ? new View(mContext) : new OverlayView(mContext, mAnchorView, mHighlightShape, mOverlayOffset,mOverlayWindowBackgroundColor);
+        mOverlay = mTransparentOverlay ? new View(mContext) : new OverlayView(mContext, mAnchorView, mHighlightShape, mOverlayOffset,mOverlayWindowBackgroundColor, cornerRadius);
         if (mOverlayMatchParent)
             mOverlay.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         else
@@ -602,6 +604,7 @@ public static class Builder {
         private float arrowHeight;
         private float arrowWidth;
         private boolean focusable;
+        private float cornerRadius;
         private int highlightShape = OverlayView.HIGHLIGHT_SHAPE_OVAL;
         private int width = ViewGroup.LayoutParams.WRAP_CONTENT;
         private int height = ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -661,7 +664,7 @@ public SimpleTooltip build() throws IllegalArgumentException {
                 if (arrowHeight == 0)
                     arrowHeight = context.getResources().getDimension(mDefaultArrowHeightRes);
             }
-            if (highlightShape < 0 || highlightShape > OverlayView.HIGHLIGHT_SHAPE_RECTANGULAR) {
+            if (highlightShape < 0 || highlightShape > OverlayView.HIGHLIGHT_SHAPE_RECTANGULAR_ROUNDED) {
                 highlightShape = OverlayView.HIGHLIGHT_SHAPE_OVAL;
             }
             if (overlayOffset < 0) {
@@ -1101,6 +1104,11 @@ public Builder highlightShape(int highlightShape) {
             return this;
         }
 
+        public Builder cornerRadius(float radius) {
+            this.cornerRadius = radius;
+            return this;
+        }
+
         /**
          * <div class="pt">Tamanho da margem entre {@link Builder#anchorView(View)} e a borda do Shape de destaque.
          * Este valor sobrescreve <tt>{@link R.dimen.simpletooltip_overlay_offset}</tt></div>

sample/src/main/java/io/github/douglasjunior/androidSimpleTooltip/sample/MainActivity.java

@@ -71,6 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btn_dialog).setOnClickListener(this);
         findViewById(R.id.btn_center).setOnClickListener(this);
         findViewById(R.id.btn_overlay_rect).setOnClickListener(this);
+        findViewById(R.id.btn_overlay_rect_rounded).setOnClickListener(this);
     }
 
     @Override
@@ -261,6 +262,19 @@ public void onClick(View v) {
                     .animated(true)
                     .transparentOverlay(false)
                     .highlightShape(OverlayView.HIGHLIGHT_SHAPE_RECTANGULAR)
+                    .cornerRadius(20)
+                    .overlayOffset(0)
+                    .build()
+                    .show();
+        } else if (v.getId() == R.id.btn_overlay_rect_rounded) {
+            new SimpleTooltip.Builder(this)
+                    .anchorView(v)
+                    .text(R.string.btn_overlay_rect_rounded)
+                    .gravity(Gravity.END)
+                    .animated(true)
+                    .transparentOverlay(false)
+                    .highlightShape(OverlayView.HIGHLIGHT_SHAPE_RECTANGULAR_ROUNDED)
+                    .cornerRadius(20)
                     .overlayOffset(0)
                     .build()
                     .show();

sample/src/main/res/layout/activity_main.xml

@@ -120,6 +120,13 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="start"
                 android:text="@string/btn_overlay_rect" />
+
+            <Button
+                android:id="@+id/btn_overlay_rect_rounded"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:text="@string/btn_overlay_rect_rounded" />
         </LinearLayout>
     </ScrollView>
 

sample/src/main/res/values/strings.xml

@@ -20,5 +20,6 @@
     <string name="btn_dialog">Inside dialog</string>
     <string name="btn_center">Screen center</string>
     <string name="btn_overlay_rect">Overlay Rect</string>
+    <string name="btn_overlay_rect_rounded">Overlay Rect Rounded</string>
 
 </resources>