Improved setting padding

jahirfiquitiva · Dec 28, 2018 · 376c5eb · 376c5eb
1 parent cceb4ae
commit 376c5eb
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 40 deletions.
diff --git a/.idea/copyright/CC_BY_SA.xml b/.idea/copyright/CC_BY_SA.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':library')
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.10'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.11'
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -67,7 +67,6 @@
         android:layout_width="wrap_content"
         android:layout_height="48dp"
         android:minWidth="120dp"
-        android:background="@drawable/gradient"
         app:chipIcon="@drawable/ic_palette"
         app:chipText="FAB?"
         app:chipTextColor="#fff"

diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.11'
     repositories {
         google()
         jcenter()

diff --git a/library/build.gradle b/library/build.gradle
@@ -66,7 +66,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.10'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.11'
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
 }

diff --git a/library/src/main/kotlin/com/jahirfiquitiva/chip/ChipView.kt b/library/src/main/kotlin/com/jahirfiquitiva/chip/ChipView.kt
@@ -168,6 +168,9 @@ open class ChipView @JvmOverloads constructor(
             val properWidth = if (measuredWidth < minWidth) minWidth else measuredWidth
             setMeasuredDimension(properWidth, properHeight)
             if (radius < 0F) radius = (properHeight / 2.0F)
+            val horPadding = (radius / 2.0F).roundToInt()
+            setPaddingHorizontal(horPadding)
+            setPaddingVertical((horPadding / 2.0F).roundToInt())
             if (contentFillsChip) {
                 contentLayout?.minimumWidth = properWidth
                 contentLayout?.minimumHeight = properHeight
@@ -305,6 +308,34 @@ open class ChipView @JvmOverloads constructor(
         contentLayout?.setPadding(left, top, right, bottom)
     }
 
+    fun setPaddingLeft(left: Int) {
+        contentLayout?.setPaddingLeft(left)
+    }
+
+    fun setPaddingTop(padding: Int) {
+        contentLayout?.setPaddingTop(padding)
+    }
+
+    fun setPaddingRight(padding: Int) {
+        contentLayout?.setPaddingRight(padding)
+    }
+
+    fun setPaddingBottom(padding: Int) {
+        contentLayout?.setPaddingBottom(padding)
+    }
+
+    fun setPaddingHorizontal(padding: Int) {
+        contentLayout?.setPaddingHorizontal(padding)
+    }
+
+    fun setPaddingVertical(padding: Int) {
+        contentLayout?.setPaddingVertical(padding)
+    }
+
+    fun setPadding(padding: Int) {
+        contentLayout?.setPadding(padding)
+    }
+
     private fun internalSetBackground() {
         val fgResId: Int = try {
             val attrs = intArrayOf(R.attr.selectableItemBackground)

diff --git a/library/src/main/kotlin/com/jahirfiquitiva/chip/Extensions.kt b/library/src/main/kotlin/com/jahirfiquitiva/chip/Extensions.kt
@@ -17,8 +17,10 @@ package com.jahirfiquitiva.chip
 
 import android.content.res.Resources
 import android.graphics.Color
+import android.view.View
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
+import androidx.customview.widget.ViewDragHelper
 
 /**
  * Created by Allan Wang
@@ -53,4 +55,34 @@ internal fun Int.darken(
     val (red, green, blue) = intArrayOf(Color.red(this), Color.green(this), Color.blue(this))
         .map { (it * (1f - factor)).toInt() }
     return Color.argb(Color.alpha(this), red, green, blue)
-}
+}
+
+internal fun View.setPaddingLeft(padding: Int) = setPadding(padding, KAU_LEFT)
+
+internal fun View.setPaddingTop(padding: Int) = setPadding(padding, KAU_TOP)
+
+internal fun View.setPaddingRight(padding: Int) = setPadding(padding, KAU_RIGHT)
+
+internal fun View.setPaddingBottom(padding: Int) = setPadding(padding, KAU_BOTTOM)
+
+internal fun View.setPaddingHorizontal(padding: Int) = setPadding(padding, KAU_HORIZONTAL)
+
+internal fun View.setPaddingVertical(padding: Int) = setPadding(padding, KAU_VERTICAL)
+
+internal fun View.setPadding(padding: Int) = setPadding(padding, KAU_ALL)
+
+private fun View.setPadding(padding: Int, flag: Int) {
+    setPadding(
+        if (flag and KAU_LEFT > 0) padding else paddingLeft,
+        if (flag and KAU_TOP > 0) padding else paddingTop,
+        if (flag and KAU_RIGHT > 0) padding else paddingRight,
+        if (flag and KAU_BOTTOM > 0) padding else paddingBottom)
+}
+
+private const val KAU_LEFT = ViewDragHelper.EDGE_LEFT
+private const val KAU_RIGHT = ViewDragHelper.EDGE_RIGHT
+private const val KAU_TOP = ViewDragHelper.EDGE_TOP
+private const val KAU_BOTTOM = ViewDragHelper.EDGE_BOTTOM
+private const val KAU_HORIZONTAL = KAU_LEFT or KAU_RIGHT
+private const val KAU_VERTICAL = KAU_TOP or KAU_BOTTOM
+private const val KAU_ALL = KAU_HORIZONTAL or KAU_VERTICAL
diff --git a/library/src/main/res/layout/chip.xml b/library/src/main/res/layout/chip.xml
@@ -42,7 +42,6 @@
         android:orientation="horizontal"
         android:layout_gravity="center"
         android:gravity="center"
-        android:padding="4dp"
         android:clipToPadding="false"
         android:clipChildren="false"
         android:animateLayoutChanges="true"