Merge pull request #813 from hemantj99/feature/custom-overlay-padding

Added BalloonOverlayPadding data class for customizable overlay paddings and done some minor refactoring.

Author: skydoves

balloon/api/balloon.api

@@ -298,7 +298,7 @@ public final class com/skydoves/balloon/Balloon$Builder {
 	public final fun getOnBalloonTouchListener ()Landroid/view/View$OnTouchListener;
 	public final fun getOverlayColor ()I
 	public final fun getOverlayGravity ()I
-	public final fun getOverlayPadding ()F
+	public final fun getOverlayPadding ()Lcom/skydoves/balloon/BalloonOverlayPadding;
 	public final fun getOverlayPaddingColor ()I
 	public final fun getOverlayPaddingShader ()Landroid/graphics/Shader;
 	public final fun getOverlayPosition ()Landroid/graphics/Point;
@@ -531,7 +531,9 @@ public final class com/skydoves/balloon/Balloon$Builder {
 	public final fun setOverlayGravity (I)Lcom/skydoves/balloon/Balloon$Builder;
 	public final synthetic fun setOverlayGravity (I)V
 	public final fun setOverlayPadding (F)Lcom/skydoves/balloon/Balloon$Builder;
-	public final synthetic fun setOverlayPadding (F)V
+	public final fun setOverlayPadding (FFFF)Lcom/skydoves/balloon/Balloon$Builder;
+	public final synthetic fun setOverlayPadding (Lcom/skydoves/balloon/BalloonOverlayPadding;)V
+	public static synthetic fun setOverlayPadding$default (Lcom/skydoves/balloon/Balloon$Builder;FFFFILjava/lang/Object;)Lcom/skydoves/balloon/Balloon$Builder;
 	public final fun setOverlayPaddingColor (I)Lcom/skydoves/balloon/Balloon$Builder;
 	public final synthetic fun setOverlayPaddingColor (I)V
 	public final fun setOverlayPaddingColorResource (I)Lcom/skydoves/balloon/Balloon$Builder;
@@ -719,6 +721,25 @@ public final class com/skydoves/balloon/BalloonKt {
 	public static final synthetic fun createBalloon (Landroid/content/Context;Lkotlin/jvm/functions/Function1;)Lcom/skydoves/balloon/Balloon;
 }
 
+public final class com/skydoves/balloon/BalloonOverlayPadding {
+	public fun <init> ()V
+	public fun <init> (FFFF)V
+	public synthetic fun <init> (FFFFILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()F
+	public final fun component2 ()F
+	public final fun component3 ()F
+	public final fun component4 ()F
+	public final fun copy (FFFF)Lcom/skydoves/balloon/BalloonOverlayPadding;
+	public static synthetic fun copy$default (Lcom/skydoves/balloon/BalloonOverlayPadding;FFFFILjava/lang/Object;)Lcom/skydoves/balloon/BalloonOverlayPadding;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getBottom ()F
+	public final fun getLeft ()F
+	public final fun getRight ()F
+	public final fun getTop ()F
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class com/skydoves/balloon/BalloonPersistence {
 	public static final field Companion Lcom/skydoves/balloon/BalloonPersistence$Companion;
 	public final fun clearAllPreferences ()V
@@ -991,15 +1012,15 @@ public final class com/skydoves/balloon/overlay/BalloonAnchorOverlayView : andro
 	public final fun getAnchorViewList ()Ljava/util/List;
 	public final fun getBalloonOverlayShape ()Lcom/skydoves/balloon/overlay/BalloonOverlayShape;
 	public final fun getOverlayColor ()I
-	public final fun getOverlayPadding ()F
+	public final fun getOverlayPadding ()Lcom/skydoves/balloon/BalloonOverlayPadding;
 	public final fun getOverlayPaddingColor ()I
 	public final fun getOverlayPaddingShader ()Landroid/graphics/Shader;
 	public final fun getOverlayPosition ()Landroid/graphics/Point;
 	public final fun setAnchorView (Landroid/view/View;)V
 	public final fun setAnchorViewList (Ljava/util/List;)V
 	public final fun setBalloonOverlayShape (Lcom/skydoves/balloon/overlay/BalloonOverlayShape;)V
 	public final fun setOverlayColor (I)V
-	public final fun setOverlayPadding (F)V
+	public final fun setOverlayPadding (Lcom/skydoves/balloon/BalloonOverlayPadding;)V
 	public final fun setOverlayPaddingColor (I)V
 	public final fun setOverlayPaddingShader (Landroid/graphics/Shader;)V
 	public final fun setOverlayPosition (Landroid/graphics/Point;)V

balloon/src/main/kotlin/com/skydoves/balloon/Balloon.kt

@@ -34,7 +34,6 @@ import android.graphics.Rect
 import android.graphics.Shader
 import android.graphics.Typeface
 import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Handler
@@ -64,9 +63,12 @@ import androidx.annotation.MainThread
 import androidx.annotation.Px
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
+import androidx.core.graphics.createBitmap
+import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.ViewCompat
 import androidx.core.view.forEach
 import androidx.core.view.get
+import androidx.core.view.isNotEmpty
 import androidx.core.view.updateLayoutParams
 import androidx.core.widget.ImageViewCompat
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -322,10 +324,7 @@ public class Balloon private constructor(
   /** Returns [BitmapDrawable] that will be used for the foreground of the arrow. */
   private fun ImageView.getArrowForeground(x: Float, y: Float): BitmapDrawable? {
     return if (builder.arrowColorMatchBalloon && isAPILevelHigherThan23()) {
-      BitmapDrawable(
-        resources,
-        adjustArrowColorByMatchingCardBackground(this, x, y),
-      )
+      adjustArrowColorByMatchingCardBackground(this, x, y).toDrawable(resources)
     } else {
       null
     }
@@ -364,7 +363,7 @@ public class Balloon private constructor(
     val endColor = colors.second
 
     val updatedBitmap =
-      Bitmap.createBitmap(oldBitmap.width, oldBitmap.height, Bitmap.Config.ARGB_8888)
+      createBitmap(oldBitmap.width, oldBitmap.height)
     val canvas = Canvas(updatedBitmap)
     canvas.drawBitmap(oldBitmap, 0f, 0f, null)
     val paint = Paint()
@@ -423,7 +422,7 @@ public class Balloon private constructor(
   }
 
   private fun drawableToBitmap(drawable: Drawable, width: Int, height: Int): Bitmap {
-    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+    val bitmap = createBitmap(width, height)
     val canvas = Canvas(bitmap)
     drawable.setBounds(0, 0, canvas.width, canvas.height)
     drawable.draw(canvas)
@@ -563,7 +562,7 @@ public class Balloon private constructor(
     with(this.bodyWindow) {
       isOutsideTouchable = true
       isFocusable = builder.isFocusable
-      setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+      setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
       elevation = builder.elevation
       setIsAttachedInDecor(builder.isAttachedInDecor)
     }
@@ -1275,7 +1274,7 @@ public class Balloon private constructor(
   ): Balloon = relay(
     balloon,
   ) {
-    it.showAlignRight(anchor, xOff, yOff)
+    it.showAlignEnd(anchor, xOff, yOff)
   }
 
   /**
@@ -1376,7 +1375,7 @@ public class Balloon private constructor(
     xOff: Int = 0,
     yOff: Int = 0,
   ): Balloon =
-    relay(balloon) { it.showAlignLeft(anchor, xOff, yOff) }
+    relay(balloon) { it.showAlignStart(anchor, xOff, yOff) }
 
   /**
    * Shows the balloon on an anchor view as the start alignment with x-off and y-off
@@ -1696,7 +1695,7 @@ public class Balloon private constructor(
   @InternalBalloonApi
   public fun updateSizeOfBalloonCard(width: Int, height: Int) {
     builder.setMeasuredWidth(width)
-    if (binding.balloonCard.childCount != 0) {
+    if (binding.balloonCard.isNotEmpty()) {
       val child = binding.balloonCard[0]
       child.updateLayoutParams {
         this.width = width
@@ -2247,7 +2246,7 @@ public class Balloon private constructor(
 
     @Px
     @set:JvmSynthetic
-    public var overlayPadding: Float = 0f
+    public var overlayPadding: BalloonOverlayPadding = BalloonOverlayPadding()
 
     @ColorInt
     @set:JvmSynthetic
@@ -2995,12 +2994,24 @@ public class Balloon private constructor(
     }
 
     /** sets a padding value of the overlay shape internally. */
-    public fun setOverlayPadding(@Dp value: Float): Builder =
-      apply { this.overlayPadding = value.dp }
+    public fun setOverlayPadding(@Dp value: Float): Builder = apply {
+      this.overlayPadding = BalloonOverlayPadding(value.dp, value.dp, value.dp, value.dp)
+    }
+
+    /** sets directional padding on the overlay shape. */
+    public fun setOverlayPadding(
+      @Dp left: Float = 0f,
+      @Dp top: Float = 0f,
+      @Dp right: Float = 0f,
+      @Dp bottom: Float = 0f,
+    ): Builder = apply {
+      this.overlayPadding = BalloonOverlayPadding(left.dp, top.dp, right.dp, bottom.dp)
+    }
 
-    /** sets a padding value of the overlay shape internally using dimension resource.. */
+    /** Sets a uniform padding for the overlay shape using a dimension resource. */
     public fun setOverlayPaddingResource(@DimenRes value: Int): Builder = apply {
-      this.overlayPadding = context.dimen(value)
+      val padding = context.dimen(value)
+      this.overlayPadding = BalloonOverlayPadding(padding, padding, padding, padding)
     }
 
     /** sets color of the overlay padding. */

balloon/src/main/kotlin/com/skydoves/balloon/BalloonOverlayPadding.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2019 skydoves
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.skydoves.balloon
+
+import com.skydoves.balloon.annotations.InternalBalloonApi
+
+/**
+ * Represents padding values to be applied around a [Balloon] overlay.
+ *
+ * @property left The padding on the left side in pixels.
+ * @property top The padding on the top side in pixels.
+ * @property right The padding on the right side in pixels.
+ * @property bottom The padding on the bottom side in pixels.
+ */
+@InternalBalloonApi
+public data class BalloonOverlayPadding(
+  val left: Float = 0f,
+  val top: Float = 0f,
+  val right: Float = 0f,
+  val bottom: Float = 0f,
+)

balloon/src/main/kotlin/com/skydoves/balloon/overlay/BalloonAnchorOverlayView.kt

@@ -31,7 +31,8 @@ import android.graphics.Shader
 import android.util.AttributeSet
 import android.view.View
 import androidx.annotation.ColorInt
-import androidx.annotation.Px
+import androidx.core.graphics.createBitmap
+import com.skydoves.balloon.BalloonOverlayPadding
 import com.skydoves.balloon.extensions.dimen
 import com.skydoves.balloon.internals.viewProperty
 
@@ -63,8 +64,7 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
   public var overlayPaddingShader: Shader? by viewProperty(null)
 
   /** padding value of the internal overlay shape. */
-  @get:Px
-  public var overlayPadding: Float by viewProperty(0f)
+  public var overlayPadding: BalloonOverlayPadding by viewProperty(BalloonOverlayPadding())
 
   /** specific position of the overlay shape. */
   public var overlayPosition: Point? by viewProperty(null)
@@ -114,7 +114,7 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
       localBitmap.recycle()
     }
 
-    localBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+    localBitmap = createBitmap(width, height)
     bitmap = localBitmap
 
     val canvas = Canvas(localBitmap)
@@ -133,7 +133,7 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
     paddingColorPaint.apply {
       color = overlayPaddingColor
       style = Paint.Style.STROKE
-      strokeWidth = overlayPadding
+      strokeWidth = overlayPadding.top
       shader = overlayPaddingShader
     }
 
@@ -154,21 +154,27 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
       anchor.getGlobalVisibleRect(rect)
       val anchorRect = overlayPosition?.let { position ->
         RectF(
-          position.x - overlayPadding,
-          position.y - overlayPadding + getStatusBarHeight(),
-          position.x + anchor.width + overlayPadding,
-          position.y + anchor.height + overlayPadding + getStatusBarHeight(),
+          position.x - overlayPadding.left,
+          position.y - overlayPadding.top + getStatusBarHeight(),
+          position.x + anchor.width + overlayPadding.right,
+          position.y + anchor.height + overlayPadding.bottom + getStatusBarHeight(),
         )
       } ?: RectF(
-        rect.left - overlayPadding,
-        rect.top - overlayPadding,
-        rect.right + overlayPadding,
-        rect.bottom + overlayPadding,
+        rect.left - overlayPadding.left,
+        rect.top - overlayPadding.top,
+        rect.right + overlayPadding.right,
+        rect.bottom + overlayPadding.bottom,
+      )
+
+      val halfOverlayPadding = BalloonOverlayPadding(
+        top = overlayPadding.top / 2,
+        bottom = overlayPadding.bottom / 2,
+        left = overlayPadding.left / 2,
+        right = overlayPadding.right / 2,
       )
 
-      val halfOfOverlayPadding = overlayPadding / 2
       val anchorPaddingRect = RectF(anchorRect).apply {
-        inset(halfOfOverlayPadding, halfOfOverlayPadding)
+        inset(halfOverlayPadding.left, halfOverlayPadding.top)
       }
 
       when (val overlay = balloonOverlayShape) {
@@ -189,21 +195,22 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
             canvas.drawCircle(
               anchorPaddingRect.centerX(),
               anchorPaddingRect.centerY(),
-              radius - halfOfOverlayPadding,
+              radius - overlayPadding.top / 2,
               paddingColorPaint,
             )
           }
           overlay.radiusRes?.let { radiusRes ->
+            val resolvedRadius = context.dimen(radiusRes)
             canvas.drawCircle(
               anchorRect.centerX(),
               anchorRect.centerY(),
-              context.dimen(radiusRes),
+              resolvedRadius,
               paint,
             )
             canvas.drawCircle(
               anchorPaddingRect.centerX(),
               anchorPaddingRect.centerY(),
-              context.dimen(radiusRes) - halfOfOverlayPadding,
+              resolvedRadius - overlayPadding.top / 2,
               paddingColorPaint,
             )
           }
@@ -214,22 +221,24 @@ public class BalloonAnchorOverlayView @JvmOverloads constructor(
             canvas.drawRoundRect(anchorRect, radiusPair.first, radiusPair.second, paint)
             canvas.drawRoundRect(
               anchorPaddingRect,
-              radiusPair.first - halfOfOverlayPadding,
-              radiusPair.second - halfOfOverlayPadding,
+              radiusPair.first - overlayPadding.left / 2,
+              radiusPair.second - overlayPadding.top / 2,
               paddingColorPaint,
             )
           }
           overlay.radiusResPair?.let { radiusResPair ->
+            val radiusX = context.dimen(radiusResPair.first)
+            val radiusY = context.dimen(radiusResPair.second)
             canvas.drawRoundRect(
               anchorRect,
-              context.dimen(radiusResPair.first),
-              context.dimen(radiusResPair.second),
+              radiusX,
+              radiusY,
               paint,
             )
             canvas.drawRoundRect(
               anchorPaddingRect,
-              context.dimen(radiusResPair.first) - halfOfOverlayPadding,
-              context.dimen(radiusResPair.second) - halfOfOverlayPadding,
+              radiusX - overlayPadding.left / 2,
+              radiusY - overlayPadding.top / 2,
               paddingColorPaint,
             )
           }