Merge pull request #215 from skydoves/fix/overlay-padding

Fix overlay padding units (#212)
skydoves · Jul 28, 2021 · 38ae711 · 38ae711
2 parents ca41ff9 + dcd8e81
commit 38ae711
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/balloon/src/main/java/com/skydoves/balloon/Balloon.kt b/balloon/src/main/java/com/skydoves/balloon/Balloon.kt
@@ -1495,7 +1495,7 @@ class Balloon(
     @set:JvmSynthetic
     var overlayColor: Int = Color.TRANSPARENT
 
-    @JvmField @Dp
+    @JvmField @Px
     @set:JvmSynthetic
     var overlayPadding: Float = 0f
 
@@ -2182,7 +2182,7 @@ class Balloon(
     }
 
     /** sets a padding value of the overlay shape internally. */
-    fun setOverlayPadding(@Dp value: Float) = apply { this.overlayPadding = value }
+    fun setOverlayPadding(@Dp value: Float) = apply { this.overlayPadding = value.dp }
 
     /** sets a padding value of the overlay shape internally using dimension resource.. */
     fun setOverlayPaddingResource(@DimenRes value: Int) = apply {

diff --git a/balloon/src/main/java/com/skydoves/balloon/overlay/BalloonAnchorOverlayView.kt b/balloon/src/main/java/com/skydoves/balloon/overlay/BalloonAnchorOverlayView.kt
@@ -31,9 +31,7 @@ import android.util.AttributeSet
 import android.view.View
 import androidx.annotation.ColorInt
 import androidx.annotation.Px
-import com.skydoves.balloon.annotations.Dp
 import com.skydoves.balloon.extensions.dimen
-import com.skydoves.balloon.extensions.dp
 
 /**
  * BalloonAnchorOverlayView is an overlay view for highlighting an anchor
@@ -67,8 +65,8 @@ class BalloonAnchorOverlayView @JvmOverloads constructor(
   @Px private var _overlayPadding: Float = 0f
   var overlayPadding: Float
     @Px get() = _overlayPadding
-    set(@Dp value) {
-      _overlayPadding = value.dp
+    set(@Px value) {
+      _overlayPadding = value
       invalidate()
     }