Merge pull request #3 from pranaypatel512/development

Added support for Top and Bottom drawable click

Author: hi-manshu

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# Contributing
+
+1. Fork it!
+2. Checkout the development branch: `git checkout development`
+3. Create your feature branch: `git checkout -b my-new-feature`
+4. Add your changes to the index: `git add .`
+5. Commit your changes: `git commit -m 'Add some feature'`
+6. Push to the branch: `git push origin my-new-feature`
+7. Submit a pull request against the `development` branch

EditDrawableText.png

@@ -0,0 +1,87 @@
+<p align="center">
+<img alt="EditDrawableText" src="https://github.com/MindorksOpenSource/EditDrawableText/blob/master/app/src/main/assets/EditDrawableText.png?raw=true" />
+</p>
+
+# EditDrawableText - An EditText which makes your Drawable Clickable
+[![Mindorks](https://img.shields.io/badge/mindorks-opensource-blue.svg)](https://mindorks.com/open-source-projects)
+[![Mindorks Community](https://img.shields.io/badge/join-community-blue.svg)](https://mindorks.com/join-community)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+
+## Preview of EditDrawableText
+<img src="https://github.com/MindorksOpenSource/EditDrawableText/blob/master/app/src/main/assets/sample1.jpg?raw=true" height="300em" />&nbsp;<img src="https://github.com/MindorksOpenSource/EditDrawableText/blob/master/app/src/main/assets/sample2.jpg?raw=true" height="300em" />&nbsp;<img src="https://github.com/pranaypatel512/EditDrawableText/blob/development/app/src/main/assets/sample3.png?raw=true" height="300em" />&nbsp;<img src="https://github.com/pranaypatel512/EditDrawableText/blob/development/app/src/main/assets/sample4.png?raw=true" height="300em" />
+
+
+### Overview of EditDrawableText library
+* EditDrawableText can be used to Show/Hide Password
+* Left/Right Drawables can be clicked to make custom events like Request OTP etc.
+* All type of EditText Properties are possible in EditDrawableText
+
+
+## Using EditDrawableText Library in your Android application
+
+1. Add it in your root build.gradle at the end of repositories:
+
+```groovy
+    repositories {
+      maven { url 'https://jitpack.io' }
+    }
+```
+2. Add this in your app's build.gradle
+
+```groovy
+   implementation 'com.github.MindorksOpenSource:EditDrawableText:1.1.0'
+```
+3. To use this in XML File, use 
+
+```XML
+  <com.mindorks.editdrawabletext.EditDrawableText
+        android:id="@+id/drawableEditTextLeft"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@drawable/ic_remove_red_eye_black_24dp"
+        android:hint="Click the Drawables"
+        android:inputType="text"
+        android:textAlignment="center"
+        />
+```
+4. Make the drawable clickable in Activity file,
+```kotlin
+  drawableEditText.setDrawableClickListener(object : OnDrawableClickListener {
+            override fun onClick(target: DrawablePosition) {
+                when (target) {
+                    DrawablePosition.RIGHT -> //YOUR_LOGIC
+                    DrawablePosition.LEFT -> //YOUR_LOGIC
+                    DrawablePosition.TOP -> //YOUR_LOGIC
+                    DrawablePosition.BOTTOM -> //YOUR_LOGIC
+                }
+            }      
+    })
+
+```
+### TODO
+* Making the TOP,BOTTOM drawables clickable
+* More features related to EditText
+
+## If this library helps you in anyway, show your love :heart: by putting a :star: on this project :v:
+
+[Check out Mindorks awesome open source projects here](https://mindorks.com/open-source-projects)
+
+### License
+```
+   Copyright (C) 2018 MINDORKS NEXTGEN PRIVATE LIMITED
+
+   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.
+```
+
+### Contributing to EditDrawableText
+All pull requests are welcome, make sure to follow the [contribution guidelines](CONTRIBUTING.md) when you submit pull request.

README.md

@@ -31,11 +31,11 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     testImplementation 'junit:junit:4.12'
-    implementation 'com.github.MindorksOpenSource:EditDrawableText:1.1.0'
+//    implementation 'com.github.MindorksOpenSource:EditDrawableText:1.1.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation project(':editdrawabletext')

app/build.gradle

@@ -1,47 +1,72 @@
 package com.mindorks.editdrawabletextsample
 
+import android.app.Activity
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Toast
 import com.mindorks.editdrawabletext.DrawablePosition
-import com.mindorks.editdrawabletext.EditDrawableText
-import com.mindorks.editdrawabletext.onDrawableClickListener
+import com.mindorks.editdrawabletext.OnDrawableClickListener
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        val drawable_editText: EditDrawableText = findViewById(R.id.drawable_editText)
-        val drawable_editText_left: EditDrawableText = findViewById(R.id.drawable_editText_left)
-        onClickListeners(
-                drawable_editText,
-                drawable_editText_left
-        )
-        
+        setOnClickListeners()
     }
 
-    private fun onClickListeners(drawable_editText: EditDrawableText, drawable_editText_left: EditDrawableText) {
-        drawable_editText.setDrawableClickListener(object : onDrawableClickListener {
+    private fun setOnClickListeners() {
+        drawableEditText.setDrawableClickListener(object : OnDrawableClickListener {
             override fun onClick(target: DrawablePosition) {
                 when (target) {
                     DrawablePosition.RIGHT -> displayToastMessage("Clicked Right Drawable").show()
+                    else -> {
+                    }
                 }
             }
 
         })
-        drawable_editText_left.setDrawableClickListener(object : onDrawableClickListener {
+        drawableEditTextLeft.setDrawableClickListener(object : OnDrawableClickListener {
             override fun onClick(target: DrawablePosition) {
                 when (target) {
                     DrawablePosition.LEFT -> displayToastMessage("Clicked Left Drawable").show()
+                    else -> {
+                    }
                 }
             }
 
 
+        })
+        drawableEditTextTop.setDrawableClickListener(object : OnDrawableClickListener {
+            override fun onClick(target: DrawablePosition) {
+                when (target) {
+                    DrawablePosition.TOP -> displayToastMessage("Clicked TOP Drawable").show()
+                    else -> {
+                    }
+                }
+            }
+
+
+        })
+        drawableEditTextBottom.setDrawableClickListener(object : OnDrawableClickListener {
+            override fun onClick(target: DrawablePosition) {
+                when (target) {
+                    DrawablePosition.BOTTOM -> displayToastMessage("Clicked BOTTOM Drawable").show()
+                    else -> {
+                    }
+                }
+            }
+
+
         })
     }
-    
-    fun displayToastMessage(message: String): Toast {
-        return Toast.makeText(this@MainActivity, message, Toast.LENGTH_SHORT)
-    }
+
+}
+
+/**
+ * Extension function to show Toast in activity
+ */
+fun Activity.displayToastMessage(message: String): Toast {
+    return Toast.makeText(this, message, Toast.LENGTH_SHORT)
 }

app/src/main/assets/sample3.png

@@ -9,7 +9,7 @@
     tools:context=".MainActivity">
 
     <com.mindorks.editdrawabletext.EditDrawableText
-        android:id="@+id/drawable_editText"
+        android:id="@+id/drawableEditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawableRight="@drawable/ic_remove_red_eye_black_24dp"
@@ -21,7 +21,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
     <com.mindorks.editdrawabletext.EditDrawableText
-        android:id="@+id/drawable_editText_left"
+        android:id="@+id/drawableEditTextLeft"
         android:layout_width="match_parent"
         android:layout_marginTop="10dp"
         android:layout_height="wrap_content"
@@ -33,5 +33,31 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <com.mindorks.editdrawabletext.EditDrawableText
+        android:id="@+id/drawableEditTextTop"
+        android:layout_width="match_parent"
+        android:layout_marginTop="10dp"
+        android:layout_height="wrap_content"
+        android:drawableTop="@drawable/ic_remove_red_eye_black_24dp"
+        android:hint="@string/clickTheDrawables"
+        android:inputType="text"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+    <com.mindorks.editdrawabletext.EditDrawableText
+        android:id="@+id/drawableEditTextBottom"
+        android:layout_width="match_parent"
+        android:layout_marginTop="10dp"
+        android:layout_height="wrap_content"
+        android:drawableBottom="@drawable/ic_remove_red_eye_black_24dp"
+        android:hint="@string/clickTheDrawables"
+        android:inputType="text"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </LinearLayout>

app/src/main/assets/sample4.png

@@ -2,5 +2,7 @@ package com.mindorks.editdrawabletext
 
 enum class DrawablePosition {
     LEFT,
-    RIGHT
+    RIGHT,
+    TOP,
+    BOTTOM
 }

app/src/main/java/com/mindorks/editdrawabletextsample/MainActivity.kt

@@ -6,22 +6,23 @@ import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.widget.EditText
+import kotlin.math.abs
 
 class EditDrawableText : EditText {
-    
+
     private var drawableRight: Drawable? = null
     private var drawableLeft: Drawable? = null
     private var drawableTop: Drawable? = null
     private var drawableBottom: Drawable? = null
     private var positionX: Int = 0
     private var positionY: Int = 0
-    
-    private var onDrawableClickListener: onDrawableClickListener? = null
-    
+
+    private var onDrawableClickListener: OnDrawableClickListener? = null
+
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-    
+
     constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
-    
+
     override fun setCompoundDrawables(leftDrawable: Drawable?,
                                       topDrawable: Drawable?,
                                       rightDrawable: Drawable?,
@@ -43,34 +44,34 @@ class EditDrawableText : EditText {
             // this works for left since container shares 0,0 origin with bounds
             if (drawableLeft != null) {
                 bounds = drawableLeft!!.bounds
-                
+
                 var xClickPosition: Int
                 var yClickPosition: Int
                 /*
                  * @return pixels into dp
                  */
                 val extraClickArea = (13 * resources.displayMetrics.density + 0.5).toInt()
-                
+
                 xClickPosition = positionX
                 yClickPosition = positionY
-                
+
                 if (!bounds!!.contains(positionX, positionY)) {
                     /** Gives some extra space for tapping.  */
                     xClickPosition = positionX - extraClickArea
                     yClickPosition = positionY - extraClickArea
-                    
+
                     if (xClickPosition <= 0) xClickPosition = positionX
                     if (yClickPosition <= 0) yClickPosition = positionY
-                    
+
                     /** Creates square from the smallest value  from x or y*/
                     if (xClickPosition < yClickPosition) yClickPosition = xClickPosition
                 }
-                
+
                 if (bounds.contains(xClickPosition, yClickPosition) && onDrawableClickListener != null) {
                     onDrawableClickListener!!.onClick(DrawablePosition.LEFT)
                     event.action = MotionEvent.ACTION_CANCEL
                     return false
-                    
+
                 }
             }
 
@@ -104,14 +105,37 @@ class EditDrawableText : EditText {
                 }
                 return super.onTouchEvent(event)
             }
-            
+
+            if (drawableTop != null) {
+                bounds = drawableTop!!.bounds
+                val extraClickingArea = 13
+                if (abs((width - paddingLeft - paddingRight) / 2 + paddingLeft - positionX) <= bounds.width() / 2 + extraClickingArea) {
+                    onDrawableClickListener!!.onClick(DrawablePosition.TOP)
+                    event.action = MotionEvent.ACTION_CANCEL
+                    return false
+                }
+            }
+
+            if(drawableBottom!=null)
+            {
+                bounds = drawableBottom!!.bounds
+                val extraClickingArea = 13
+
+                if (abs((width - paddingLeft - paddingRight) / 2 + paddingLeft - positionX) <= bounds.width() / 2 + extraClickingArea) {
+                    onDrawableClickListener!!.onClick(DrawablePosition.BOTTOM)
+                    event.action = MotionEvent.ACTION_CANCEL
+                    return false
+                }
+            }
+
+
         }
         return super.onTouchEvent(event)
     }
-    
-    
-    fun setDrawableClickListener(onDrawableClickListener: onDrawableClickListener) {
-        this.onDrawableClickListener = onDrawableClickListener
+
+
+    fun setDrawableClickListener(OnDrawableClickListener: OnDrawableClickListener) {
+        this.onDrawableClickListener = OnDrawableClickListener
     }
-    
+
 }