Merge pull request #245 from skydoves/fix/radiuslayout/radius

Fix: RadiusLayout's radius receives px values instead of the dp
skydoves · Sep 22, 2021 · ef084df · ef084df
2 parents d706e56 + d0d348d
commit ef084df
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/app/src/main/java/com/skydoves/balloondemo/factory/ProfileBalloonFactory.kt b/app/src/main/java/com/skydoves/balloondemo/factory/ProfileBalloonFactory.kt
@@ -38,7 +38,7 @@ class ProfileBalloonFactory : Balloon.Factory() {
       setArrowOrientation(ArrowOrientation.TOP)
       setArrowPositionRules(ArrowPositionRules.ALIGN_ANCHOR)
       setArrowPosition(0.5f)
-      setCornerRadius(4f)
+      setCornerRadius(6f)
       setElevation(6)
       setBackgroundColorResource(R.color.background800)
       setBalloonAnimation(BalloonAnimation.CIRCULAR)

diff --git a/app/src/main/res/layout/item_custom.xml b/app/src/main/res/layout/item_custom.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
-  android:layout_marginBottom="8dp"
-  android:orientation="horizontal"
-  android:paddingLeft="5dp"
-  android:paddingRight="5dp"
-  android:paddingBottom="5dp">
+  android:background="?android:selectableItemBackground">
 
   <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/item_custom_icon"
     android:layout_width="28dp"
     android:layout_height="28dp"
     android:layout_gravity="center_vertical"
-    android:layout_marginEnd="8dp"
-    android:layout_marginRight="8dp"
+    android:layout_margin="8dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
     app:shapeAppearanceOverlay="@style/CircleImageStyle"
     tools:src="@tools:sample/avatars" />
 
@@ -25,10 +23,14 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
-    android:layout_marginStart="10dp"
-    android:layout_marginLeft="10dp"
+    android:layout_marginHorizontal="10dp"
     android:textColor="@color/white_87"
     android:textSize="15sp"
     android:textStyle="bold"
+    app:layout_constraintBottom_toBottomOf="@id/item_custom_icon"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toEndOf="@id/item_custom_icon"
+    app:layout_constraintTop_toTopOf="@id/item_custom_icon"
     tools:text="@tools:sample/full_names" />
-</LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/layout_custom_list.xml b/app/src/main/res/layout/layout_custom_list.xml
@@ -6,17 +6,16 @@
   android:layout_height="wrap_content"
   android:background="@color/background800"
   android:gravity="center"
-  android:orientation="vertical"
-  android:paddingTop="8dp">
+  android:orientation="vertical">
 
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/list_recyclerView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:overScrollMode="never"
-    android:padding="8dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+    tools:itemCount="5"
     tools:listitem="@layout/item_custom" />
 
 </LinearLayout>
diff --git a/balloon/src/main/java/com/skydoves/balloon/radius/RadiusLayout.kt b/balloon/src/main/java/com/skydoves/balloon/radius/RadiusLayout.kt
@@ -23,8 +23,6 @@ import android.graphics.RectF
 import android.util.AttributeSet
 import android.widget.FrameLayout
 import androidx.annotation.Px
-import com.skydoves.balloon.annotations.Dp
-import com.skydoves.balloon.extensions.dp
 
 /**
  * RadiusLayout clips four directions of inner layouts depending on the radius size.
@@ -42,8 +40,8 @@ class RadiusLayout @JvmOverloads constructor(
   @Px private var _radius: Float = 0f
   var radius: Float
     @Px get() = _radius
-    set(@Dp value) {
-      _radius = value.dp
+    set(@Px value) {
+      _radius = value
       invalidate()
     }