Added functionality to set border

Akashkamble · Oct 21, 2018 · dde8d6f · dde8d6f
1 parent da679d2
commit dde8d6f
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 4 deletions.
diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -11,6 +11,7 @@
         android:id="@+id/revealSwitch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:showBorder="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

diff --git a/revealswitch/src/main/java/com/akash/RevealSwitch.kt b/revealswitch/src/main/java/com/akash/RevealSwitch.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.Color
 import android.graphics.PorterDuff
+import android.graphics.drawable.GradientDrawable
 import android.support.annotation.ColorInt
 import android.support.annotation.IntRange
 import android.util.AttributeSet
@@ -25,11 +26,14 @@ class RevealSwitch @JvmOverloads constructor(
     private lateinit var clickable: View
     private lateinit var revealSwitchContainer: FrameLayout
     private var isEnable: Boolean = false
+    private lateinit var border: GradientDrawable
+    private var isborderEnabled: Boolean = false
     private lateinit var typedArray: TypedArray
 
     private var enabledTrackColor: Int = Color.parseColor("#444444")
     private var disabledTrackColor: Int = Color.parseColor("#FFFFFF")
     private var animDuration: Int = 500
+    private var borderColor: Int? = null
 
     init {
         View.inflate(context, R.layout.layout_revealswitch, this).apply {
@@ -39,6 +43,7 @@ class RevealSwitch @JvmOverloads constructor(
             checkedThumb = findViewById<View>(R.id.checkedThumb)
             clickable = findViewById(R.id.clickable)
             revealSwitchContainer = findViewById(R.id.revealSwitch_Container)
+            border = clickable.background as GradientDrawable
             getAttributeSet(context, attrs)
 
         }
@@ -51,11 +56,17 @@ class RevealSwitch @JvmOverloads constructor(
         disabledTrackColor = typedArray.getColor(R.styleable.RevealSwitch_setDisabledTrackColor,
                 Color.parseColor("#FFFFFF"))
         isEnable = typedArray.getBoolean(R.styleable.RevealSwitch_setEnabled, false)
-        val duration = typedArray.getInteger(R.styleable.RevealSwitch_setAnimationDuration, 500)
-        if (duration > 1500 || duration < 500) {
+        animDuration = typedArray.getInteger(R.styleable.RevealSwitch_setAnimationDuration,
+                500)
+        isborderEnabled = typedArray.getBoolean(R.styleable.RevealSwitch_showBorder, false)
+        borderColor = typedArray.getColor(
+                R.styleable.RevealSwitch_borderColor,
+                0
+        )
+        if (animDuration > 1500 || animDuration < 500) {
             throw IllegalArgumentException("duration must be between 500 to 1500")
         } else {
-            setAnimationDuration(duration)
+            setAnimationDuration(animDuration)
         }
         setAnimationDuration(animDuration)
         setEnable(isEnable)
@@ -102,6 +113,7 @@ class RevealSwitch @JvmOverloads constructor(
     private fun revealEnableTrackAnimation() {
         isEnable = true
         unCheckedView.visibility = View.INVISIBLE
+        showBorderIfEnabled(disabledTrackColor, borderColor)
         revealSwitchContainer.background.setColorFilter(disabledTrackColor, PorterDuff.Mode.SRC_ATOP)
         checkedView.visibility = View.VISIBLE
         val x: Int = unCheckedThumb.left + unCheckedThumb.width / 2
@@ -132,6 +144,7 @@ class RevealSwitch @JvmOverloads constructor(
     private fun revealDisableTrackAnimation() {
         isEnable = false
         checkedView.visibility = View.INVISIBLE
+        showBorderIfEnabled(enabledTrackColor, borderColor)
         revealSwitchContainer.background.setColorFilter(enabledTrackColor, PorterDuff.Mode.SRC_ATOP)
         unCheckedView.visibility = View.VISIBLE
         val x: Int = checkedThumb.right - checkedThumb.width / 2
@@ -164,8 +177,22 @@ class RevealSwitch @JvmOverloads constructor(
         isEnable = isChecked
         if (isEnable) {
             unCheckedView.visibility = View.INVISIBLE
+            showBorderIfEnabled(disabledTrackColor, borderColor)
         } else {
             unCheckedView.visibility = View.VISIBLE
+            showBorderIfEnabled(enabledTrackColor, borderColor)
+        }
+    }
+
+    private fun showBorderIfEnabled(color: Int, borderColor: Int?) {
+        if (isborderEnabled) {
+            if (borderColor == 0) {
+                border.setStroke(4, color)
+            } else {
+                border.setStroke(4, borderColor!!)
+            }
+        } else {
+            border.setStroke(0, color)
         }
     }
 }
diff --git a/revealswitch/src/main/res/drawable/switch_border.xml b/revealswitch/src/main/res/drawable/switch_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="50dp"/>
+    <stroke android:color="@android:color/black" android:width="1dp"/>
+</shape>
diff --git a/revealswitch/src/main/res/layout/layout_revealswitch.xml b/revealswitch/src/main/res/layout/layout_revealswitch.xml
@@ -41,7 +41,8 @@
     <View
         android:id="@+id/clickable"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:background="@drawable/switch_border"/>
 
 
 </FrameLayout>
diff --git a/revealswitch/src/main/res/values/attrs.xml b/revealswitch/src/main/res/values/attrs.xml
@@ -5,5 +5,7 @@
         <attr name="setEnabledTrackColor" format="color"/>
         <attr name="setDisabledTrackColor" format="color"/>
         <attr name="setAnimationDuration" format="integer"/>
+        <attr name="showBorder" format="boolean"/>
+        <attr name="borderColor" format="color"/>
     </declare-styleable>
 </resources>