Merge branch 'master' of https://github.com/swapnil1104/OtpEditText into 1_hide_input_text

swapnil1104 · swapnil1104 · commit 3da72cd359ef · 2019-07-11T20:44:40.000+05:30
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at swapniltiwari775@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/LICENSE.MD b/LICENSE.MD
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Swapnil Tiwari
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -21,11 +21,9 @@
         android:clickable="false"
         android:cursorVisible="false"
         android:digits="0123456789"
-        android:padding="32dp"
         android:inputType="number"
-        app:oev_primary_color="@android:color/holo_blue_dark"
-        app:oev_secondary_color="@android:color/holo_orange_light"
         android:maxLength="6"
+        android:padding="32dp"
         android:textSize="30sp"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/images/demo2.gif b/images/demo2.gif
diff --git a/otpedittext2/src/main/java/com/broooapps/otpedittext2/OtpEditText.java b/otpedittext2/src/main/java/com/broooapps/otpedittext2/OtpEditText.java
@@ -8,12 +8,10 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.Editable;
-import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -23,25 +21,31 @@
 
 public class OtpEditText extends AppCompatEditText {
     public static final String XML_NAMESPACE_ANDROID = "http://schemas.android.com/apk/res/android";
-    private int defStyleAttr = 0;
-
-    private float mSpace = 8; //24 dp by default, space between the lines
-    private float mCharSize;
-    private float mNumChars = 6;
-    private float mLineSpacing = 10; //8dp by default, height of the text from our lines
-    private int mMaxLength = 6;
 
     private OnClickListener mClickListener;
 
-    private float mLineStroke = 1; //1dp by default
-    private float mLineStrokeSelected = 2; //2dp by default
     private Paint mLinesPaint;
+    private Paint mStrokePaint;
 
-    private int mMainColor;
+    private int defStyleAttr = 0;
+    private int mMaxLength = 6;
+    private int mPrimaryColor;
     private int mSecondaryColor;
     private int mTextColor;
 
-    private Paint mStrokePaint;
+    private float mLineStrokeSelected = 2; //2dp by default
+    private float mLineStroke = 1; //1dp by default
+    private float mSpace = 8; //24 dp by default, space between the lines
+    private float mCharSize;
+    private float mNumChars = 6;
+    private float mLineSpacing = 10; //8dp by default, height of the text from our lines
+
+    private String mBoxStyle;
+
+    private final String ROUNDED_BOX = "rounded_box";
+    private final String UNDERLINE = "underline";
+    private final String SQUARE_BOX = "square_box";
+    private final String ROUNDED_UNDERLINE = "rounded_underline";
 
     public OtpEditText(Context context) {
         super(context);
@@ -65,11 +69,10 @@ private void init(Context context, AttributeSet attrs) {
         float multi = context.getResources().getDisplayMetrics().density;
         mLineStroke = multi * mLineStroke;
         mLineStrokeSelected = multi * mLineStrokeSelected;
+
         mLinesPaint = new Paint(getPaint());
-        mStrokePaint = new Paint(getPaint());
-        mStrokePaint.setStrokeWidth(4);
-        mStrokePaint.setStyle(Paint.Style.STROKE);
         mLinesPaint.setStrokeWidth(mLineStroke);
+
         setBackgroundResource(0);
         mSpace = multi * mSpace; //convert to pixels for our density
         mNumChars = mMaxLength;
@@ -108,9 +111,41 @@ private void getAttrsFromTypedArray(AttributeSet attributeSet) {
         final TypedArray a = getContext().obtainStyledAttributes(attributeSet, R.styleable.OtpEditText, defStyleAttr, 0);
 
         mMaxLength = attributeSet.getAttributeIntValue(XML_NAMESPACE_ANDROID, "maxLength", 4);
-        mMainColor = a.getColor(R.styleable.OtpEditText_oev_primary_color, getResources().getColor(android.R.color.holo_red_dark));
+        mPrimaryColor = a.getColor(R.styleable.OtpEditText_oev_primary_color, getResources().getColor(android.R.color.holo_red_dark));
         mSecondaryColor = a.getColor(R.styleable.OtpEditText_oev_secondary_color, getResources().getColor(R.color.light_gray));
         mTextColor = a.getColor(R.styleable.OtpEditText_oev_text_color, getResources().getColor(android.R.color.black));
+        mBoxStyle = a.getString(R.styleable.OtpEditText_oev_box_style);
+
+        if (mBoxStyle != null && !mBoxStyle.isEmpty()) {
+            switch (mBoxStyle) {
+                case UNDERLINE:
+                case ROUNDED_UNDERLINE:
+                    mStrokePaint = new Paint(getPaint());
+                    mStrokePaint.setStrokeWidth(4);
+                    mStrokePaint.setStyle(Paint.Style.FILL);
+                    break;
+
+                case SQUARE_BOX:
+                case ROUNDED_BOX:
+                    mStrokePaint = new Paint(getPaint());
+                    mStrokePaint.setStrokeWidth(4);
+                    mStrokePaint.setStyle(Paint.Style.STROKE);
+                    break;
+
+                default:
+                    mStrokePaint = new Paint(getPaint());
+                    mStrokePaint.setStrokeWidth(4);
+                    mStrokePaint.setStyle(Paint.Style.FILL);
+
+                    mBoxStyle = UNDERLINE;
+            }
+        } else {
+            mStrokePaint = new Paint(getPaint());
+            mStrokePaint.setStrokeWidth(4);
+            mStrokePaint.setStyle(Paint.Style.FILL);
+
+            mBoxStyle = UNDERLINE;
+        }
 
         a.recycle();
     }
@@ -147,15 +182,34 @@ protected void onDraw(Canvas canvas) {
         getPaint().getTextWidths(getText(), 0, textLength, textWidths);
 
         for (int i = 0; i < mNumChars; i++) {
-            updateColorForLines(i <= textLength, i == textLength, getText().length(), (int) mNumChars);
-            canvas.drawLine(startX, bottom, startX + mCharSize, bottom, mLinesPaint);
-
-            try {
-                canvas.drawRoundRect(startX, top, startX + mCharSize, bottom, 8, 8, mLinesPaint);
-                canvas.drawRoundRect(startX, top, startX + mCharSize, bottom, 8, 8, mStrokePaint);
-            } catch (NoSuchMethodError err) {
-                canvas.drawRect(startX, top, startX + mCharSize, bottom, mLinesPaint);
-                canvas.drawRect(startX, top, startX + mCharSize, bottom, mStrokePaint);
+            updateColorForLines(i <= textLength, i == textLength);
+
+            switch (mBoxStyle) {
+                case ROUNDED_UNDERLINE:
+                    try {
+                        canvas.drawRoundRect(startX, bottom * .95f, startX + mCharSize, bottom, 16, 16, mStrokePaint);
+                    } catch (NoSuchMethodError err) {
+                        canvas.drawRect(startX, bottom * .95f, startX + mCharSize, bottom, mStrokePaint);
+                    }
+                    break;
+                case ROUNDED_BOX:
+                    try {
+                        canvas.drawRoundRect(startX, top, startX + mCharSize, bottom, 8, 8, mLinesPaint);
+                        canvas.drawRoundRect(startX, top, startX + mCharSize, bottom, 8, 8, mStrokePaint);
+                    } catch (NoSuchMethodError err) {
+                        canvas.drawRect(startX, top, startX + mCharSize, bottom, mLinesPaint);
+                        canvas.drawRect(startX, top, startX + mCharSize, bottom, mStrokePaint);
+                    }
+                    break;
+
+                case UNDERLINE:
+                    canvas.drawRect(startX, ((float) bottom * .95f), startX + mCharSize, bottom, mStrokePaint);
+                    break;
+
+                case SQUARE_BOX:
+                    canvas.drawRect(startX, top, startX + mCharSize, bottom, mLinesPaint);
+                    canvas.drawRect(startX, top, startX + mCharSize, bottom, mStrokePaint);
+                    break;
             }
             if (getText().length() > i) {
                 float middle = startX + mCharSize / 2;
@@ -173,7 +227,7 @@ protected void onDraw(Canvas canvas) {
     /**
      * @param next Is the current char the next character to be input?
      */
-    private void updateColorForLines(boolean next, boolean current, int textSize, int totalSize) {
+    private void updateColorForLines(boolean next, boolean current) {
         if (next) {
             mStrokePaint.setColor(mSecondaryColor);
             mLinesPaint.setColor(mSecondaryColor);
@@ -183,7 +237,7 @@ private void updateColorForLines(boolean next, boolean current, int textSize, in
         }
         if (current) {
             mLinesPaint.setColor(ContextCompat.getColor(getContext(), android.R.color.white));
-            mStrokePaint.setColor(mMainColor);
+            mStrokePaint.setColor(mPrimaryColor);
         }
     }
 }
diff --git a/otpedittext2/src/main/res/values/attrs.xml b/otpedittext2/src/main/res/values/attrs.xml
@@ -5,6 +5,8 @@
         <attr name="oev_primary_color" format="color" />
         <attr name="oev_secondary_color" format="color" />
         <attr name="oev_text_color" format="color" />
+        <attr name="oev_box_style" format="string" />
+
     </declare-styleable>
 
 
diff --git a/otpedittext2/src/main/res/values/colors.xml b/otpedittext2/src/main/res/values/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="light_gray">#eeeeee</color>
+    <color name="underline_gray">#ECD0D0</color>
 </resources>
diff --git a/otpedittext2/src/main/res/values/strings.xml b/otpedittext2/src/main/res/values/strings.xml
@@ -1,4 +1,9 @@
 <resources>
     <string name="app_name">OtpEditText</string>
-    <string name="random_name">ABCDE</string>
+
+    <string name="style_square">square_box</string>
+    <string name="style_rounded">rounded_box</string>
+    <string name="style_underline">underline</string>
+    <string name="style_rounded_underline">rounded_underline</string>
+
 </resources>
diff --git a/readme.md b/readme.md
@@ -1,12 +1,12 @@
-# OtpEditText
+# PassCodeText
 
 [![](https://jitpack.io/v/swapnil1104/OtpEditText.svg)](https://jitpack.io/#swapnil1104/OtpEditText)
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-OtpEditText-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/7666)
 
 A customised EditText view serving the purpose of taking numeric **One Time Password** from a user. 
 With stunning animation, and high customizability.
 
-![Demo1](images/demo.gif)
-![Demo with other colors](images/demo1.gif)
+![Demo with underline](images/demo2.gif)
 
 ## Packed with features
 - Add custom character limit.
@@ -28,7 +28,7 @@ Step 2. Add the dependency
 
 ```
 dependencies {
-    implementation 'com.github.swapnil1104:OtpEditText:0.0.1'
+    implementation 'com.github.swapnil1104:OtpEditText:{current_lib_ver}'
 }
 ```
 Step 3. Add OtpEditText to your layout file
@@ -71,6 +71,24 @@ To change that use,
 
 ```app:oev_secondary_color="@color/{your_color}"```
 
+###  Using multiple style options.
+There are 4 style options that are available within the library for now.
+- rounded box
+- square box
+- underline
+- rounded underline
+
+To use any of these styles, please add ```app:oev_box_style="@string\{box_style_input}"```
+attribue.
+I have provided string resources for simpler usage.
+```
+    <string name="style_square">square_box</string>
+    <string name="style_rounded">rounded_box</string>
+    <string name="style_underline">underline</string>
+    <string name="style_rounded_underline">rounded_underline</string>
+```
+Suppose you want the rounded underline option to be displayed. Then, please add:
+`app:oev_box_style="@string/style_rounded_underline" ` in the OtpEditText xml code.
 
 ## For optimum usage; Please note.
 * Specify `android:textSize` according to your needs.
