From d68986b96f73987e367d5ae35609f022a4887baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Sun, 11 Jul 2021 19:58:31 +0300
Subject: [PATCH 01/18] :arrow_up: Upgrade Kotlin version to latest version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5da3468..f4f3d5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.0"
+    ext.kotlin_version = "1.5.20"
     repositories {
         google()
         jcenter()

From a3894cd52057cca72a6e7fb8f79013e028b093fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Sun, 11 Jul 2021 20:45:38 +0300
Subject: [PATCH 02/18] :sparkles: Implement MaskedTextInputEditText

---
 app/build.gradle                              |   1 +
 app/src/main/res/layout/activity_main.xml     |  10 +
 .../main/java/com/hipo/maskededittext/Mask.kt |  63 +++++-
 .../com/hipo/maskededittext/MaskedEditText.kt | 187 ----------------
 .../maskededittext/MaskedTextInputEditText.kt | 209 ++++++++++++++++++
 .../hipo/maskededittext/maskers/BaseMasker.kt |  28 ++-
 .../maskededittext/maskers/CurrencyMasker.kt  | 174 ++++++++++++---
 .../hipo/maskededittext/maskers/DateMasker.kt | 101 +++++++++
 .../maskers/DateMonthYearMasker.kt            | 105 +++++++++
 .../hipo/maskededittext/maskers/IBANMasker.kt | 102 +++++++++
 .../com/hipo/maskededittext/maskers/Masker.kt |  36 +--
 .../maskers/PhoneNumberMasker.kt              | 109 +++++++++
 .../maskers/StaticTextMasker.kt               |  12 +-
 .../hipo/maskededittext/maskers/TCIdMasker.kt |  83 +++++++
 .../maskededittext/masks/CreditCardMask.kt    |   2 +
 .../hipo/maskededittext/masks/CurrencyMask.kt |  15 +-
 .../hipo/maskededittext/masks/CustomMask.kt   |   7 +-
 .../com/hipo/maskededittext/masks/DateMask.kt |   7 +-
 .../maskededittext/masks/DateMonthYearMask.kt |  21 +-
 .../com/hipo/maskededittext/masks/IBANMask.kt |  30 +++
 .../hipo/maskededittext/masks/PhoneMask.kt    |   4 +-
 .../com/hipo/maskededittext/masks/SSNMask.kt  |   2 +
 .../maskededittext/masks/StaticTextMask.kt    |   2 +
 .../com/hipo/maskededittext/masks/TCIdMask.kt |  25 +++
 .../maskededittext/masks/UnselectedMask.kt    |   4 +-
 .../model/CurrencyMaskerSettings.kt           |  34 +++
 .../utils/extensions/StringExtensions.kt      | 169 ++++++++++++++
 maskededittext/src/main/res/values/attrs.xml  |  23 +-
 28 files changed, 1279 insertions(+), 286 deletions(-)
 delete mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/MaskedEditText.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMasker.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/maskers/TCIdMasker.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/masks/IBANMask.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/masks/TCIdMask.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt

diff --git a/app/build.gradle b/app/build.gradle
index 7993e04..27d7239 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,6 +45,7 @@ android {
 dependencies {
 
     implementation project(path: ':photocropping')
+    implementation project(path: ':maskededittext')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.1'
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c2328ce..5da7d2f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,6 +6,16 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <com.hipo.maskededittext.MaskedTextInputEditText
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:currencySuffix="$"
+        app:layout_constraintBottom_toTopOf="@+id/mainPhotoCropDemoButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:maskType="currency" />
+
     <Button
         android:id="@+id/mainPhotoCropDemoButton"
         android:layout_width="wrap_content"
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
index 6cb7c0c..e29a2af 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
@@ -1,6 +1,18 @@
 package com.hipo.maskededittext
 
-import com.hipo.maskededittext.masks.*
+import com.hipo.maskededittext.masks.CreditCardMask
+import com.hipo.maskededittext.masks.CurrencyMask
+import com.hipo.maskededittext.masks.CustomMask
+import com.hipo.maskededittext.masks.DateMask
+import com.hipo.maskededittext.masks.DateMonthYearMask
+import com.hipo.maskededittext.masks.IBANMask
+import com.hipo.maskededittext.masks.PhoneMask
+import com.hipo.maskededittext.masks.SSNMask
+import com.hipo.maskededittext.masks.StaticTextMask
+import com.hipo.maskededittext.masks.TCIdMask
+import com.hipo.maskededittext.masks.UnselectedMask
+import com.hipo.maskededittext.utils.extensions.specialChars
+
 
 abstract class Mask {
     abstract val maskPattern: String
@@ -10,6 +22,32 @@ abstract class Mask {
     abstract fun isValidToParse(maskedText: String): Boolean
     abstract fun filterMaskedText(maskedText: String): String
 
+    fun calculateUpcomingMaskDistance(start: Int): Int {
+        if (start == 0) {
+            return 0
+        }
+        var index = start
+        with(this) {
+            while (index in maskPattern.indices && specialChars.contains(maskPattern[index])) {
+                index++
+            }
+        }
+        return index
+    }
+
+    fun calculateCurrentMaskDistance(start: Int): Int {
+        if (start == 0) {
+            return 0
+        }
+        var index = start
+        with(this) {
+            while (index in maskPattern.indices && specialChars.contains(maskPattern[index])) {
+                index--
+            }
+        }
+        return index
+    }
+
     // Enum class order must be the same as attrs.xml order
     enum class Type : MaskCreator {
         DATE {
@@ -26,30 +64,35 @@ abstract class Mask {
         },
         CURRENCY {
             override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                CurrencyMask(maskPattern.orEmpty())
+                CurrencyMask()
         },
         CUSTOM {
             override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                CustomMask(
-                    maskPattern.orEmpty(),
-                    returnPattern.orEmpty()
-                )
+                CustomMask(maskPattern.orEmpty(), returnPattern.orEmpty())
         },
         STATIC_TEXT {
-            override fun create(maskPattern: String?, returnPattern: String?) =
+            override fun create(maskPattern: String?, returnPattern: String?): Mask =
                 StaticTextMask(maskPattern!!)
         },
         CREDIT_CARD {
-            override fun create(maskPattern: String?, returnPattern: String?) =
+            override fun create(maskPattern: String?, returnPattern: String?): Mask =
                 CreditCardMask()
         },
         DATE_MONTH_YEAR {
-            override fun create(maskPattern: String?, returnPattern: String?) =
+            override fun create(maskPattern: String?, returnPattern: String?): Mask =
                 DateMonthYearMask()
         },
+        IBAN {
+            override fun create(maskPattern: String?, returnPattern: String?): Mask =
+                IBANMask()
+        },
+        TC_ID {
+            override fun create(maskPattern: String?, returnPattern: String?): Mask =
+                TCIdMask()
+        },
         UNSELECTED {
             override fun create(maskPattern: String?, returnPattern: String?): Mask =
                 UnselectedMask()
-        }
+        },
     }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedEditText.kt
deleted file mode 100644
index 306f0cb..0000000
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedEditText.kt
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.hipo.maskededittext
-
-import android.content.Context
-import android.text.Editable
-import android.text.InputType.TYPE_CLASS_NUMBER
-import android.text.TextWatcher
-import android.util.AttributeSet
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputConnection
-import androidx.appcompat.widget.AppCompatEditText
-import com.google.android.material.textfield.TextInputLayout
-import com.hipo.maskededittext.maskers.BaseMasker
-import com.hipo.maskededittext.maskers.CurrencyMasker
-import com.hipo.maskededittext.maskers.CurrencyMasker.Companion.DEFAULT_DECIMAL_LIMIT
-import com.hipo.maskededittext.maskers.Masker
-import com.hipo.maskededittext.maskers.Masker.Companion.POUND
-import com.hipo.maskededittext.maskers.StaticTextMasker
-import com.hipo.maskededittext.masks.CurrencyMask
-import com.hipo.maskededittext.masks.CustomMask
-import com.hipo.maskededittext.masks.StaticTextMask
-import com.hipo.maskededittext.masks.UnselectedMask
-import kotlin.properties.Delegates
-
-class MaskedEditText : AppCompatEditText {
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        initAttributes(attrs)
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
-        initAttributes(attrs, defStyle)
-    }
-
-    private var textWatcher: TextWatcher? = null
-    private var maskPattern: String = ""
-    private var returnMaskPattern: String = ""
-    private var masker: BaseMasker? = null
-    private var currencyDecimalLimit = DEFAULT_DECIMAL_LIMIT
-    private var maskType: Mask by Delegates.observable<Mask>(UnselectedMask()) { _, _, newValue ->
-        setMasker(newValue)
-    }
-
-    var onTextChangedListener: ((String) -> Unit)? = null
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        initMaskedEditText()
-    }
-
-    override fun onDetachedFromWindow() {
-        textWatcher = null
-        super.onDetachedFromWindow()
-    }
-
-    override fun onSelectionChanged(selStart: Int, selEnd: Int) {
-        setSelection(text?.length ?: 0)
-    }
-
-    fun getParsedText() = maskType.getParsedText(text.toString())
-
-    fun isValid() = maskType.isValidToParse(text.toString())
-
-    fun setCurrencyText(currency: String) {
-        // TODO this is a quick fix, create a generic setter that works with every masker
-        masker.takeIf { it is CurrencyMasker }?.onTextChanged(currency, 0, currency.length, 0)
-    }
-
-    private fun setMasker(mask: Mask) {
-        if (mask is UnselectedMask) {
-            throw Exception("${LOG_TAG}: ${context.getString(R.string.exception_unselected_mask)}")
-        }
-        masker = when (mask) {
-            is CustomMask -> handleCustomMask(mask)
-            is StaticTextMask -> handleStaticTextMask(mask)
-            is CurrencyMask -> CurrencyMasker(mask, ::setEditTextWithoutTriggerListener, currencyDecimalLimit)
-            else -> Masker(mask, ::setEditTextWithoutTriggerListener)
-        }
-    }
-
-    private fun handleCustomMask(mask: Mask): Masker {
-        return when {
-            maskPattern.contains(POUND).not() -> {
-                throw Exception("$LOG_TAG: ${context.getString(R.string.exception_mask_pound)}")
-            }
-            returnMaskPattern.contains(POUND).not() -> {
-                throw Exception("$LOG_TAG: ${context.getString(R.string.exception_return_pound)}")
-            }
-            maskPattern.count { it == POUND } != returnMaskPattern.count { it == POUND } -> {
-                throw Exception("$LOG_TAG: ${context.getString(R.string.exception_pound_count)}")
-            }
-            else -> {
-                Masker(mask, ::setEditTextWithoutTriggerListener)
-            }
-        }
-    }
-
-    private fun handleStaticTextMask(mask: Mask): StaticTextMasker {
-        return when {
-            maskPattern.isBlank() -> {
-                throw Exception("$LOG_TAG: ${context.getString(R.string.exception_mask_pound)}")
-            }
-            else -> StaticTextMasker(mask, ::setEditTextWithoutTriggerListener)
-        }
-    }
-
-    private fun setEditTextWithoutTriggerListener(newText: String) {
-        removeTextChangedListener(textWatcher)
-        setText(newText)
-        setSelection(text?.length ?: 0)
-        textWatcher?.let { textWatcher ->
-            addTextChangedListener(textWatcher)
-        }
-        onTextChangedListener?.invoke(newText)
-    }
-
-    private fun initMaskedEditText() {
-        initTextWatcher()
-    }
-
-    private fun initAttributes(attrs: AttributeSet, defStyle: Int = -1) {
-        with(context.obtainStyledAttributes(attrs, R.styleable.MaskedEditText, defStyle, 0)) {
-            maskPattern = getString(R.styleable.MaskedEditText_maskPattern).orEmpty()
-            returnMaskPattern = getString(R.styleable.MaskedEditText_returnPattern).orEmpty()
-            currencyDecimalLimit = getInteger(R.styleable.MaskedEditText_currencyDecimalLimit, DEFAULT_DECIMAL_LIMIT)
-                .also { decimalLimit -> CurrencyMasker.checkIfLimitSafe(decimalLimit) }
-            maskType = Mask.Type.values()[
-                    getInt(R.styleable.MaskedEditText_maskType, Mask.Type.UNSELECTED.ordinal)
-            ].create(maskPattern, returnMaskPattern)
-        }
-        inputType = masker?.inputType ?: TYPE_CLASS_NUMBER
-    }
-
-    private fun initTextWatcher() {
-        textWatcher = object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {}
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                masker?.onTextChanged(s, start, count, before)
-            }
-        }
-        addTextChangedListener(textWatcher)
-    }
-
-    /**
-     *  Below 4 function which are
-     *   - getHint()
-     *   - onCreateInputConnection()
-     *   - getTextInputLayout()
-     *   - getHintFromLayout()
-     *   copied from TextInputEditText to perform same label feature.
-     */
-    override fun getHint(): CharSequence? {
-        val layoutHint = getTextInputLayout()?.hint
-        return layoutHint ?: super.getHint()
-    }
-
-    override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection? {
-        val inputConnection = super.onCreateInputConnection(outAttrs)
-        if (inputConnection != null && outAttrs.hintText == null) {
-            outAttrs.hintText = getHintFromLayout()
-        }
-        return inputConnection
-    }
-
-    private fun getTextInputLayout(): TextInputLayout? {
-        var parent = this.parent
-        while (parent is View) {
-            if (parent is TextInputLayout) {
-                return parent
-            }
-            parent = parent.getParent()
-        }
-        return null
-    }
-
-    private fun getHintFromLayout(): CharSequence? {
-        val layout = getTextInputLayout()
-        return layout?.hint
-    }
-
-    companion object {
-        private val LOG_TAG = MaskedEditText::class.java.simpleName
-    }
-}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
new file mode 100644
index 0000000..af40da6
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
@@ -0,0 +1,209 @@
+package com.hipo.maskededittext
+
+import android.content.Context
+import android.text.Editable
+import android.text.InputType.TYPE_CLASS_NUMBER
+import android.text.TextWatcher
+import android.util.AttributeSet
+import androidx.core.content.res.use
+import com.google.android.material.textfield.TextInputEditText
+import com.hipo.maskededittext.maskers.BaseMasker
+import com.hipo.maskededittext.maskers.CurrencyMasker
+import com.hipo.maskededittext.maskers.DateMasker
+import com.hipo.maskededittext.maskers.DateMonthYearMasker
+import com.hipo.maskededittext.maskers.IBANMasker
+import com.hipo.maskededittext.maskers.Masker
+import com.hipo.maskededittext.maskers.PhoneNumberMasker
+import com.hipo.maskededittext.maskers.StaticTextMasker
+import com.hipo.maskededittext.maskers.TCIdMasker
+import com.hipo.maskededittext.masks.CurrencyMask
+import com.hipo.maskededittext.masks.CustomMask
+import com.hipo.maskededittext.masks.DateMask
+import com.hipo.maskededittext.masks.DateMonthYearMask
+import com.hipo.maskededittext.masks.IBANMask
+import com.hipo.maskededittext.masks.PhoneMask
+import com.hipo.maskededittext.masks.StaticTextMask
+import com.hipo.maskededittext.masks.TCIdMask
+import com.hipo.maskededittext.masks.UnselectedMask
+import com.hipo.maskededittext.model.CurrencyMaskerSettings
+import kotlin.properties.Delegates
+
+class MaskedTextInputEditText : TextInputEditText {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        initAttributes(attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
+        initAttributes(attrs, defStyle)
+    }
+
+    val rawText: String
+        get() = text.toString()
+
+    val parsedText: String
+        get() {
+            return if (maskType is UnselectedMask) {
+                text.toString()
+            } else {
+                maskType.getParsedText(text.toString()).orEmpty()
+            }
+        }
+
+    var isEnabled: Boolean? = true
+        set(value) {
+            field = value
+            if (value == true) requestFocus() else clearFocus()
+        }
+
+    val isValid: Boolean
+        get() {
+            if (maskType is UnselectedMask) {
+                throw RuntimeException("You must initialize the maskType attr.")
+            }
+            return maskType.isValidToParse(text.toString())
+        }
+
+    private var textWatcher: TextWatcher? = null
+    private var masker: BaseMasker? = null
+
+    private var maskPattern: String = ""
+    private var returnMaskPattern: String = ""
+
+    private var maskType: Mask by Delegates.observable<Mask>(UnselectedMask()) { _, _, newValue ->
+        setMasker(newValue)
+    }
+
+    private var currencySettings = CurrencyMaskerSettings()
+
+    var onTextChangedListener: ((String) -> Unit)? = null
+
+    private fun initAttributes(attrs: AttributeSet?, defStyle: Int = -1) {
+        context.obtainStyledAttributes(attrs, R.styleable.MaskedTextInputEditText, defStyle, 0).use { typedArray ->
+            currencySettings.decimalSeparator =
+                typedArray.getString(R.styleable.MaskedTextInputEditText_decimalSeparator) ?: COMMA
+            currencySettings.groupingSeparator =
+                typedArray.getString(R.styleable.MaskedTextInputEditText_groupingSeparator) ?: DOT
+            maskPattern = typedArray.getString(R.styleable.MaskedTextInputEditText_maskPattern).orEmpty()
+            returnMaskPattern = typedArray.getString(R.styleable.MaskedTextInputEditText_returnPattern).orEmpty()
+            currencySettings.prefix = typedArray.getString(R.styleable.MaskedTextInputEditText_currencySuffix).orEmpty()
+            currencySettings.suffix = typedArray.getString(R.styleable.MaskedTextInputEditText_currencyPrefix).orEmpty()
+            currencySettings.decimalLimit = typedArray.getInteger(
+                R.styleable.MaskedTextInputEditText_currencyDecimalLimit,
+                CurrencyMaskerSettings.DEFAULT_DECIMAL_LIMIT
+            ).also { decimalLimit -> CurrencyMasker.checkIfLimitSafe(decimalLimit) }
+            maskType = Mask.Type.values()[
+                typedArray.getInt(R.styleable.MaskedTextInputEditText_maskType, Mask.Type.UNSELECTED.ordinal)
+            ].create(maskPattern, returnMaskPattern)
+        }
+        inputType = masker?.inputType ?: TYPE_CLASS_NUMBER
+        keyListener = masker?.keyListener
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        initMaskedEditText()
+    }
+
+    private fun initMaskedEditText() {
+        if (masker?.mask is UnselectedMask) return
+        initTextWatcher()
+    }
+
+    private fun initTextWatcher() {
+        textWatcher = object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {}
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                masker?.beforeTextChanged(s ?: "", start, count, after, selectionStart)
+            }
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                masker?.onTextChanged(s, start, count, before, selectionStart)
+            }
+        }
+        addTextChangedListener(textWatcher)
+    }
+
+    private fun setMasker(mask: Mask) {
+        masker = when (mask) {
+            is UnselectedMask -> return
+            is CustomMask -> handleCustomMask(mask)
+            is StaticTextMask -> handleStaticTextMask(mask)
+            is CurrencyMask -> CurrencyMasker(mask, ::setEditTextWithoutTriggerListener, currencySettings)
+            is IBANMask -> IBANMasker(mask, ::setEditTextWithoutTriggerListener)
+            is PhoneMask -> PhoneNumberMasker(mask, ::setEditTextWithoutTriggerListener)
+            is DateMonthYearMask -> DateMonthYearMasker(mask, ::setEditTextWithoutTriggerListener)
+            is DateMask -> DateMasker(mask, ::setEditTextWithoutTriggerListener)
+            is TCIdMask -> TCIdMasker(mask, ::setEditTextWithoutTriggerListener)
+            else -> Masker(mask, ::setEditTextWithoutTriggerListener)
+        }
+        setDefaultText(mask)
+        requestFocus()
+        setSelection(text?.length ?: 0)
+    }
+
+    private fun setDefaultText(mask: Mask) {
+        val defaultText = if (masker is CurrencyMasker) {
+            "${currencySettings.prefix} 0${currencySettings.decimalSeparator}00 ${currencySettings.suffix}".trim()
+        } else {
+            mask.maskPattern.substringBefore(POUND)
+        }
+        setText(defaultText)
+    }
+
+    private fun setEditTextWithoutTriggerListener(newText: String, selection: Int?) {
+        removeTextChangedListener(textWatcher)
+        setText(newText)
+        setSelection(selection ?: newText.length)
+        textWatcher?.let { textWatcher ->
+            addTextChangedListener(textWatcher)
+        }
+        onTextChangedListener?.invoke(newText)
+    }
+
+    private fun handleCustomMask(mask: Mask): Masker = when {
+        maskPattern.contains(POUND).not() -> {
+            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_mask_pound)}")
+        }
+        returnMaskPattern.contains(POUND).not() -> {
+            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_return_pound)}")
+        }
+        maskPattern.count { it == POUND } != returnMaskPattern.count { it == POUND } -> {
+            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_pound_count)}")
+        }
+        else -> {
+            Masker(mask, ::setEditTextWithoutTriggerListener)
+        }
+    }
+
+    private fun handleStaticTextMask(mask: Mask): StaticTextMasker = when {
+        maskPattern.isBlank() -> {
+            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_mask_pound)}")
+        }
+        else -> StaticTextMasker(mask, ::setEditTextWithoutTriggerListener)
+    }
+
+    override fun onDetachedFromWindow() {
+        textWatcher = null
+        super.onDetachedFromWindow()
+    }
+
+    fun updateCurrencyModel(currencyMaskerSettings: CurrencyMaskerSettings) {
+        this.currencySettings = currencyMaskerSettings
+        maskType = CurrencyMask()
+    }
+
+    fun setCurrencyText(currency: String) {
+        // TODO this is a quick fix, create a generic setter that works with every masker
+        masker.takeIf { it is CurrencyMasker }?.onTextChanged(currency, 0, currency.length, 0, selectionStart)
+    }
+
+    companion object {
+        private val LOG_TAG = this::class.java.simpleName
+        private const val POUND = '#'
+        private const val COMMA = ","
+        private const val DOT = "."
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
index ef030af..bd1b601 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
@@ -1,11 +1,27 @@
 package com.hipo.maskededittext.maskers
 
+import android.text.method.DigitsKeyListener
 import com.hipo.maskededittext.Mask
 
-interface BaseMasker {
-    fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int)
-    fun getTextWithReturnPattern(): String?
-    val onTextMaskedListener: (String) -> Unit
-    val mask: Mask
-    val inputType: Int
+abstract class BaseMasker {
+    abstract fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int)
+    abstract fun getTextWithReturnPattern(): String?
+
+    open fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {}
+
+    abstract val onTextMaskedListener: (String, Int?) -> Unit
+    abstract val mask: Mask
+    abstract val inputType: Int
+
+    open val keyListener: DigitsKeyListener
+        get() = DigitsKeyListener.getInstance(DIGITS)
+
+    companion object {
+        const val POUND = '#'
+        const val IS_REMOVED = 0
+        const val IS_ADDED = 1
+
+        const val DIGITS = "1234567890"
+        const val DIGITS_WITH_DOT_AND_COMMA = "1234567890.,"
+    }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
index 5d2b0af..1ed4950 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
@@ -2,62 +2,172 @@ package com.hipo.maskededittext.maskers
 
 import android.text.InputType.TYPE_CLASS_NUMBER
 import android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL
-import android.text.InputType.TYPE_NUMBER_FLAG_SIGNED
+import android.text.method.DigitsKeyListener
 import com.hipo.maskededittext.Mask
-import java.text.NumberFormat
-import java.util.Locale
+import com.hipo.maskededittext.model.CurrencyMaskerSettings
+import com.hipo.maskededittext.utils.extensions.removeWithRegex
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.text.ParseException
+import kotlin.properties.Delegates
 
 class CurrencyMasker(
     override val mask: Mask,
-    override val onTextMaskedListener: (String) -> Unit,
-    private val currencyDecimalLimit: Int
-) : BaseMasker {
+    override val onTextMaskedListener: (String, Int?) -> Unit,
+    private val currencyMaskerSettings: CurrencyMaskerSettings
+) : BaseMasker() {
+
+    override val keyListener: DigitsKeyListener
+        get() = DigitsKeyListener.getInstance(DIGITS_WITH_DOT_AND_COMMA)
 
     override val inputType: Int
-        get() = TYPE_CLASS_NUMBER or TYPE_NUMBER_FLAG_DECIMAL or TYPE_NUMBER_FLAG_SIGNED
+        get() = TYPE_CLASS_NUMBER or TYPE_NUMBER_FLAG_DECIMAL
+
+    private val formattedCurrencyPrefix: String
+        get() = if (currencyMaskerSettings.prefix.isEmpty()) "" else "${currencyMaskerSettings.prefix} "
+
+    private val formattedCurrencySuffix: String
+        get() = if (currencyMaskerSettings.suffix.isEmpty()) "" else " ${currencyMaskerSettings.suffix}"
+
+    private val currencyPrefixLength: Int
+        get() = formattedCurrencyPrefix.length
+
+    private val currencySuffixLength
+        get() = formattedCurrencySuffix.length
+
+    private val defaultText by lazy {
+        "${formattedCurrencyPrefix}0${localeDecimalFormatSymbols.decimalSeparator}00${formattedCurrencySuffix}"
+    }
+
+    private var selection = 0
+
+    private var text by Delegates.observable("", { _, _, newValue ->
+        onTextMaskedListener(newValue, selection)
+    })
+
+    private val localeDecimalFormatSymbols = DecimalFormatSymbols(currencyMaskerSettings.locale).apply {
+        decimalSeparator = currencyMaskerSettings.decimalSeparator.first()
+        groupingSeparator = currencyMaskerSettings.groupingSeparator.first()
+    }
 
-    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int) {
-        if (charSequence == null || charSequence.isBlank()) {
+    private val currencyFormatter = DecimalFormat().apply {
+        minimumIntegerDigits = 1
+        maximumIntegerDigits = 2
+        minimumFractionDigits = 0
+        maximumFractionDigits = 2
+        decimalFormatSymbols = localeDecimalFormatSymbols
+    }
+
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        val isDeletion = count == IS_REMOVED
+
+        if (charSequence.isNullOrEmpty()) {
+            selection = 0
+            text = defaultText
+            return
+        }
+
+        if (charSequence.length <= start) {
+            val currentCurrencyValue = if (text.isEmpty()) defaultText else text
+            selection = getFormattedCurrencyDecimalLimitLeftIndex(currentCurrencyValue)
+            text = currentCurrencyValue
             return
         }
 
-        var numberStr = charSequence.toString().replace(",", "").replace(mask.maskPattern, "")
-        if (numberStr.isBlank()) {
-            numberStr = "0"
+        if (!charSequence.contains(localeDecimalFormatSymbols.decimalSeparator) && isDeletion) {
+            onTextMaskedListener(text, start)
+            return
+        }
+
+        if ((charSequence[start] == localeDecimalFormatSymbols.decimalSeparator ||
+                charSequence[start] == localeDecimalFormatSymbols.groupingSeparator) && !isDeletion
+        ) {
+            val currentCurrencyValue = if (text.isEmpty()) defaultText else text
+            selection =
+                getFormattedCurrencyDecimalLimitRightIndex(currentCurrencyValue) - currencyPrefixLength - currencySuffixLength
+            text = currentCurrencyValue
+            return
         }
-        val numList = numberStr.split(".").toMutableList()
-        if (numList.first().isEmpty()) {
-            numList[0] = "0"
+
+        val inputWithoutPrefixAndSuffix =
+            charSequence.removeWithRegex("[$formattedCurrencyPrefix$formattedCurrencySuffix]")
+        val startLength = inputWithoutPrefixAndSuffix.length
+
+        try {
+            val currencyWithoutGroupSeparator =
+                inputWithoutPrefixAndSuffix.removeWithRegex("[${localeDecimalFormatSymbols.groupingSeparator}]")
+
+            currencyFormatter.applyPattern(WHOLE_NUMBER_FORMAT)
+            val parsedNumber = currencyFormatter.parse(currencyWithoutGroupSeparator)!!
+            currencyFormatter.applyPattern(mask.maskPattern)
+            var formattedCurrency = currencyFormatter.format(parsedNumber)
+
+            val endLength = formattedCurrency.length
+            val cursorIndex = handleCursor(
+                subtractCurrencyPrefixIfValidOrZero(selectionStart + (endLength - startLength)),
+                formattedCurrency,
+                isDeletion
+            )
+
+            formattedCurrency = addSuffixAndPrefix(formattedCurrency)
+            selection = cursorIndex
+            text = formattedCurrency
+        } catch (e: ParseException) {
+            e.printStackTrace()
         }
+    }
 
-        val formattedTextBuilder = StringBuilder(mask.maskPattern).apply {
-            append(NumberFormat.getNumberInstance(Locale.US).format(numList.first().toFloat()))
-            if (numList.size > 1) {
-                append(POINT)
-                if (currencyDecimalLimit == NO_DECIMAL_LIMIT) {
-                    append(numList[1])
+    private fun handleCursor(selection: Int, formattedCurrency: String, isDeletion: Boolean): Int = when {
+        selection <= 0 -> getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
+        selection >= formattedCurrency.length -> {
+            if (isDeletion) {
+                selection - 1 + currencyPrefixLength
+            } else {
+                getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
+            }
+        }
+        isDeletion && (formattedCurrency[selection - 1] == localeDecimalFormatSymbols.groupingSeparator) -> {
+            selection + currencyPrefixLength - 1
+        }
+        selection in (formattedCurrency.length - currencyMaskerSettings.decimalLimit)..formattedCurrency.length -> {
+            if (isDeletion) {
+                selection - 1 + currencyPrefixLength
+            } else {
+                if (selection + 1 >= formattedCurrency.length) {
+                    getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
                 } else {
-                    append(getLimitedDecimalString(numList[1]))
+                    selection + 1 + currencyPrefixLength
                 }
             }
         }
-        onTextMaskedListener(formattedTextBuilder.toString())
+        selection > 0 && selection <= formattedCurrency.length -> selection + currencyPrefixLength
+        else -> if (isDeletion) selection - 1 else selection
     }
 
-    override fun getTextWithReturnPattern(): String? {
-        return null
+    private fun subtractCurrencyPrefixIfValidOrZero(cursor: Int): Int {
+        return if (cursor - currencyPrefixLength > 0) cursor - currencyPrefixLength else 0
     }
 
-    private fun getLimitedDecimalString(decimalString: String): String {
-        return with(decimalString) {
-            substring(0, if (length <= currencyDecimalLimit) length else currencyDecimalLimit)
-        }
+    private fun getFormattedCurrencyDecimalLimitLeftIndex(currencyInput: String): Int {
+        return currencyInput.length - currencyMaskerSettings.decimalLimit - 1 + currencyPrefixLength
+    }
+
+    private fun getFormattedCurrencyDecimalLimitRightIndex(currencyInput: String): Int {
+        return currencyInput.length - currencyMaskerSettings.decimalLimit + currencyPrefixLength
+    }
+
+    private fun addSuffixAndPrefix(currencyValue: String): String {
+        return "$formattedCurrencyPrefix$currencyValue$formattedCurrencySuffix"
+    }
+
+    override fun getTextWithReturnPattern(): String? {
+        return null
     }
 
     companion object {
-        const val DEFAULT_DECIMAL_LIMIT = 2
-        const val NO_DECIMAL_LIMIT = -1
-        private const val POINT = "."
+        private const val NO_DECIMAL_LIMIT = -1
+
+        private const val WHOLE_NUMBER_FORMAT = "#,##0"
 
         fun checkIfLimitSafe(currencyDecimalLimit: Int) {
             if (currencyDecimalLimit < NO_DECIMAL_LIMIT) {
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMasker.kt
new file mode 100644
index 0000000..f1064e3
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMasker.kt
@@ -0,0 +1,101 @@
+package com.hipo.maskededittext.maskers
+
+import android.text.InputType
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.formatAsDate
+import com.hipo.maskededittext.utils.extensions.specialChars
+import kotlin.properties.Delegates
+
+
+class DateMasker(
+    override val mask: Mask,
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
+
+    override val inputType: Int
+        get() = InputType.TYPE_CLASS_NUMBER
+
+    private var text: String by Delegates.observable("") { _, _, newValue ->
+        if (selection >= newValue.length) selection = newValue.length
+        onTextMaskedListener(newValue, selection)
+    }
+
+    private var oldCursorPosition = 0
+
+    private var startLength = 0
+    private var endLength = 0
+    private var selection = 0
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {
+        oldCursorPosition = selectionStart
+    }
+
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        if (charSequence.isNullOrEmpty()) {
+            selection = 0
+            text = ""
+            return
+        }
+        startLength = charSequence.length
+        when (count) {
+            IS_REMOVED -> handleDeletion(charSequence, start)
+            IS_ADDED -> handleAddition(charSequence, selectionStart)
+            else -> handleRestoration(charSequence)
+        }
+    }
+
+    private fun handleAddition(charSequence: CharSequence, start: Int) {
+        if (charSequence.length > mask.maskPattern.length) {
+            selection = oldCursorPosition
+            text = text
+            return
+        }
+        val formattedDate = charSequence.toString().formatAsDate(mask)
+        endLength = formattedDate.length
+        selection = handleCursorIndex(formattedDate, start + (endLength - startLength), false)
+        text = formattedDate
+    }
+
+    private fun handleDeletion(charSequence: CharSequence, start: Int) {
+        val formattedDate = charSequence.toString().formatAsDate(mask)
+        if (start == 0) {
+            selection = formattedDate.length
+            text = formattedDate
+            return
+        }
+        endLength = formattedDate.length
+        selection = handleCursorIndex(formattedDate, start, true)
+        text = formattedDate
+    }
+
+    private fun handleRestoration(charSequence: CharSequence) {
+        val formattedDate = charSequence.toString().formatAsDate(mask)
+        selection = formattedDate.length
+        text = formattedDate
+    }
+
+    private fun handleCursorIndex(charSequence: CharSequence, selectionIndex: Int, isDeletion: Boolean): Int = when {
+        selectionIndex <= 0 -> 0
+        selectionIndex >= charSequence.length -> charSequence.length
+        specialChars.contains(charSequence[selectionIndex]) -> {
+            handleSpecialCharState(selectionIndex, isDeletion)
+        }
+        specialChars.contains(charSequence[selectionIndex - 1]) -> {
+            handleSpecialCharState(selectionIndex - 1, isDeletion)
+        }
+        selectionIndex == 0 && selectionIndex <= charSequence.length -> charSequence.length - 1
+        else -> selectionIndex
+    }
+
+    private fun handleSpecialCharState(cursor: Int, isDeletion: Boolean): Int {
+        return if (isDeletion) {
+            mask.calculateCurrentMaskDistance(cursor) + 1
+        } else {
+            mask.calculateUpcomingMaskDistance(cursor) + 1
+        }
+    }
+
+    override fun getTextWithReturnPattern(): String? {
+        return mask.getParsedText(text)
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt
new file mode 100644
index 0000000..9a39aae
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt
@@ -0,0 +1,105 @@
+package com.hipo.maskededittext.maskers
+
+import android.text.InputType
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.formatAsDateMonthYear
+import com.hipo.maskededittext.utils.extensions.specialChars
+import java.util.Calendar
+import kotlin.properties.Delegates
+
+class DateMonthYearMasker(
+    override val mask: Mask,
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
+
+    override val inputType: Int
+        get() = InputType.TYPE_CLASS_NUMBER
+
+    private var text: String by Delegates.observable("") { _, _, newValue ->
+        if (selection >= newValue.length) selection = newValue.length
+        onTextMaskedListener(newValue, selection)
+    }
+
+    private val calendar by lazy { Calendar.getInstance() }
+
+    private val lastTwoDigitOfYear by lazy { calendar.get(Calendar.YEAR) % 100 }
+
+    private var oldCursorPosition = 0
+
+    private var startLength = 0
+    private var endLength = 0
+    private var selection = 0
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {
+        oldCursorPosition = selectionStart
+    }
+
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        if (charSequence.isNullOrEmpty()) {
+            selection = 0
+            text = ""
+            return
+        }
+        startLength = charSequence.length
+        when (count) {
+            IS_REMOVED -> handleDeletion(charSequence, start)
+            IS_ADDED -> handleAddition(charSequence, selectionStart)
+            else -> handleRestoration(charSequence)
+        }
+    }
+
+    private fun handleAddition(charSequence: CharSequence, start: Int) {
+        if (charSequence.length > mask.maskPattern.length) {
+            selection = oldCursorPosition
+            text = text
+            return
+        }
+        val formattedDate = charSequence.toString().formatAsDateMonthYear(lastTwoDigitOfYear, mask)
+        endLength = formattedDate.length
+        selection = handleCursorIndex(formattedDate, start + (endLength - startLength), false)
+        text = formattedDate
+    }
+
+    private fun handleDeletion(charSequence: CharSequence, start: Int) {
+        val formattedDate = charSequence.toString().formatAsDateMonthYear(lastTwoDigitOfYear, mask)
+        if (start == 0) {
+            selection = formattedDate.length
+            text = formattedDate
+            return
+        }
+        endLength = formattedDate.length
+        selection = handleCursorIndex(formattedDate, start, true)
+        text = formattedDate
+    }
+
+    private fun handleRestoration(charSequence: CharSequence) {
+        val formattedDateMonthYear = charSequence.toString().formatAsDateMonthYear(lastTwoDigitOfYear, mask)
+        selection = formattedDateMonthYear.length
+        text = formattedDateMonthYear
+    }
+
+    private fun handleCursorIndex(charSequence: CharSequence, selectionIndex: Int, isDeletion: Boolean): Int = when {
+        selectionIndex <= 0 -> 0
+        selectionIndex >= charSequence.length -> charSequence.length
+        specialChars.contains(charSequence[selectionIndex]) -> {
+            handleSpecialCharState(selectionIndex, isDeletion)
+        }
+        specialChars.contains(charSequence[selectionIndex - 1]) -> {
+            handleSpecialCharState(selectionIndex - 1, isDeletion)
+        }
+        selectionIndex == 0 && selectionIndex <= charSequence.length -> charSequence.length - 1
+        else -> selectionIndex
+    }
+
+    private fun handleSpecialCharState(cursor: Int, isDeletion: Boolean): Int {
+        return if (isDeletion) {
+            mask.calculateCurrentMaskDistance(cursor) + 1
+        } else {
+            mask.calculateUpcomingMaskDistance(cursor) + 1
+        }
+    }
+
+    override fun getTextWithReturnPattern(): String? {
+        return mask.getParsedText(text)
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt
new file mode 100644
index 0000000..47ac088
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt
@@ -0,0 +1,102 @@
+package com.hipo.maskededittext.maskers
+
+import android.text.InputType
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.masks.IBANMask
+import com.hipo.maskededittext.utils.extensions.formatAsIban
+import com.hipo.maskededittext.utils.extensions.specialChars
+import kotlin.properties.Delegates
+
+class IBANMasker(
+    override val mask: Mask,
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
+
+    override val inputType: Int
+        get() = InputType.TYPE_CLASS_NUMBER
+
+    private var text: String by Delegates.observable("") { _, _, newValue ->
+        if (selection >= newValue.length) selection = newValue.length
+        onTextMaskedListener(newValue, selection)
+    }
+
+    private var oldCursorPosition = 0
+
+    private var startLength = 0
+    private var endLength = 0
+    private var selection = 0
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {
+        oldCursorPosition = selectionStart
+    }
+
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        if (charSequence.isNullOrEmpty()) {
+            selection = IBANMask.IBAN_PREFIX.length
+            text = IBANMask.IBAN_PREFIX
+            return
+        }
+        if (start < IBANMask.IBAN_PREFIX.length) {
+            selection = text.length
+            text = text
+            return
+        }
+        startLength = charSequence.length
+        when (count) {
+            IS_REMOVED -> handleDeletion(charSequence, start)
+            IS_ADDED -> handleAddition(charSequence, selectionStart)
+            else -> handleRestoration(charSequence)
+        }
+    }
+
+    private fun handleAddition(charSequence: CharSequence, start: Int) {
+        if (charSequence.length > mask.maskPattern.length) {
+            selection = oldCursorPosition
+            text = text
+            return
+        }
+        val formattedIban = charSequence.toString().formatAsIban()
+        endLength = formattedIban.length
+        selection = handleCursorIndex(formattedIban, start, false)
+        text = formattedIban
+    }
+
+    private fun handleDeletion(charSequence: CharSequence, start: Int) {
+        val formattedIban: String = charSequence.toString().formatAsIban()
+        if (start == 0) {
+            selection = formattedIban.length
+            text = formattedIban
+            return
+        }
+        endLength = formattedIban.length
+        selection = handleCursorIndex(formattedIban, start, true)
+        text = formattedIban
+    }
+
+    private fun handleRestoration(charSequence: CharSequence) {
+        val formattedIban = charSequence.toString().formatAsIban()
+        selection = formattedIban.length
+        text = formattedIban
+    }
+
+    private fun handleCursorIndex(charSequence: CharSequence, selectionIndex: Int, isDeletion: Boolean): Int = when {
+        selectionIndex <= IBANMask.IBAN_PREFIX.length -> charSequence.length
+        selectionIndex >= charSequence.length -> charSequence.length
+        specialChars.contains(charSequence[selectionIndex - 1]) -> {
+            handleSpecialCharState(selectionIndex, isDeletion)
+        }
+        else -> selectionIndex
+    }
+
+    private fun handleSpecialCharState(cursor: Int, isDeletion: Boolean): Int {
+        return if (isDeletion) {
+            mask.calculateCurrentMaskDistance(cursor)
+        } else {
+            mask.calculateUpcomingMaskDistance(cursor) + 1
+        }
+    }
+
+    override fun getTextWithReturnPattern(): String? {
+        return mask.getParsedText(text)
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
index 7bb4c0c..508e8f2 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
@@ -6,34 +6,28 @@ import kotlin.properties.Delegates
 
 class Masker(
     override val mask: Mask,
-    override val onTextMaskedListener: (String) -> Unit
-) : BaseMasker {
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
 
     override val inputType: Int
         get() = InputType.TYPE_CLASS_NUMBER
 
+    private var selection = 0
+
     private var text: String by Delegates.observable("") { _, _, newValue ->
-        onTextMaskedListener(newValue)
+        onTextMaskedListener(newValue, selection)
     }
 
-    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int) {
-        if (charSequence == null) {
-            return
-        }
-        if (start >= mask.maskPattern.length) {
-            onTextMaskedListener(removeLastItem(charSequence))
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        if (charSequence.isNullOrEmpty()) {
+            selection = 0
+            text = ""
             return
         }
         when (count) {
-            IS_REMOVED -> {
-                handleDeletion(charSequence, start)
-            }
-            IS_ADDED -> {
-                handleAddition(charSequence, start)
-            }
-            else -> {
-                handleRestoration(charSequence)
-            }
+            IS_REMOVED -> handleDeletion(charSequence, start)
+            IS_ADDED -> handleAddition(charSequence, start)
+            else -> handleRestoration(charSequence)
         }
     }
 
@@ -107,10 +101,4 @@ class Masker(
             }
         }
     }
-
-    companion object {
-        const val POUND = '#'
-        const val IS_REMOVED = 0
-        const val IS_ADDED = 1
-    }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
new file mode 100644
index 0000000..b275086
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
@@ -0,0 +1,109 @@
+package com.hipo.maskededittext.maskers
+
+import android.text.InputType
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.formatAsMask
+import com.hipo.maskededittext.utils.extensions.specialChars
+import kotlin.properties.Delegates
+
+class PhoneNumberMasker(
+    override val mask: Mask,
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
+
+    override val inputType: Int
+        get() = InputType.TYPE_CLASS_NUMBER
+
+    private var text: String by Delegates.observable("") { _, _, newValue ->
+        if (selection >= newValue.length) selection = newValue.length
+        onTextMaskedListener(newValue, selection)
+    }
+
+    private val phoneMaskMinCharCount = mask.maskPattern.substringBefore(POUND).length
+
+    private var oldCursorPosition = 0
+    private var isUpcomingFieldSpecialChar = false
+
+    private var startLength = 0
+    private var endLength = 0
+    private var selection = 0
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {
+        oldCursorPosition = selectionStart
+    }
+
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        if (charSequence.isNullOrEmpty() || charSequence.length <= phoneMaskMinCharCount) {
+            val defaultPhoneFormat = mask.maskPattern.substringBefore(POUND)
+            selection = defaultPhoneFormat.length
+            text = defaultPhoneFormat
+            return
+        }
+        if (start < phoneMaskMinCharCount) {
+            selection = text.length
+            text = text
+            return
+        }
+        startLength = charSequence.length
+        when (count) {
+            IS_REMOVED -> handleDeletion(charSequence, selectionStart)
+            IS_ADDED -> handleAddition(charSequence, selectionStart)
+            else -> handleRestoration(charSequence)
+        }
+    }
+
+    private fun handleAddition(charSequence: CharSequence, start: Int) {
+        if (text.length >= mask.maskPattern.length) {
+            selection = oldCursorPosition
+            text = text
+            return
+        }
+        val formattedPhone = charSequence.toString().formatAsMask(mask)
+        endLength = formattedPhone.length
+        selection = handleCursorIndex(formattedPhone, getLengthDifferencesIfCursorEnd(start), false)
+        text = formattedPhone
+    }
+
+    private fun handleDeletion(charSequence: CharSequence, start: Int) {
+        val formattedPhone = charSequence.toString().formatAsMask(mask)
+        if (start == 0) {
+            selection = formattedPhone.length
+            text = formattedPhone
+            return
+        }
+        endLength = formattedPhone.length
+        selection = handleCursorIndex(formattedPhone, start, true)
+        text = formattedPhone
+    }
+
+    private fun handleRestoration(charSequence: CharSequence) {
+        val formattedPhone = charSequence.toString().formatAsMask(mask)
+        selection = formattedPhone.length
+        text = formattedPhone
+    }
+
+    private fun handleCursorIndex(charSequence: CharSequence, selectionIndex: Int, isDeletion: Boolean): Int = when {
+        selectionIndex <= phoneMaskMinCharCount -> charSequence.length
+        selectionIndex >= charSequence.length -> charSequence.length
+        specialChars.contains(charSequence[selectionIndex - 1]) -> {
+            handleSpecialCharState(selectionIndex - 1, isDeletion)
+        }
+        else -> selectionIndex
+    }
+
+    private fun handleSpecialCharState(cursor: Int, isDeletion: Boolean): Int {
+        return if (isDeletion) {
+            mask.calculateCurrentMaskDistance(cursor) + 1
+        } else {
+            mask.calculateUpcomingMaskDistance(cursor) + 1
+        }
+    }
+
+    private fun getLengthDifferencesIfCursorEnd(start: Int): Int {
+        return if (start < startLength) start else start + (endLength - startLength)
+    }
+
+    override fun getTextWithReturnPattern(): String? {
+        return mask.getParsedText(text)
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/StaticTextMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/StaticTextMasker.kt
index 47d33bb..ddd5c8c 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/StaticTextMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/StaticTextMasker.kt
@@ -6,21 +6,21 @@ import kotlin.properties.Delegates
 
 class StaticTextMasker(
     override val mask: Mask,
-    override val onTextMaskedListener: (String) -> Unit
-) : BaseMasker {
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
 
     override val inputType: Int
         get() = InputType.TYPE_CLASS_NUMBER
 
     private var text: String by Delegates.observable("") { _, _, newValue ->
-        onTextMaskedListener(newValue)
+        onTextMaskedListener(newValue, null)
     }
 
     init {
         text = mask.maskPattern
     }
 
-    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int) {
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
         if (charSequence == null) {
             return
         }
@@ -39,8 +39,4 @@ class StaticTextMasker(
             text = mask.maskPattern
         }
     }
-
-    companion object {
-        const val IS_REMOVED = 0
-    }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/TCIdMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/TCIdMasker.kt
new file mode 100644
index 0000000..3e9140c
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/TCIdMasker.kt
@@ -0,0 +1,83 @@
+package com.hipo.maskededittext.maskers
+
+import android.text.InputType
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.formatAsTcId
+import kotlin.properties.Delegates
+
+class TCIdMasker(
+    override val mask: Mask,
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
+
+    override val inputType: Int
+        get() = InputType.TYPE_CLASS_NUMBER
+
+    private var text: String by Delegates.observable("") { _, _, newValue ->
+        if (selection >= newValue.length) selection = newValue.length
+        onTextMaskedListener(newValue, selection)
+    }
+
+    private var oldCursorPosition = 0
+
+    private var startLength = 0
+    private var endLength = 0
+    private var selection = 0
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {
+        oldCursorPosition = selectionStart
+    }
+
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        if (charSequence.isNullOrEmpty()) {
+            selection = 0
+            text = ""
+            return
+        }
+        startLength = charSequence.length
+        when (count) {
+            IS_REMOVED -> handleDeletion(charSequence, start)
+            IS_ADDED -> handleAddition(charSequence, selectionStart)
+            else -> handleRestoration(charSequence)
+        }
+    }
+
+    private fun handleAddition(charSequence: CharSequence, start: Int) {
+        if (charSequence.length > mask.maskPattern.length) {
+            selection = oldCursorPosition
+            text = text
+            return
+        }
+        val formattedTcId = charSequence.toString().formatAsTcId(mask)
+        endLength = formattedTcId.length
+        selection = handleCursorIndex(formattedTcId, start, false)
+        text = formattedTcId
+    }
+
+    private fun handleDeletion(charSequence: CharSequence, start: Int) {
+        val formattedTcId: String = charSequence.toString().formatAsTcId(mask)
+        if (start == 0) {
+            selection = formattedTcId.length
+            text = formattedTcId
+            return
+        }
+        endLength = formattedTcId.length
+        selection = handleCursorIndex(formattedTcId, start, true)
+        text = formattedTcId
+    }
+
+    private fun handleRestoration(charSequence: CharSequence) {
+        val formattedTcId = charSequence.toString().formatAsTcId(mask)
+        selection = formattedTcId.length
+        text = formattedTcId
+    }
+
+    private fun handleCursorIndex(charSequence: CharSequence, selectionIndex: Int, isDeletion: Boolean): Int = when {
+        selectionIndex >= charSequence.length -> charSequence.length
+        else -> selectionIndex
+    }
+
+    override fun getTextWithReturnPattern(): String? {
+        return mask.getParsedText(text)
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt
index 69d84bb..61832e4 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt
@@ -3,8 +3,10 @@ package com.hipo.maskededittext.masks
 import com.hipo.maskededittext.Mask
 
 class CreditCardMask : Mask() {
+
     override val maskPattern: String
         get() = "####-####-####-####"
+
     override val returnPattern: String
         get() = "################"
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
index a815ced..1c0802d 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
@@ -2,22 +2,23 @@ package com.hipo.maskededittext.masks
 
 import com.hipo.maskededittext.Mask
 
-class CurrencyMask(override val maskPattern: String) : Mask() {
+class CurrencyMask(override val maskPattern: String = "#,##0.00") : Mask() {
+
     override val returnPattern: String
-        get() = ""
+        get() = "#,##0.00"
 
     override fun getParsedText(maskedText: String): String? {
-        val filteredText = filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) } ?: "0"
-        return filteredText.replace(",", "")
+        val filteredText = filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) } ?: "0,00"
+        return filteredText.filter { it.isDigit() || it == '.' }
     }
 
     override fun isValidToParse(maskedText: String): Boolean {
-        return maskedText.length > maskPattern.length
+        return true
     }
 
     override fun filterMaskedText(maskedText: String): String {
-        if (maskedText.isBlank()) return "0"
-        return maskedText.substring(maskPattern.length, maskedText.length).run {
+        if (maskedText.isBlank()) return "0,00"
+        return maskedText.run {
             if (last() == '.') substring(0, length - 1) else this
         }
     }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt
index b0ba579..92d77c6 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt
@@ -1,12 +1,13 @@
 package com.hipo.maskededittext.masks
 
 import com.hipo.maskededittext.Mask
-import com.hipo.maskededittext.maskers.Masker.Companion.POUND
+import com.hipo.maskededittext.maskers.BaseMasker.Companion.POUND
+
+class CustomMask(private val customMaskPattern: String, private val customReturnPattern: String) : Mask() {
 
-class CustomMask(private val customMaskPattern: String, private val customReturnPattern: String) :
-    Mask() {
     override val maskPattern: String
         get() = customMaskPattern
+
     override val returnPattern: String
         get() = customReturnPattern
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMask.kt
index d582ff0..453b021 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMask.kt
@@ -1,10 +1,12 @@
 package com.hipo.maskededittext.masks
 
 import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.isValidDate
 import java.text.ParseException
 import java.text.SimpleDateFormat
 
 class DateMask : Mask() {
+
     override val maskPattern: String
         get() = "## / ## / ####"
 
@@ -23,7 +25,8 @@ class DateMask : Mask() {
         return try {
             with(SimpleDateFormat(INPUT_DATE_FORMAT)) {
                 isLenient = false
-                parse(maskedText) != null && maskedText.length == maskPattern.length
+                filterMaskedText(maskedText).isValidDate() ||
+                    (parse(maskedText) != null && maskedText.length == maskPattern.length)
             }
         } catch (parseException: ParseException) {
             false
@@ -35,7 +38,7 @@ class DateMask : Mask() {
     }
 
     companion object {
-        private const val INPUT_DATE_FORMAT = "MM / dd / yyyy"
+        private const val INPUT_DATE_FORMAT = "dd / MM / yyyy"
         private const val OUTPUT_DATE_FORMAT = "yyyy-MM-dd"
     }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt
index 08bb2fd..13fba29 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt
@@ -1,22 +1,35 @@
 package com.hipo.maskededittext.masks
 
 import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.isValidDateMonthYear
+import java.text.SimpleDateFormat
 
 class DateMonthYearMask : Mask() {
+
     override val maskPattern: String
-        get() = "## / ####"
+        get() = "##/##"
+
     override val returnPattern: String
-        get() = "##-####"
+        get() = "##-##"
 
     override fun getParsedText(maskedText: String): String? {
-        return filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) }
+        return if (isValidToParse(maskedText)) {
+            SimpleDateFormat(OUTPUT_DATE_FORMAT).format(SimpleDateFormat(INPUT_DATE_FORMAT).parse(maskedText))
+        } else {
+            null
+        }
     }
 
     override fun isValidToParse(maskedText: String): Boolean {
-        return maskedText.length == maskPattern.length
+        return filterMaskedText(maskedText).isValidDateMonthYear()
     }
 
     override fun filterMaskedText(maskedText: String): String {
         return maskedText.filter { it.isDigit() }
     }
+
+    companion object {
+        private const val INPUT_DATE_FORMAT = "MM/yyyy"
+        private const val OUTPUT_DATE_FORMAT = "MM-yy"
+    }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/IBANMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/IBANMask.kt
new file mode 100644
index 0000000..d168930
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/IBANMask.kt
@@ -0,0 +1,30 @@
+package com.hipo.maskededittext.masks
+
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.isValidIban
+
+class IBANMask : Mask() {
+
+    override val maskPattern: String
+        get() = "TR## #### #### #### #### #### ##"
+
+    override val returnPattern: String
+        get() = "TR########################"
+
+    override fun getParsedText(maskedText: String): String? {
+        return filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) }
+    }
+
+    override fun isValidToParse(maskedText: String): Boolean {
+        return filterMaskedText(maskedText).isValidIban()
+    }
+
+    override fun filterMaskedText(maskedText: String): String {
+        return maskedText.filter { it.isDigit() }.prependIndent(IBAN_PREFIX)
+    }
+
+    companion object {
+        const val IBAN_PREFIX = "TR"
+        const val IBAN_NUMBERS_LENGTH = 24
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/PhoneMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/PhoneMask.kt
index 5f85bd5..67fca10 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/PhoneMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/PhoneMask.kt
@@ -3,8 +3,10 @@ package com.hipo.maskededittext.masks
 import com.hipo.maskededittext.Mask
 
 class PhoneMask : Mask() {
+
     override val maskPattern: String
-        get() = "(###) ###-####"
+        get() = "0 (5##) ### ## ##"
+
     override val returnPattern: String
         get() = "##########"
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/SSNMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/SSNMask.kt
index 38f0ab4..ee1d298 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/SSNMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/SSNMask.kt
@@ -3,8 +3,10 @@ package com.hipo.maskededittext.masks
 import com.hipo.maskededittext.Mask
 
 class SSNMask : Mask() {
+
     override val maskPattern: String
         get() = "###-##-####"
+
     override val returnPattern: String
         get() = "#########"
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/StaticTextMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/StaticTextMask.kt
index c8cbf17..2675d15 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/StaticTextMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/StaticTextMask.kt
@@ -3,8 +3,10 @@ package com.hipo.maskededittext.masks
 import com.hipo.maskededittext.Mask
 
 class StaticTextMask(private val customMaskPatter: String) : Mask() {
+
     override val maskPattern: String
         get() = customMaskPatter
+
     override val returnPattern: String
         get() = ""
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/TCIdMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/TCIdMask.kt
new file mode 100644
index 0000000..d25a285
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/TCIdMask.kt
@@ -0,0 +1,25 @@
+package com.hipo.maskededittext.masks
+
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.isValidIdentificationNumber
+
+class TCIdMask : Mask() {
+
+    override val maskPattern: String
+        get() = "###########"
+
+    override val returnPattern: String
+        get() = "###########"
+
+    override fun getParsedText(maskedText: String): String? {
+        return filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) }
+    }
+
+    override fun isValidToParse(maskedText: String): Boolean {
+        return filterMaskedText(maskedText).isValidIdentificationNumber()
+    }
+
+    override fun filterMaskedText(maskedText: String): String {
+        return maskedText.filter { it.isDigit() }
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/UnselectedMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/UnselectedMask.kt
index 0558c77..388c977 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/UnselectedMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/UnselectedMask.kt
@@ -3,12 +3,14 @@ package com.hipo.maskededittext.masks
 import com.hipo.maskededittext.Mask
 
 class UnselectedMask : Mask() {
+
     override val maskPattern: String
         get() = ""
+
     override val returnPattern: String
         get() = ""
 
     override fun getParsedText(maskedText: String): String? = null
-    override fun isValidToParse(filteredText: String) = false
+    override fun isValidToParse(maskedText: String) = false
     override fun filterMaskedText(maskedText: String) = ""
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt b/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
new file mode 100644
index 0000000..e39ba86
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
@@ -0,0 +1,34 @@
+package com.hipo.maskededittext.model
+
+import java.util.Locale
+
+data class CurrencyMaskerSettings(
+    var decimalLimit: Int = DEFAULT_DECIMAL_LIMIT,
+    var decimalSeparator: String = COMMA,
+    var groupingSeparator: String = DOT,
+    var prefix: String = "",
+    var suffix: String = "",
+    var locale: Locale = Locale.getDefault()
+) {
+    companion object {
+        const val DEFAULT_DECIMAL_LIMIT = 2
+        private const val DOT = "."
+        private const val COMMA = ","
+
+        fun create(
+            suffix: String,
+            prefix: String,
+            groupingSeparator: String,
+            decimalSeparator: String
+        ): CurrencyMaskerSettings {
+            return CurrencyMaskerSettings(
+                decimalLimit = DEFAULT_DECIMAL_LIMIT,
+                locale = Locale.getDefault(),
+                suffix = suffix,
+                prefix = prefix,
+                groupingSeparator = groupingSeparator,
+                decimalSeparator = decimalSeparator
+            )
+        }
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
new file mode 100644
index 0000000..8b7a86c
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
@@ -0,0 +1,169 @@
+package com.hipo.maskededittext.utils.extensions
+
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.masks.IBANMask
+
+//region Regex Patterns
+
+private const val ibanRegexPattern = "^(TR[0-9]{24})\$"
+private const val tcIdRegexPattern = "^\\d{11}\$"
+private const val dateMonthYearPattern = "^\\d{4}\$"
+private const val datePattern = "^\\d{8}\$"
+
+//endregion
+
+private const val MONTH_FIELD_UPPER_LIMIT = "12"
+private const val MONTH_FIELD_LOWER_LIMIT = "01"
+
+private const val DAY_FIELD_UPPER_LIMIT = "31"
+private const val DAY_FIELD_LOWER_LIMIT = "01"
+
+val specialChars = listOf('(', ')', '-', ' ', '/')
+
+internal fun String.trimAllSpaces() = this.filter { !it.isWhitespace() }
+
+internal fun String.removeWithRegex(pattern: String) = replace(pattern.toRegex(), "").trim()
+
+internal fun CharSequence.removeWithRegex(pattern: String) = replace(pattern.toRegex(), "").trim()
+
+//region Validators
+
+internal fun String?.isValidIban() = this?.matches(Regex(ibanRegexPattern)) ?: false
+
+internal fun String?.isValidIdentificationNumber() = this?.matches(Regex(tcIdRegexPattern)) ?: false
+
+internal fun String?.isValidDateMonthYear() = this?.matches(Regex(dateMonthYearPattern)) ?: false
+
+internal fun String?.isValidDate() = this?.matches(Regex(datePattern)) ?: false
+
+//endregion
+
+//region Formatters
+
+internal fun String.formatAsIban(): String {
+    val ibanNumbers = filter { it.isDigit() }
+    val formattedIban = if (ibanNumbers.length > IBANMask.IBAN_NUMBERS_LENGTH) {
+        ibanNumbers.substring(0, IBANMask.IBAN_NUMBERS_LENGTH)
+    } else {
+        ibanNumbers
+    }.prependIndent(IBANMask.IBAN_PREFIX)
+    return formattedIban.replace("(\\w{4})".toRegex(), "$1 ").trim()
+}
+
+internal fun String.formatAsDateMonthYear(year: Int, mask: Mask): String {
+    var dateMonthYear = filter { it.isDigit() }
+    if (dateMonthYear.isEmpty()) return ""
+
+    val monthField: String
+    var yearField: String
+
+    if (dateMonthYear[0].digitToInt() > 1) {
+        monthField = "0${dateMonthYear[0]}"
+        dateMonthYear.drop(1)
+    } else {
+        if (dateMonthYear.length < 2) return "${dateMonthYear[0]}".formatAsMask(mask)
+        monthField = when {
+            dateMonthYear.take(2).toInt() >= 12 -> MONTH_FIELD_UPPER_LIMIT
+            dateMonthYear.take(2) == "00" -> MONTH_FIELD_LOWER_LIMIT
+            else -> dateMonthYear.take(2)
+        }
+        dateMonthYear.drop(2)
+    }.also { dateMonthYear = it }
+
+    if (dateMonthYear.isEmpty()) return monthField.formatAsMask(mask)
+
+    yearField = if (dateMonthYear[0].digitToInt() < year / 10) {
+        "${year / 10}"
+    } else {
+        "${dateMonthYear[0]}"
+    }
+    if (dateMonthYear.length > 1) {
+        if (dateMonthYear[1].digitToInt() < year % 10) {
+            yearField += year % 10
+        } else {
+            yearField += dateMonthYear[1]
+        }
+    }
+
+    return "$monthField$yearField".formatAsMask(mask)
+}
+
+internal fun String.formatAsDate(mask: Mask): String {
+    var date = filter { it.isDigit() }
+    if (date.isEmpty()) return ""
+
+    val dayField: String
+    val monthField: String
+    val yearField: String
+
+    if (date[0].digitToInt() > 3) {
+        dayField = "0${date[0]}"
+        date.drop(1)
+    } else {
+        if (date.length < 2) return "${date[0]}".formatAsMask(mask)
+        dayField = when {
+            date.take(2).toInt() >= 31 -> DAY_FIELD_UPPER_LIMIT
+            date.take(2) == "00" -> DAY_FIELD_LOWER_LIMIT
+            else -> date.take(2)
+        }
+        date.drop(2)
+    }.also { date = it }
+
+    if (date.isEmpty()) return dayField.formatAsMask(mask)
+
+    if (date[0].digitToInt() > 1) {
+        monthField = "0${date[0]}"
+        date.drop(1)
+    } else {
+        if (date.length < 2) return "$dayField${date[0]}".formatAsMask(mask)
+        monthField = when {
+            date.take(2).toInt() >= 12 -> MONTH_FIELD_UPPER_LIMIT
+            date.take(2) == "00" -> MONTH_FIELD_LOWER_LIMIT
+            else -> date.take(2)
+        }
+        date.drop(2)
+    }.also { date = it }
+
+    if (date.isEmpty()) return "$dayField$monthField".formatAsMask(mask)
+
+    yearField = date.take(4)
+
+    return "$dayField$monthField$yearField".formatAsMask(mask)
+}
+
+internal fun String.formatAsMask(mask: Mask): String {
+    val rawInput = filter { it.isDigit() }
+    var formattedInput = ""
+    var index = 0
+    var nestedIndex = 0
+    val pattern = mask.maskPattern
+
+    pattern.forEach { patternChar ->
+        when {
+            specialChars.any { it == patternChar } -> {
+                formattedInput += patternChar
+                ++nestedIndex
+            }
+            else -> {
+                if (index >= rawInput.length) {
+                    return formattedInput
+                }
+                formattedInput += rawInput[index]
+                ++index
+                ++nestedIndex
+            }
+        }
+    }
+    return formattedInput
+}
+
+internal fun String.formatAsTcId(mask: Mask): String {
+    val tcId = filter { it.isDigit() }
+    return if (tcId.length > mask.maskPattern.length) {
+        tcId.substring(0, mask.maskPattern.length)
+    } else {
+        tcId
+    }
+}
+
+//endregion
diff --git a/maskededittext/src/main/res/values/attrs.xml b/maskededittext/src/main/res/values/attrs.xml
index 1ddf5d3..1124ddb 100644
--- a/maskededittext/src/main/res/values/attrs.xml
+++ b/maskededittext/src/main/res/values/attrs.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="MaskedEditText">
+    <attr name="body" format="string" />
+    <attr name="startIcon" format="reference" />
+    <attr name="endIcon" format="reference" />
+
+    <declare-styleable name="MaskedTextInputEditText">
         <attr name="maskType" format="enum">
             <enum name="date" value="0" />
             <enum name="phone" value="1" />
@@ -11,10 +15,27 @@
             <enum name="static_text" value="5" />
             <enum name="credit_card" value="6" />
             <enum name="date_mm_yyyy" value="7" />
+            <enum name="iban" value="8" />
+            <enum name="tc_id" value="9" />
         </attr>
+        <attr name="decimalSeparator" format="string" />
+        <attr name="groupingSeparator" format="string" />
         <attr name="maskPattern" format="string" />
         <attr name="returnPattern" format="string" />
         <attr name="currencyDecimalLimit" format="integer" />
+        <attr name="currencyPrefix" format="string" />
+        <attr name="currencySuffix" format="string" />
+        <!-- TODO ask here to yasin  -->
+        <attr name="android:title" />
+        <attr name="body" />
+        <attr name="startIcon" />
+        <attr name="endIcon" />
+        <attr name="primaryListItemTitleStyle" format="reference" />
+        <attr name="primaryListItemBodyStyle" format="reference" />
+        <attr name="primaryListItemStartIconStyle" format="reference" />
+        <attr name="primaryListItemEndIconStyle" format="reference" />
+        <attr name="primaryListItemTopGuidelineStyle" format="reference" />
+        <attr name="primaryListItemBottomGuidelineStyle" format="reference" />
     </declare-styleable>
 
 </resources>

From fa13287315f231b318c2af5bc23c76ef1c9fb334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Mon, 12 Jul 2021 10:56:13 +0300
Subject: [PATCH 03/18] :recycle: Move currency pattern to strings.xml and
 remove CurrencySetting creator function

---
 app/src/main/res/layout/activity_main.xml        | 10 ----------
 .../main/java/com/hipo/maskededittext/Mask.kt    |  2 +-
 .../maskededittext/MaskedTextInputEditText.kt    |  3 ++-
 .../model/CurrencyMaskerSettings.kt              | 16 ----------------
 maskededittext/src/main/res/values/strings.xml   |  3 ++-
 5 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5da7d2f..c2328ce 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,16 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <com.hipo.maskededittext.MaskedTextInputEditText
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:currencySuffix="$"
-        app:layout_constraintBottom_toTopOf="@+id/mainPhotoCropDemoButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:maskType="currency" />
-
     <Button
         android:id="@+id/mainPhotoCropDemoButton"
         android:layout_width="wrap_content"
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
index e29a2af..270fa96 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
@@ -64,7 +64,7 @@ abstract class Mask {
         },
         CURRENCY {
             override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                CurrencyMask()
+                CurrencyMask(maskPattern.orEmpty())
         },
         CUSTOM {
             override fun create(maskPattern: String?, returnPattern: String?): Mask =
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
index af40da6..8c823c2 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
@@ -86,7 +86,8 @@ class MaskedTextInputEditText : TextInputEditText {
                 typedArray.getString(R.styleable.MaskedTextInputEditText_decimalSeparator) ?: COMMA
             currencySettings.groupingSeparator =
                 typedArray.getString(R.styleable.MaskedTextInputEditText_groupingSeparator) ?: DOT
-            maskPattern = typedArray.getString(R.styleable.MaskedTextInputEditText_maskPattern).orEmpty()
+            maskPattern = typedArray.getString(R.styleable.MaskedTextInputEditText_maskPattern)
+                ?: context.getString(R.string.currency_mask_pattern)
             returnMaskPattern = typedArray.getString(R.styleable.MaskedTextInputEditText_returnPattern).orEmpty()
             currencySettings.prefix = typedArray.getString(R.styleable.MaskedTextInputEditText_currencySuffix).orEmpty()
             currencySettings.suffix = typedArray.getString(R.styleable.MaskedTextInputEditText_currencyPrefix).orEmpty()
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt b/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
index e39ba86..4b706d4 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
@@ -14,21 +14,5 @@ data class CurrencyMaskerSettings(
         const val DEFAULT_DECIMAL_LIMIT = 2
         private const val DOT = "."
         private const val COMMA = ","
-
-        fun create(
-            suffix: String,
-            prefix: String,
-            groupingSeparator: String,
-            decimalSeparator: String
-        ): CurrencyMaskerSettings {
-            return CurrencyMaskerSettings(
-                decimalLimit = DEFAULT_DECIMAL_LIMIT,
-                locale = Locale.getDefault(),
-                suffix = suffix,
-                prefix = prefix,
-                groupingSeparator = groupingSeparator,
-                decimalSeparator = decimalSeparator
-            )
-        }
     }
 }
diff --git a/maskededittext/src/main/res/values/strings.xml b/maskededittext/src/main/res/values/strings.xml
index e627658..d880297 100644
--- a/maskededittext/src/main/res/values/strings.xml
+++ b/maskededittext/src/main/res/values/strings.xml
@@ -5,4 +5,5 @@
     <string name="exception_mask_pound_static">Static mask must contain maskPattern</string>
     <string name="exception_return_pound">Custom mask returnType must contain #</string>
     <string name="exception_unselected_mask">maskType must be selected</string>
-</resources>
\ No newline at end of file
+    <string name="currency_mask_pattern">#,##0.00</string>
+</resources>

From c3f2f491a091b80a5c4179d5355a48aa01deaca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Mon, 12 Jul 2021 16:17:28 +0300
Subject: [PATCH 04/18] :arrow_up: Upgrade all dependencies to latest version

---
 maskededittext/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/maskededittext/build.gradle b/maskededittext/build.gradle
index b208578..e92cacb 100644
--- a/maskededittext/build.gradle
+++ b/maskededittext/build.gradle
@@ -31,10 +31,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.1.0'
-
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+    implementation 'com.google.android.material:material:1.4.0'
 }
 
 tasks.withType(Javadoc).all { enabled = false }

From c7832d48d03ce554ac539fea42a39b3d40d941e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Mon, 12 Jul 2021 20:48:27 +0300
Subject: [PATCH 05/18] :sparkles: Implement MaskedTextInputLayout

---
 app/src/main/res/drawable/ic_android.xml      |   9 +
 maskededittext/build.gradle                   |  10 +
 .../main/java/com/hipo/maskededittext/Mask.kt |  78 +++++---
 .../com/hipo/maskededittext/MaskCreator.kt    |   8 +-
 .../maskededittext/MaskedTextInputEditText.kt |  30 +--
 .../maskededittext/MaskedTextInputLayout.kt   | 171 ++++++++++++++++++
 .../hipo/maskededittext/masks/CurrencyMask.kt |  25 ++-
 .../maskededittext/model/CustomInputState.kt  |   9 +
 .../utils/extensions/NumberExtensions.kt      |   7 +
 .../utils/extensions/StringExtensions.kt      |   2 +-
 .../utils/extensions/ViewExtensions.kt        |  37 ++++
 .../FragmentViewBindingDelegate.kt            |  57 ++++++
 .../utils/viewbinding/ViewBindingUtils.kt     |  11 ++
 .../src/main/res/drawable/ic_android.xml      |   5 +
 .../res/layout/custom_masked_input_layout.xml |  66 +++++++
 maskededittext/src/main/res/values/attrs.xml  |  76 ++++----
 maskededittext/src/main/res/values/dimens.xml |   4 +
 17 files changed, 524 insertions(+), 81 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_android.xml
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/model/CustomInputState.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/NumberExtensions.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/ViewExtensions.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/FragmentViewBindingDelegate.kt
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/ViewBindingUtils.kt
 create mode 100644 maskededittext/src/main/res/drawable/ic_android.xml
 create mode 100644 maskededittext/src/main/res/layout/custom_masked_input_layout.xml
 create mode 100644 maskededittext/src/main/res/values/dimens.xml

diff --git a/app/src/main/res/drawable/ic_android.xml b/app/src/main/res/drawable/ic_android.xml
new file mode 100644
index 0000000..0df8cff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_android.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"
+        android:fillColor="#FF000000"/>
+</vector>
\ No newline at end of file
diff --git a/maskededittext/build.gradle b/maskededittext/build.gradle
index e92cacb..4656043 100644
--- a/maskededittext/build.gradle
+++ b/maskededittext/build.gradle
@@ -26,6 +26,10 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
@@ -35,6 +39,12 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     implementation 'com.google.android.material:material:1.4.0'
+
+    def lifecycle = "2.3.1"
+
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle"
 }
 
 tasks.withType(Javadoc).all { enabled = false }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
index 270fa96..ac2ec4c 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/Mask.kt
@@ -11,6 +11,7 @@ import com.hipo.maskededittext.masks.SSNMask
 import com.hipo.maskededittext.masks.StaticTextMask
 import com.hipo.maskededittext.masks.TCIdMask
 import com.hipo.maskededittext.masks.UnselectedMask
+import com.hipo.maskededittext.model.CurrencyMaskerSettings
 import com.hipo.maskededittext.utils.extensions.specialChars
 
 
@@ -51,48 +52,81 @@ abstract class Mask {
     // Enum class order must be the same as attrs.xml order
     enum class Type : MaskCreator {
         DATE {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                DateMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = DateMask()
         },
         PHONE {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                PhoneMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = PhoneMask()
         },
         SSN {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                SSNMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = SSNMask()
         },
         CURRENCY {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                CurrencyMask(maskPattern.orEmpty())
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = CurrencyMask(maskPattern.orEmpty(), currencyMaskerSettings)
         },
         CUSTOM {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                CustomMask(maskPattern.orEmpty(), returnPattern.orEmpty())
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = CustomMask(maskPattern.orEmpty(), returnPattern.orEmpty())
         },
         STATIC_TEXT {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                StaticTextMask(maskPattern!!)
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = StaticTextMask(maskPattern!!)
         },
         CREDIT_CARD {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                CreditCardMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = CreditCardMask()
         },
         DATE_MONTH_YEAR {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                DateMonthYearMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = DateMonthYearMask()
         },
         IBAN {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                IBANMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = IBANMask()
         },
         TC_ID {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                TCIdMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = TCIdMask()
         },
         UNSELECTED {
-            override fun create(maskPattern: String?, returnPattern: String?): Mask =
-                UnselectedMask()
+            override fun create(
+                maskPattern: String?,
+                returnPattern: String?,
+                currencyMaskerSettings: CurrencyMaskerSettings?
+            ): Mask = UnselectedMask()
         },
     }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskCreator.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskCreator.kt
index 19bd9db..06800a3 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskCreator.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskCreator.kt
@@ -1,5 +1,11 @@
 package com.hipo.maskededittext
 
+import com.hipo.maskededittext.model.CurrencyMaskerSettings
+
 interface MaskCreator {
-    fun create(maskPattern: String? = null, returnPattern: String? = null): Mask
+    fun create(
+        maskPattern: String? = null,
+        returnPattern: String? = null,
+        currencyMaskerSettings: CurrencyMaskerSettings? = null
+    ): Mask
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
index 8c823c2..c9d728e 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
@@ -69,35 +69,35 @@ class MaskedTextInputEditText : TextInputEditText {
     private var textWatcher: TextWatcher? = null
     private var masker: BaseMasker? = null
 
-    private var maskPattern: String = ""
-    private var returnMaskPattern: String = ""
+    var maskPattern: String = ""
+    var returnMaskPattern: String = ""
 
-    private var maskType: Mask by Delegates.observable<Mask>(UnselectedMask()) { _, _, newValue ->
+    var maskType: Mask by Delegates.observable<Mask>(UnselectedMask()) { _, _, newValue ->
         setMasker(newValue)
     }
 
-    private var currencySettings = CurrencyMaskerSettings()
+    var currencySettings = CurrencyMaskerSettings()
 
     var onTextChangedListener: ((String) -> Unit)? = null
 
     private fun initAttributes(attrs: AttributeSet?, defStyle: Int = -1) {
-        context.obtainStyledAttributes(attrs, R.styleable.MaskedTextInputEditText, defStyle, 0).use { typedArray ->
+        context.obtainStyledAttributes(attrs, R.styleable.MaskedInputLayout, defStyle, 0).use { typedArray ->
             currencySettings.decimalSeparator =
-                typedArray.getString(R.styleable.MaskedTextInputEditText_decimalSeparator) ?: COMMA
+                typedArray.getString(R.styleable.MaskedInputLayout_decimalSeparator) ?: COMMA
             currencySettings.groupingSeparator =
-                typedArray.getString(R.styleable.MaskedTextInputEditText_groupingSeparator) ?: DOT
-            maskPattern = typedArray.getString(R.styleable.MaskedTextInputEditText_maskPattern)
+                typedArray.getString(R.styleable.MaskedInputLayout_groupingSeparator) ?: DOT
+            maskPattern = typedArray.getString(R.styleable.MaskedInputLayout_maskPattern)
                 ?: context.getString(R.string.currency_mask_pattern)
-            returnMaskPattern = typedArray.getString(R.styleable.MaskedTextInputEditText_returnPattern).orEmpty()
-            currencySettings.prefix = typedArray.getString(R.styleable.MaskedTextInputEditText_currencySuffix).orEmpty()
-            currencySettings.suffix = typedArray.getString(R.styleable.MaskedTextInputEditText_currencyPrefix).orEmpty()
+            returnMaskPattern = typedArray.getString(R.styleable.MaskedInputLayout_returnPattern).orEmpty()
+            currencySettings.prefix = typedArray.getString(R.styleable.MaskedInputLayout_currencySuffix).orEmpty()
+            currencySettings.suffix = typedArray.getString(R.styleable.MaskedInputLayout_currencyPrefix).orEmpty()
             currencySettings.decimalLimit = typedArray.getInteger(
-                R.styleable.MaskedTextInputEditText_currencyDecimalLimit,
+                R.styleable.MaskedInputLayout_currencyDecimalLimit,
                 CurrencyMaskerSettings.DEFAULT_DECIMAL_LIMIT
             ).also { decimalLimit -> CurrencyMasker.checkIfLimitSafe(decimalLimit) }
             maskType = Mask.Type.values()[
-                typedArray.getInt(R.styleable.MaskedTextInputEditText_maskType, Mask.Type.UNSELECTED.ordinal)
-            ].create(maskPattern, returnMaskPattern)
+                typedArray.getInt(R.styleable.MaskedInputLayout_maskType, Mask.Type.UNSELECTED.ordinal)
+            ].create(maskPattern, returnMaskPattern, currencySettings)
         }
         inputType = masker?.inputType ?: TYPE_CLASS_NUMBER
         keyListener = masker?.keyListener
@@ -193,7 +193,7 @@ class MaskedTextInputEditText : TextInputEditText {
 
     fun updateCurrencyModel(currencyMaskerSettings: CurrencyMaskerSettings) {
         this.currencySettings = currencyMaskerSettings
-        maskType = CurrencyMask()
+        maskType = CurrencyMask(currencyMaskerSettings = currencySettings)
     }
 
     fun setCurrencyText(currency: String) {
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
new file mode 100644
index 0000000..e2878ee
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
@@ -0,0 +1,171 @@
+package com.hipo.maskededittext
+
+import android.content.Context
+import android.os.Parcelable
+import android.text.InputFilter
+import android.util.AttributeSet
+import android.util.SparseArray
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.use
+import androidx.core.widget.addTextChangedListener
+import com.hipo.maskededittext.databinding.CustomMaskedInputLayoutBinding
+import com.hipo.maskededittext.model.CurrencyMaskerSettings
+import com.hipo.maskededittext.model.CustomInputState
+import com.hipo.maskededittext.utils.extensions.dp
+import com.hipo.maskededittext.utils.extensions.setTextAndVisibility
+import com.hipo.maskededittext.utils.extensions.show
+import com.hipo.maskededittext.utils.extensions.showKeyboard
+import com.hipo.maskededittext.utils.viewbinding.viewBinding
+
+class MaskedTextInputLayout @JvmOverloads constructor(
+    context: Context,
+    private val attrs: AttributeSet? = null,
+    defStyle: Int = 0
+) : ConstraintLayout(context, attrs, defStyle) {
+
+    private val binding = viewBinding(CustomMaskedInputLayoutBinding::inflate)
+
+    val editText = binding.textInputEditText
+
+    var endIconClick: (() -> Unit)? = null
+
+    var text: String
+        get() = binding.textInputEditText.text.toString()
+        set(value) {
+            binding.textInputEditText.setText(value)
+        }
+
+    var error: String?
+        get() = binding.errorTextView.text.toString()
+        set(value) {
+            binding.errorTextView.setTextAndVisibility(value)
+        }
+
+    var helper: String?
+        get() = binding.helperTextView.text.toString()
+        set(value) {
+            binding.helperTextView.setTextAndVisibility(value)
+        }
+
+    var inputType: Int?
+        get() = binding.textInputEditText.inputType
+        set(value) {
+            binding.textInputEditText.apply {
+                if (value != null && value != -1) {
+                    inputType = value
+                }
+            }
+        }
+
+    var maxLength: Int? = null
+        set(value) {
+            field = value
+            binding.textInputEditText.apply {
+                if (value != null && value != -1) {
+                    filters = arrayOf(InputFilter.LengthFilter(value))
+                }
+            }
+        }
+
+    var hint: String?
+        get() = binding.textInputLayout.hint.toString()
+        set(value) {
+            binding.textInputLayout.hint = value
+        }
+
+    var maskPattern: String = ""
+        set(value) {
+            field = value
+            binding.textInputEditText.maskPattern = value
+        }
+
+    var returnMaskPattern: String = ""
+        set(value) {
+            field = value
+            binding.textInputEditText.returnMaskPattern = value
+        }
+
+    var currencyDecimalLimit = CurrencyMaskerSettings.DEFAULT_DECIMAL_LIMIT
+        set(value) {
+            field = value
+            binding.textInputEditText.currencySettings.decimalLimit = value
+        }
+
+    var maskType: Mask? = null
+        set(value) {
+            field = value
+            if (value != null) {
+                binding.textInputEditText.maskType = value
+            }
+        }
+
+    var onTextChanged: ((text: String) -> Unit)? = null
+
+    init {
+        loadAttrs()
+        initUi()
+    }
+
+    private fun loadAttrs() {
+        context.obtainStyledAttributes(attrs, R.styleable.MaskedInputLayout).use { attrs ->
+            text = attrs.getString(R.styleable.MaskedInputLayout_android_text).orEmpty()
+            hint = attrs.getString(R.styleable.MaskedInputLayout_android_hint)
+            error = attrs.getString(R.styleable.MaskedInputLayout_error)
+            helper = attrs.getString(R.styleable.MaskedInputLayout_helper)
+            inputType = attrs.getInteger(R.styleable.MaskedInputLayout_android_inputType, -1)
+            maxLength = attrs.getInteger(R.styleable.MaskedInputLayout_android_maxLength, -1)
+        }
+    }
+
+    private fun initUi() {
+        binding.textInputEditText.addTextChangedListener {
+            onTextChanged?.invoke(text)
+        }
+
+        binding.iconImageView.setOnClickListener {
+            endIconClick?.invoke()
+        }
+    }
+
+    override fun onSaveInstanceState(): Parcelable {
+        return CustomInputState(super.onSaveInstanceState(), text)
+    }
+
+    override fun onRestoreInstanceState(state: Parcelable?) {
+        (state as? CustomInputState)?.run {
+            super.onRestoreInstanceState(superState)
+            this@MaskedTextInputLayout.text = text
+        }
+    }
+
+    override fun dispatchSaveInstanceState(container: SparseArray<Parcelable>?) {
+        super.dispatchFreezeSelfOnly(container)
+    }
+
+    override fun dispatchRestoreInstanceState(container: SparseArray<Parcelable>?) {
+        super.dispatchThawSelfOnly(container)
+    }
+
+    fun showKeyboard() {
+        binding.textInputEditText.showKeyboard()
+    }
+
+    fun showEndIcon(@DrawableRes drawableRes: Int, @ColorRes tint: Int? = null) {
+        with(binding) {
+            iconImageView.setImageDrawable(ContextCompat.getDrawable(context, drawableRes))
+            tint?.let {
+                iconImageView.imageTintList = ContextCompat.getColorStateList(context, it)
+            }
+            textInputEditText.setPadding(
+                textInputEditText.paddingLeft,
+                textInputEditText.paddingTop,
+                context.resources.getDimension(R.dimen.spacing_40).toInt().dp,
+                textInputEditText.paddingBottom
+            )
+            iconImageView.show()
+        }
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
index 1c0802d..3bbf4f6 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
@@ -1,15 +1,22 @@
 package com.hipo.maskededittext.masks
 
 import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.model.CurrencyMaskerSettings
 
-class CurrencyMask(override val maskPattern: String = "#,##0.00") : Mask() {
+class CurrencyMask(
+    override val maskPattern: String = DEFAULT_CURRENCY_MASK,
+    private val currencyMaskerSettings: CurrencyMaskerSettings?
+) : Mask() {
 
     override val returnPattern: String
-        get() = "#,##0.00"
+        get() = DEFAULT_CURRENCY_MASK
+
+    private val defaultCurrencyValue
+        get() = "0${currencyMaskerSettings?.decimalSeparator}00"
 
     override fun getParsedText(maskedText: String): String? {
-        val filteredText = filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) } ?: "0,00"
-        return filteredText.filter { it.isDigit() || it == '.' }
+        val filteredText = filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) } ?: defaultCurrencyValue
+        return filteredText.filter { it.isDigit() || it == currencyMaskerSettings?.decimalSeparator?.first() }
     }
 
     override fun isValidToParse(maskedText: String): Boolean {
@@ -17,9 +24,11 @@ class CurrencyMask(override val maskPattern: String = "#,##0.00") : Mask() {
     }
 
     override fun filterMaskedText(maskedText: String): String {
-        if (maskedText.isBlank()) return "0,00"
-        return maskedText.run {
-            if (last() == '.') substring(0, length - 1) else this
-        }
+        if (maskedText.isBlank()) return defaultCurrencyValue
+        return maskedText
+    }
+
+    companion object {
+        private const val DEFAULT_CURRENCY_MASK = "#,##0.00"
     }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/model/CustomInputState.kt b/maskededittext/src/main/java/com/hipo/maskededittext/model/CustomInputState.kt
new file mode 100644
index 0000000..ee11fc7
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/model/CustomInputState.kt
@@ -0,0 +1,9 @@
+package com.hipo.maskededittext.model
+
+import android.os.Parcelable
+import android.view.View
+
+class CustomInputState(
+    superState: Parcelable?,
+    val text: String
+) : View.BaseSavedState(superState)
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/NumberExtensions.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/NumberExtensions.kt
new file mode 100644
index 0000000..1f2d2fa
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/NumberExtensions.kt
@@ -0,0 +1,7 @@
+package com.hipo.maskededittext.utils.extensions
+
+import android.content.res.Resources
+
+val Int.dp: Int
+    get() = (this * Resources.getSystem().displayMetrics.density).toInt()
+
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
index 8b7a86c..00ed956 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
@@ -18,7 +18,7 @@ private const val MONTH_FIELD_LOWER_LIMIT = "01"
 private const val DAY_FIELD_UPPER_LIMIT = "31"
 private const val DAY_FIELD_LOWER_LIMIT = "01"
 
-val specialChars = listOf('(', ')', '-', ' ', '/')
+internal val specialChars = listOf('(', ')', '-', ' ', '/')
 
 internal fun String.trimAllSpaces() = this.filter { !it.isWhitespace() }
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/ViewExtensions.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/ViewExtensions.kt
new file mode 100644
index 0000000..043c611
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/ViewExtensions.kt
@@ -0,0 +1,37 @@
+package com.hipo.maskededittext.utils.extensions
+
+import android.content.Context
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+import android.widget.TextView
+import androidx.core.view.isVisible
+
+internal fun TextView.setTextAndVisibility(text: String?) {
+    setText(text)
+    isVisible = text.isNullOrEmpty().not()
+}
+
+internal fun View.show() {
+    this.visibility = View.VISIBLE
+}
+
+internal fun View.hide() {
+    this.visibility = View.GONE
+}
+
+internal fun View.invisible() {
+    this.visibility = View.INVISIBLE
+}
+
+internal fun View.hideKeyboard(): Boolean {
+    clearFocus()
+    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    return imm.hideSoftInputFromWindow(windowToken, 0)
+}
+
+internal fun EditText.showKeyboard(): Boolean {
+    requestFocus()
+    val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    return imm.showSoftInput(this, 0)
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/FragmentViewBindingDelegate.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/FragmentViewBindingDelegate.kt
new file mode 100644
index 0000000..550e80d
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/FragmentViewBindingDelegate.kt
@@ -0,0 +1,57 @@
+package com.hipo.maskededittext.utils.viewbinding
+
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.viewbinding.ViewBinding
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+class FragmentViewBindingDelegate<T : ViewBinding>(
+    val fragment: Fragment,
+    val viewBindingFactory: (View) -> T
+) : ReadOnlyProperty<Fragment, T> {
+    private var binding: T? = null
+
+    init {
+        fragment.lifecycle.addObserver(object : DefaultLifecycleObserver {
+            val viewLifecycleOwnerLiveDataObserver =
+                Observer<LifecycleOwner?> { viewLifecycleOwner ->
+                    viewLifecycleOwner?.lifecycle?.addObserver(object : DefaultLifecycleObserver {
+                        override fun onDestroy(owner: LifecycleOwner) {
+                            binding = null
+                        }
+                    })
+                }
+
+            override fun onCreate(owner: LifecycleOwner) {
+                fragment.viewLifecycleOwnerLiveData.observeForever(
+                    viewLifecycleOwnerLiveDataObserver
+                )
+            }
+
+            override fun onDestroy(owner: LifecycleOwner) {
+                fragment.viewLifecycleOwnerLiveData.removeObserver(
+                    viewLifecycleOwnerLiveDataObserver
+                )
+            }
+        })
+    }
+
+    override fun getValue(thisRef: Fragment, property: KProperty<*>): T {
+        val binding = binding
+        if (binding != null) {
+            return binding
+        }
+
+        val lifecycle = fragment.viewLifecycleOwner.lifecycle
+        if (!lifecycle.currentState.isAtLeast(Lifecycle.State.INITIALIZED)) {
+            throw IllegalStateException("Should not attempt to get bindings when Fragment views are destroyed.")
+        }
+
+        return viewBindingFactory(thisRef.requireView()).also { this.binding = it }
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/ViewBindingUtils.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/ViewBindingUtils.kt
new file mode 100644
index 0000000..fa4b281
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/viewbinding/ViewBindingUtils.kt
@@ -0,0 +1,11 @@
+package com.hipo.maskededittext.utils.viewbinding
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.viewbinding.ViewBinding
+
+internal inline fun <T : ViewBinding> ViewGroup.viewBinding(
+    crossinline inflater: (LayoutInflater, ViewGroup) -> T
+): T {
+    return inflater.invoke(LayoutInflater.from(context), this)
+}
diff --git a/maskededittext/src/main/res/drawable/ic_android.xml b/maskededittext/src/main/res/drawable/ic_android.xml
new file mode 100644
index 0000000..d38b911
--- /dev/null
+++ b/maskededittext/src/main/res/drawable/ic_android.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF0000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"/>
+</vector>
diff --git a/maskededittext/src/main/res/layout/custom_masked_input_layout.xml b/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
new file mode 100644
index 0000000..9168fa6
--- /dev/null
+++ b/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge 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="match_parent"
+    android:layout_height="wrap_content"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInputLayout"
+        style="?attr/textInputLayoutStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:hint="@tools:sample/lorem[1]">
+
+        <com.hipo.maskededittext.MaskedTextInputEditText
+            android:id="@+id/textInputEditText"
+            style="?attr/textInputEditTextStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="@tools:sample/lorem[2]" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iconImageView"
+        style="?attr/endIconStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/textInputLayout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/textInputLayout"
+        tools:srcCompat="@drawable/ic_android"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/errorTextView"
+        style="?attr/textInputErrorStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/textInputLayout"
+        tools:text="Error Text"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/helperTextView"
+        style="?attr/textInputHelperStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/errorTextView"
+        tools:text="Helper Text"
+        tools:visibility="visible" />
+
+</merge>
diff --git a/maskededittext/src/main/res/values/attrs.xml b/maskededittext/src/main/res/values/attrs.xml
index 1124ddb..eecae89 100644
--- a/maskededittext/src/main/res/values/attrs.xml
+++ b/maskededittext/src/main/res/values/attrs.xml
@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="body" format="string" />
-    <attr name="startIcon" format="reference" />
-    <attr name="endIcon" format="reference" />
+    <attr name="maskType" format="enum">
+        <enum name="date" value="0" />
+        <enum name="phone" value="1" />
+        <enum name="ssn" value="2" />
+        <enum name="currency" value="3" />
+        <enum name="custom" value="4" />
+        <enum name="static_text" value="5" />
+        <enum name="credit_card" value="6" />
+        <enum name="date_mm_yyyy" value="7" />
+        <enum name="iban" value="8" />
+        <enum name="tc_id" value="9" />
+    </attr>
+    <attr name="decimalSeparator" format="string" />
+    <attr name="groupingSeparator" format="string" />
+    <attr name="maskPattern" format="string" />
+    <attr name="returnPattern" format="string" />
+    <attr name="currencyDecimalLimit" format="integer" />
+    <attr name="currencyPrefix" format="string" />
+    <attr name="currencySuffix" format="string" />
 
-    <declare-styleable name="MaskedTextInputEditText">
-        <attr name="maskType" format="enum">
-            <enum name="date" value="0" />
-            <enum name="phone" value="1" />
-            <enum name="ssn" value="2" />
-            <enum name="currency" value="3" />
-            <enum name="custom" value="4" />
-            <enum name="static_text" value="5" />
-            <enum name="credit_card" value="6" />
-            <enum name="date_mm_yyyy" value="7" />
-            <enum name="iban" value="8" />
-            <enum name="tc_id" value="9" />
-        </attr>
-        <attr name="decimalSeparator" format="string" />
-        <attr name="groupingSeparator" format="string" />
-        <attr name="maskPattern" format="string" />
-        <attr name="returnPattern" format="string" />
-        <attr name="currencyDecimalLimit" format="integer" />
-        <attr name="currencyPrefix" format="string" />
-        <attr name="currencySuffix" format="string" />
-        <!-- TODO ask here to yasin  -->
-        <attr name="android:title" />
-        <attr name="body" />
-        <attr name="startIcon" />
-        <attr name="endIcon" />
-        <attr name="primaryListItemTitleStyle" format="reference" />
-        <attr name="primaryListItemBodyStyle" format="reference" />
-        <attr name="primaryListItemStartIconStyle" format="reference" />
-        <attr name="primaryListItemEndIconStyle" format="reference" />
-        <attr name="primaryListItemTopGuidelineStyle" format="reference" />
-        <attr name="primaryListItemBottomGuidelineStyle" format="reference" />
+    <declare-styleable name="MaskedInputLayout">
+        <attr name="android:text" />
+        <attr name="android:hint" />
+        <attr name="android:inputType" />
+        <attr name="android:maxLength" />
+
+        <attr name="textInputLayoutStyle" format="reference" />
+        <attr name="textInputEditTextStyle" format="reference" />
+        <attr name="textInputErrorStyle" format="reference" />
+        <attr name="textInputHelperStyle" format="reference" />
+        <attr name="endIconStyle" format="reference" />
+
+        <attr name="error" format="string" />
+        <attr name="helper" format="string" />
+
+        <attr name="currencyDecimalLimit" />
+        <attr name="currencyPrefix" />
+        <attr name="currencySuffix" />
+        <attr name="decimalSeparator" />
+        <attr name="groupingSeparator" />
+        <attr name="maskPattern" />
+        <attr name="maskType" />
+        <attr name="returnPattern" />
     </declare-styleable>
 
 </resources>
diff --git a/maskededittext/src/main/res/values/dimens.xml b/maskededittext/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..f4b6570
--- /dev/null
+++ b/maskededittext/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="spacing_40">40dp</dimen>
+</resources>

From 1992abe5220f5663984b8b826321b95022379713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Mon, 12 Jul 2021 20:49:27 +0300
Subject: [PATCH 06/18] :sparkles: Add sample usage of MaskedTextInputLayout

---
 app/src/main/res/layout/activity_main.xml     | 12 ++++++
 .../themes_custom_input_layout_item.xml       | 39 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 app/src/main/res/values/themes_custom_input_layout_item.xml

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c2328ce..7ef0627 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,6 +6,18 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <com.hipo.maskededittext.MaskedTextInputLayout
+        android:id="@+id/maskedTextLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:theme="@style/MaskedInputTextLayoutTheme"
+        app:layout_constraintBottom_toTopOf="@+id/mainPhotoCropDemoButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <Button
         android:id="@+id/mainPhotoCropDemoButton"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/themes_custom_input_layout_item.xml b/app/src/main/res/values/themes_custom_input_layout_item.xml
new file mode 100644
index 0000000..d35b5fc
--- /dev/null
+++ b/app/src/main/res/values/themes_custom_input_layout_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="MaskedInputTextLayout" />
+
+    <style name="MaskedInputTextLayoutTheme">
+        <item name="textInputLayoutStyle">@style/InputLayoutStyle</item>
+        <item name="textInputEditTextStyle">@style/InputEditTextStyle</item>
+        <item name="textInputErrorStyle">@style/TextInputErrorStyle</item>
+        <item name="textInputHelperStyle">@style/TextInputHelperStyle</item>
+        <item name="endIconStyle">@style/EndIconStyle</item>
+        <item name="error">This is error message</item>
+        <item name="helper">This is helper message</item>
+    </style>
+
+    <style name="InputLayoutStyle">
+        <item name="android:minHeight">56dp</item>
+    </style>
+
+    <style name="InputEditTextStyle">
+        <item name="maskType">date</item>
+    </style>
+
+    <style name="TextInputErrorStyle">
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:textColor">@color/teal_700</item>
+    </style>
+
+    <style name="TextInputHelperStyle">
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:textColor">@color/teal_200</item>
+    </style>
+
+    <style name="EndIconStyle">
+        <item name="srcCompat">@drawable/ic_android</item>
+        <item name="android:padding">8dp</item>
+    </style>
+
+</resources>

From 9c4dd9d0fd817584dab8d66af2714727784969f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Mon, 12 Jul 2021 21:09:15 +0300
Subject: [PATCH 07/18] :bug: Fix cursor index related issue

---
 .../com/hipo/maskededittext/MaskedTextInputEditText.kt | 10 ++++++++++
 .../utils/extensions/StringExtensions.kt               |  6 +++---
 maskededittext/src/main/res/values/attrs.xml           |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
index c9d728e..289244a 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
@@ -68,6 +68,7 @@ class MaskedTextInputEditText : TextInputEditText {
 
     private var textWatcher: TextWatcher? = null
     private var masker: BaseMasker? = null
+    private var isCursorFixed = false
 
     var maskPattern: String = ""
     var returnMaskPattern: String = ""
@@ -82,6 +83,7 @@ class MaskedTextInputEditText : TextInputEditText {
 
     private fun initAttributes(attrs: AttributeSet?, defStyle: Int = -1) {
         context.obtainStyledAttributes(attrs, R.styleable.MaskedInputLayout, defStyle, 0).use { typedArray ->
+            isCursorFixed = typedArray.getBoolean(R.styleable.MaskedInputLayout_isCursorFixed, false)
             currencySettings.decimalSeparator =
                 typedArray.getString(R.styleable.MaskedInputLayout_decimalSeparator) ?: COMMA
             currencySettings.groupingSeparator =
@@ -191,6 +193,14 @@ class MaskedTextInputEditText : TextInputEditText {
         super.onDetachedFromWindow()
     }
 
+    override fun onSelectionChanged(selStart: Int, selEnd: Int) {
+        if (isCursorFixed) {
+            setSelection(rawText.length, rawText.length)
+            return
+        }
+        super.onSelectionChanged(selStart, selEnd)
+    }
+
     fun updateCurrencyModel(currencyMaskerSettings: CurrencyMaskerSettings) {
         this.currencySettings = currencyMaskerSettings
         maskType = CurrencyMask(currencyMaskerSettings = currencySettings)
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
index 00ed956..b549c7e 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
@@ -145,12 +145,12 @@ internal fun String.formatAsMask(mask: Mask): String {
                 ++nestedIndex
             }
             else -> {
-                if (index >= rawInput.length) {
-                    return formattedInput
-                }
                 formattedInput += rawInput[index]
                 ++index
                 ++nestedIndex
+                if (index >= rawInput.length) {
+                    return formattedInput
+                }
             }
         }
     }
diff --git a/maskededittext/src/main/res/values/attrs.xml b/maskededittext/src/main/res/values/attrs.xml
index eecae89..695a4d7 100644
--- a/maskededittext/src/main/res/values/attrs.xml
+++ b/maskededittext/src/main/res/values/attrs.xml
@@ -20,6 +20,7 @@
     <attr name="currencyDecimalLimit" format="integer" />
     <attr name="currencyPrefix" format="string" />
     <attr name="currencySuffix" format="string" />
+    <attr name="isCursorFixed" format="boolean" />
 
     <declare-styleable name="MaskedInputLayout">
         <attr name="android:text" />
@@ -44,6 +45,7 @@
         <attr name="maskPattern" />
         <attr name="maskType" />
         <attr name="returnPattern" />
+        <attr name="isCursorFixed" />
     </declare-styleable>
 
 </resources>

From eb2eec315c003dbec8ded4122b64abfe136f0e87 Mon Sep 17 00:00:00 2001
From: Yasin Cetiner <yasincetiner.ce@gmail.com>
Date: Mon, 26 Jul 2021 09:36:19 +0300
Subject: [PATCH 08/18] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Fix=20formatting=20i?=
 =?UTF-8?q?ssues=20and=20input=20layout=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hipo/macaron/MainActivity.kt     |   7 -
 app/src/main/res/layout/activity_main.xml     | 104 ++++++++++----
 app/src/main/res/values-night/themes.xml      |  16 ---
 app/src/main/res/values/colors.xml            |   3 +
 app/src/main/res/values/themes.xml            |   2 +-
 .../themes_custom_input_layout_item.xml       |  39 -----
 maskededittext/src/main/AndroidManifest.xml   |   3 +-
 .../maskededittext/MaskedTextInputEditText.kt | 133 +++++++++---------
 .../maskededittext/MaskedTextInputLayout.kt   |  12 +-
 .../hipo/maskededittext/maskers/BaseMasker.kt |   2 +-
 .../maskers/CreditCardMasker.kt               |  96 +++++++++++++
 .../maskededittext/maskers/CurrencyMasker.kt  |   6 +-
 .../com/hipo/maskededittext/maskers/Masker.kt |   8 +-
 .../maskers/PhoneNumberMasker.kt              |   4 +-
 .../maskededittext/masks/CreditCardMask.kt    |   6 +-
 .../hipo/maskededittext/masks/CustomMask.kt   |   6 +-
 .../maskededittext/masks/DateMonthYearMask.kt |   2 +-
 .../utils/extensions/StringExtensions.kt      |  24 ++--
 .../src/main/res/drawable/ic_android.xml      |   5 -
 .../src/main/res/drawable/ic_error.xml        |  13 ++
 .../res/layout/custom_masked_input_layout.xml |  10 +-
 maskededittext/src/main/res/values/attrs.xml  |  52 +++----
 maskededittext/src/main/res/values/colors.xml |   8 ++
 maskededittext/src/main/res/values/dimens.xml |   1 +
 .../src/main/res/values/strings.xml           |   8 +-
 .../themes_custom_input_layout_item.xml       |  55 ++++++++
 26 files changed, 397 insertions(+), 228 deletions(-)
 delete mode 100644 app/src/main/res/values-night/themes.xml
 delete mode 100644 app/src/main/res/values/themes_custom_input_layout_item.xml
 create mode 100644 maskededittext/src/main/java/com/hipo/maskededittext/maskers/CreditCardMasker.kt
 delete mode 100644 maskededittext/src/main/res/drawable/ic_android.xml
 create mode 100644 maskededittext/src/main/res/drawable/ic_error.xml
 create mode 100644 maskededittext/src/main/res/values/colors.xml
 create mode 100644 maskededittext/src/main/res/values/themes_custom_input_layout_item.xml

diff --git a/app/src/main/java/com/hipo/macaron/MainActivity.kt b/app/src/main/java/com/hipo/macaron/MainActivity.kt
index 3a07931..33b5404 100644
--- a/app/src/main/java/com/hipo/macaron/MainActivity.kt
+++ b/app/src/main/java/com/hipo/macaron/MainActivity.kt
@@ -2,8 +2,6 @@ package com.hipo.macaron
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.hipo.macaron.imagecropdemo.ImageCropMainActivity
-import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -13,10 +11,5 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun initUi() {
-        mainPhotoCropDemoButton.setOnClickListener { onImageCropButtonClick() }
-    }
-
-    private fun onImageCropButtonClick() {
-        startActivity(ImageCropMainActivity.newIntent(this))
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7ef0627..1c2cf6a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,31 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    android:background="@color/white">
 
-    <com.hipo.maskededittext.MaskedTextInputLayout
-        android:id="@+id/maskedTextLayout"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:theme="@style/MaskedInputTextLayoutTheme"
-        app:layout_constraintBottom_toTopOf="@+id/mainPhotoCropDemoButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/mainPhotoCropDemoButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Demo Photo Cropping"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:orientation="vertical">
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="Date"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:error="Error Text"
+            app:helper="Helper Text"
+            app:maskType="date" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="Currency"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="currency" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="Credit Card"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="credit_card" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="Date No Day"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="date_mm_yyyy" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="Iban"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="iban" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="Phone"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="phone" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="SSN"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="ssn" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="TC"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="tc_id" />
+
+        <com.hipo.maskededittext.MaskedTextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_40"
+            android:hint="Static Text"
+            android:theme="@style/MaskedInputTextLayoutTheme"
+            app:maskType="static_text" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 1372c96..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Macaron" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ca1931b..05c1608 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="gray_300">#8F929E</color>
+    <color name="red_300">#E54360</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8a02189..f64ea77 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Macaron" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Macaron" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/app/src/main/res/values/themes_custom_input_layout_item.xml b/app/src/main/res/values/themes_custom_input_layout_item.xml
deleted file mode 100644
index d35b5fc..0000000
--- a/app/src/main/res/values/themes_custom_input_layout_item.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="MaskedInputTextLayout" />
-
-    <style name="MaskedInputTextLayoutTheme">
-        <item name="textInputLayoutStyle">@style/InputLayoutStyle</item>
-        <item name="textInputEditTextStyle">@style/InputEditTextStyle</item>
-        <item name="textInputErrorStyle">@style/TextInputErrorStyle</item>
-        <item name="textInputHelperStyle">@style/TextInputHelperStyle</item>
-        <item name="endIconStyle">@style/EndIconStyle</item>
-        <item name="error">This is error message</item>
-        <item name="helper">This is helper message</item>
-    </style>
-
-    <style name="InputLayoutStyle">
-        <item name="android:minHeight">56dp</item>
-    </style>
-
-    <style name="InputEditTextStyle">
-        <item name="maskType">date</item>
-    </style>
-
-    <style name="TextInputErrorStyle">
-        <item name="android:layout_marginTop">16dp</item>
-        <item name="android:textColor">@color/teal_700</item>
-    </style>
-
-    <style name="TextInputHelperStyle">
-        <item name="android:layout_marginTop">16dp</item>
-        <item name="android:textColor">@color/teal_200</item>
-    </style>
-
-    <style name="EndIconStyle">
-        <item name="srcCompat">@drawable/ic_android</item>
-        <item name="android:padding">8dp</item>
-    </style>
-
-</resources>
diff --git a/maskededittext/src/main/AndroidManifest.xml b/maskededittext/src/main/AndroidManifest.xml
index 3f45378..8af5d3d 100644
--- a/maskededittext/src/main/AndroidManifest.xml
+++ b/maskededittext/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hipo.maskededittext" />
+<manifest package="com.hipo.maskededittext" />
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
index 289244a..519e09c 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
@@ -2,12 +2,12 @@ package com.hipo.maskededittext
 
 import android.content.Context
 import android.text.Editable
-import android.text.InputType.TYPE_CLASS_NUMBER
 import android.text.TextWatcher
 import android.util.AttributeSet
 import androidx.core.content.res.use
 import com.google.android.material.textfield.TextInputEditText
 import com.hipo.maskededittext.maskers.BaseMasker
+import com.hipo.maskededittext.maskers.CreditCardMasker
 import com.hipo.maskededittext.maskers.CurrencyMasker
 import com.hipo.maskededittext.maskers.DateMasker
 import com.hipo.maskededittext.maskers.DateMonthYearMasker
@@ -16,6 +16,7 @@ import com.hipo.maskededittext.maskers.Masker
 import com.hipo.maskededittext.maskers.PhoneNumberMasker
 import com.hipo.maskededittext.maskers.StaticTextMasker
 import com.hipo.maskededittext.maskers.TCIdMasker
+import com.hipo.maskededittext.masks.CreditCardMask
 import com.hipo.maskededittext.masks.CurrencyMask
 import com.hipo.maskededittext.masks.CustomMask
 import com.hipo.maskededittext.masks.DateMask
@@ -28,17 +29,10 @@ import com.hipo.maskededittext.masks.UnselectedMask
 import com.hipo.maskededittext.model.CurrencyMaskerSettings
 import kotlin.properties.Delegates
 
-class MaskedTextInputEditText : TextInputEditText {
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        initAttributes(attrs)
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
-        initAttributes(attrs, defStyle)
-    }
+class MaskedTextInputEditText @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : TextInputEditText(context, attrs) {
 
     val rawText: String
         get() = text.toString()
@@ -81,33 +75,68 @@ class MaskedTextInputEditText : TextInputEditText {
 
     var onTextChangedListener: ((String) -> Unit)? = null
 
-    private fun initAttributes(attrs: AttributeSet?, defStyle: Int = -1) {
-        context.obtainStyledAttributes(attrs, R.styleable.MaskedInputLayout, defStyle, 0).use { typedArray ->
-            isCursorFixed = typedArray.getBoolean(R.styleable.MaskedInputLayout_isCursorFixed, false)
+    init {
+        loadAttrs(attrs)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        initMaskedEditText()
+    }
+
+    override fun onDetachedFromWindow() {
+        textWatcher = null
+        super.onDetachedFromWindow()
+    }
+
+    override fun onSelectionChanged(selStart: Int, selEnd: Int) {
+        if (isCursorFixed) {
+            setSelection(rawText.length, rawText.length)
+            return
+        }
+        super.onSelectionChanged(selStart, selEnd)
+    }
+
+    fun updateCurrencyModel(currencyMaskerSettings: CurrencyMaskerSettings) {
+        this.currencySettings = currencyMaskerSettings
+        maskType = CurrencyMask(currencyMaskerSettings = currencySettings)
+    }
+
+    fun setCurrencyText(currency: String) {
+        // TODO this is a quick fix, create a generic setter that works with every masker
+        masker.takeIf { it is CurrencyMasker }?.onTextChanged(currency, 0, currency.length, 0, selectionStart)
+    }
+
+    fun loadAttrs(attrs: AttributeSet?) {
+        context.obtainStyledAttributes(attrs, R.styleable.MaskedInputLayout).use { attrs ->
+            isCursorFixed = attrs.getBoolean(R.styleable.MaskedInputLayout_isCursorFixed, false)
+
             currencySettings.decimalSeparator =
-                typedArray.getString(R.styleable.MaskedInputLayout_decimalSeparator) ?: COMMA
+                attrs.getString(R.styleable.MaskedInputLayout_decimalSeparator) ?: COMMA
+
             currencySettings.groupingSeparator =
-                typedArray.getString(R.styleable.MaskedInputLayout_groupingSeparator) ?: DOT
-            maskPattern = typedArray.getString(R.styleable.MaskedInputLayout_maskPattern)
+                attrs.getString(R.styleable.MaskedInputLayout_groupingSeparator) ?: DOT
+
+            maskPattern = attrs.getString(R.styleable.MaskedInputLayout_maskPattern)
                 ?: context.getString(R.string.currency_mask_pattern)
-            returnMaskPattern = typedArray.getString(R.styleable.MaskedInputLayout_returnPattern).orEmpty()
-            currencySettings.prefix = typedArray.getString(R.styleable.MaskedInputLayout_currencySuffix).orEmpty()
-            currencySettings.suffix = typedArray.getString(R.styleable.MaskedInputLayout_currencyPrefix).orEmpty()
-            currencySettings.decimalLimit = typedArray.getInteger(
+
+            returnMaskPattern = attrs.getString(R.styleable.MaskedInputLayout_returnPattern).orEmpty()
+
+            currencySettings.prefix = attrs.getString(R.styleable.MaskedInputLayout_currencyPrefix).orEmpty()
+            currencySettings.suffix = attrs.getString(R.styleable.MaskedInputLayout_currencySuffix).orEmpty()
+            currencySettings.decimalLimit = attrs.getInteger(
                 R.styleable.MaskedInputLayout_currencyDecimalLimit,
                 CurrencyMaskerSettings.DEFAULT_DECIMAL_LIMIT
             ).also { decimalLimit -> CurrencyMasker.checkIfLimitSafe(decimalLimit) }
+
             maskType = Mask.Type.values()[
-                typedArray.getInt(R.styleable.MaskedInputLayout_maskType, Mask.Type.UNSELECTED.ordinal)
+                attrs.getInt(R.styleable.MaskedInputLayout_maskType, Mask.Type.UNSELECTED.ordinal)
             ].create(maskPattern, returnMaskPattern, currencySettings)
         }
-        inputType = masker?.inputType ?: TYPE_CLASS_NUMBER
-        keyListener = masker?.keyListener
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        initMaskedEditText()
+        masker?.let {
+            inputType = it.inputType
+            keyListener = it.keyListener
+        }
     }
 
     private fun initMaskedEditText() {
@@ -135,6 +164,7 @@ class MaskedTextInputEditText : TextInputEditText {
             is CustomMask -> handleCustomMask(mask)
             is StaticTextMask -> handleStaticTextMask(mask)
             is CurrencyMask -> CurrencyMasker(mask, ::setEditTextWithoutTriggerListener, currencySettings)
+            is CreditCardMask -> CreditCardMasker(mask, ::setEditTextWithoutTriggerListener)
             is IBANMask -> IBANMasker(mask, ::setEditTextWithoutTriggerListener)
             is PhoneMask -> PhoneNumberMasker(mask, ::setEditTextWithoutTriggerListener)
             is DateMonthYearMask -> DateMonthYearMasker(mask, ::setEditTextWithoutTriggerListener)
@@ -151,7 +181,7 @@ class MaskedTextInputEditText : TextInputEditText {
         val defaultText = if (masker is CurrencyMasker) {
             "${currencySettings.prefix} 0${currencySettings.decimalSeparator}00 ${currencySettings.suffix}".trim()
         } else {
-            mask.maskPattern.substringBefore(POUND)
+            mask.maskPattern.substringBefore(HASH)
         }
         setText(defaultText)
     }
@@ -167,14 +197,14 @@ class MaskedTextInputEditText : TextInputEditText {
     }
 
     private fun handleCustomMask(mask: Mask): Masker = when {
-        maskPattern.contains(POUND).not() -> {
-            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_mask_pound)}")
+        maskPattern.contains(HASH).not() -> {
+            throw Exception("$logTag: ${context.getString(R.string.exception_mask_hash)}")
         }
-        returnMaskPattern.contains(POUND).not() -> {
-            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_return_pound)}")
+        returnMaskPattern.contains(HASH).not() -> {
+            throw Exception("$logTag: ${context.getString(R.string.exception_return_hash)}")
         }
-        maskPattern.count { it == POUND } != returnMaskPattern.count { it == POUND } -> {
-            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_pound_count)}")
+        maskPattern.count { it == HASH } != returnMaskPattern.count { it == HASH } -> {
+            throw Exception("$logTag: ${context.getString(R.string.exception_hash_count)}")
         }
         else -> {
             Masker(mask, ::setEditTextWithoutTriggerListener)
@@ -183,37 +213,14 @@ class MaskedTextInputEditText : TextInputEditText {
 
     private fun handleStaticTextMask(mask: Mask): StaticTextMasker = when {
         maskPattern.isBlank() -> {
-            throw Exception("$LOG_TAG: ${context.getString(R.string.exception_mask_pound)}")
+            throw Exception("$logTag: ${context.getString(R.string.exception_mask_hash)}")
         }
         else -> StaticTextMasker(mask, ::setEditTextWithoutTriggerListener)
     }
 
-    override fun onDetachedFromWindow() {
-        textWatcher = null
-        super.onDetachedFromWindow()
-    }
-
-    override fun onSelectionChanged(selStart: Int, selEnd: Int) {
-        if (isCursorFixed) {
-            setSelection(rawText.length, rawText.length)
-            return
-        }
-        super.onSelectionChanged(selStart, selEnd)
-    }
-
-    fun updateCurrencyModel(currencyMaskerSettings: CurrencyMaskerSettings) {
-        this.currencySettings = currencyMaskerSettings
-        maskType = CurrencyMask(currencyMaskerSettings = currencySettings)
-    }
-
-    fun setCurrencyText(currency: String) {
-        // TODO this is a quick fix, create a generic setter that works with every masker
-        masker.takeIf { it is CurrencyMasker }?.onTextChanged(currency, 0, currency.length, 0, selectionStart)
-    }
-
     companion object {
-        private val LOG_TAG = this::class.java.simpleName
-        private const val POUND = '#'
+        private val logTag = this::class.java.simpleName
+        private const val HASH = '#'
         private const val COMMA = ","
         private const val DOT = "."
     }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
index e2878ee..7b26bd0 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
@@ -22,13 +22,14 @@ import com.hipo.maskededittext.utils.viewbinding.viewBinding
 
 class MaskedTextInputLayout @JvmOverloads constructor(
     context: Context,
-    private val attrs: AttributeSet? = null,
+    attrs: AttributeSet? = null,
     defStyle: Int = 0
 ) : ConstraintLayout(context, attrs, defStyle) {
 
     private val binding = viewBinding(CustomMaskedInputLayoutBinding::inflate)
 
-    val editText = binding.textInputEditText
+    val editText
+        get() = binding.textInputEditText
 
     var endIconClick: (() -> Unit)? = null
 
@@ -105,18 +106,19 @@ class MaskedTextInputLayout @JvmOverloads constructor(
     var onTextChanged: ((text: String) -> Unit)? = null
 
     init {
-        loadAttrs()
+        loadAttrs(attrs)
         initUi()
     }
 
-    private fun loadAttrs() {
-        context.obtainStyledAttributes(attrs, R.styleable.MaskedInputLayout).use { attrs ->
+    private fun loadAttrs(attributeSet: AttributeSet?) {
+        context.obtainStyledAttributes(attributeSet, R.styleable.MaskedInputLayout).use { attrs ->
             text = attrs.getString(R.styleable.MaskedInputLayout_android_text).orEmpty()
             hint = attrs.getString(R.styleable.MaskedInputLayout_android_hint)
             error = attrs.getString(R.styleable.MaskedInputLayout_error)
             helper = attrs.getString(R.styleable.MaskedInputLayout_helper)
             inputType = attrs.getInteger(R.styleable.MaskedInputLayout_android_inputType, -1)
             maxLength = attrs.getInteger(R.styleable.MaskedInputLayout_android_maxLength, -1)
+            binding.textInputEditText.loadAttrs(attributeSet)
         }
     }
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
index bd1b601..1de81d6 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
@@ -17,7 +17,7 @@ abstract class BaseMasker {
         get() = DigitsKeyListener.getInstance(DIGITS)
 
     companion object {
-        const val POUND = '#'
+        const val HASH = '#'
         const val IS_REMOVED = 0
         const val IS_ADDED = 1
 
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CreditCardMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CreditCardMasker.kt
new file mode 100644
index 0000000..97c2979
--- /dev/null
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CreditCardMasker.kt
@@ -0,0 +1,96 @@
+package com.hipo.maskededittext.maskers
+
+import android.text.InputType
+import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.utils.extensions.formatAsCreditCard
+import com.hipo.maskededittext.utils.extensions.specialChars
+import kotlin.properties.Delegates
+
+class CreditCardMasker(
+    override val mask: Mask,
+    override val onTextMaskedListener: (String, Int?) -> Unit
+) : BaseMasker() {
+
+    override val inputType: Int
+        get() = InputType.TYPE_CLASS_NUMBER
+
+    private var text: String by Delegates.observable("") { _, _, newValue ->
+        if (selection >= newValue.length) selection = newValue.length
+        onTextMaskedListener(newValue, selection)
+    }
+
+    private var oldCursorPosition = 0
+
+    private var startLength = 0
+    private var endLength = 0
+    private var selection = 0
+
+    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {
+        oldCursorPosition = selectionStart
+    }
+
+    override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
+        if (charSequence.isNullOrEmpty()) {
+            selection = 0
+            text = ""
+            return
+        }
+
+        startLength = charSequence.length
+        when (count) {
+            IS_REMOVED -> handleDeletion(charSequence, start)
+            IS_ADDED -> handleAddition(charSequence, selectionStart)
+            else -> handleRestoration(charSequence)
+        }
+    }
+
+    private fun handleAddition(charSequence: CharSequence, start: Int) {
+        if (charSequence.length > mask.maskPattern.length) {
+            selection = oldCursorPosition
+            text = text
+            return
+        }
+        val formattedCreditCardNumber = charSequence.toString().formatAsCreditCard()
+        endLength = formattedCreditCardNumber.length
+        selection = handleCursorIndex(formattedCreditCardNumber, start, false)
+        text = formattedCreditCardNumber
+    }
+
+    private fun handleDeletion(charSequence: CharSequence, start: Int) {
+        val formattedCreditCardNumber: String = charSequence.toString().formatAsCreditCard()
+        if (start == 0) {
+            selection = formattedCreditCardNumber.length
+            text = formattedCreditCardNumber
+            return
+        }
+        endLength = formattedCreditCardNumber.length
+        selection = handleCursorIndex(formattedCreditCardNumber, start, true)
+        text = formattedCreditCardNumber
+    }
+
+    private fun handleRestoration(charSequence: CharSequence) {
+        val formattedCreditCardNumber = charSequence.toString().formatAsCreditCard()
+        selection = formattedCreditCardNumber.length
+        text = formattedCreditCardNumber
+    }
+
+    private fun handleCursorIndex(charSequence: CharSequence, selectionIndex: Int, isDeletion: Boolean): Int = when {
+        selectionIndex >= charSequence.length -> charSequence.length
+        specialChars.contains(charSequence[selectionIndex - 1]) -> {
+            handleSpecialCharState(selectionIndex, isDeletion)
+        }
+        else -> selectionIndex
+    }
+
+    private fun handleSpecialCharState(cursor: Int, isDeletion: Boolean): Int {
+        return if (isDeletion) {
+            mask.calculateCurrentMaskDistance(cursor)
+        } else {
+            mask.calculateUpcomingMaskDistance(cursor) + 1
+        }
+    }
+
+    override fun getTextWithReturnPattern(): String? {
+        return mask.getParsedText(text)
+    }
+}
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
index 1ed4950..3fc174e 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
@@ -90,7 +90,11 @@ class CurrencyMasker(
         }
 
         val inputWithoutPrefixAndSuffix =
-            charSequence.removeWithRegex("[$formattedCurrencyPrefix$formattedCurrencySuffix]")
+            if (formattedCurrencyPrefix.isNotBlank() || formattedCurrencySuffix.isNotBlank()) {
+                charSequence.removeWithRegex("[$formattedCurrencyPrefix$formattedCurrencySuffix]")
+            } else {
+                charSequence
+            }
         val startLength = inputWithoutPrefixAndSuffix.length
 
         try {
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
index 508e8f2..d53dde6 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
@@ -61,7 +61,7 @@ class Masker(
     private fun removeCurrentMaskIfNeed(charSequence: CharSequence, start: Int): CharSequence {
         var index = start
         var tempText = charSequence
-        while (index > 0 && mask.maskPattern[index] != POUND) {
+        while (index > 0 && mask.maskPattern[index] != HASH) {
             tempText = removeLastItem(tempText)
             text = tempText
             index--
@@ -72,7 +72,7 @@ class Masker(
     private fun removeUpcomingMasks(charSequence: CharSequence) {
         var index = charSequence.length - 1
         var tempText = charSequence
-        while (index >= 0 && mask.maskPattern[index] != POUND && charSequence.length > 1) {
+        while (index >= 0 && mask.maskPattern[index] != HASH && charSequence.length > 1) {
             tempText = removeLastItem(tempText)
             text = tempText
             index--
@@ -82,7 +82,7 @@ class Masker(
     private fun addFirstMaskIfNeed(start: Int) {
         var index = start
         with(mask) {
-            while (maskPattern[index] != POUND) {
+            while (maskPattern[index] != HASH) {
                 text += maskPattern[index]
                 index++
             }
@@ -95,7 +95,7 @@ class Masker(
         }
         var index = text.length
         with(mask) {
-            while (index in maskPattern.indices && maskPattern[index] != POUND) {
+            while (index in maskPattern.indices && maskPattern[index] != HASH) {
                 text += maskPattern[index]
                 index++
             }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
index b275086..22cd972 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
@@ -19,7 +19,7 @@ class PhoneNumberMasker(
         onTextMaskedListener(newValue, selection)
     }
 
-    private val phoneMaskMinCharCount = mask.maskPattern.substringBefore(POUND).length
+    private val phoneMaskMinCharCount = mask.maskPattern.substringBefore(HASH).length
 
     private var oldCursorPosition = 0
     private var isUpcomingFieldSpecialChar = false
@@ -34,7 +34,7 @@ class PhoneNumberMasker(
 
     override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
         if (charSequence.isNullOrEmpty() || charSequence.length <= phoneMaskMinCharCount) {
-            val defaultPhoneFormat = mask.maskPattern.substringBefore(POUND)
+            val defaultPhoneFormat = mask.maskPattern.substringBefore(HASH)
             selection = defaultPhoneFormat.length
             text = defaultPhoneFormat
             return
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt
index 61832e4..9f86d4f 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CreditCardMask.kt
@@ -5,7 +5,7 @@ import com.hipo.maskededittext.Mask
 class CreditCardMask : Mask() {
 
     override val maskPattern: String
-        get() = "####-####-####-####"
+        get() = "#### #### #### ####"
 
     override val returnPattern: String
         get() = "################"
@@ -21,4 +21,8 @@ class CreditCardMask : Mask() {
     override fun filterMaskedText(maskedText: String): String {
         return maskedText.filter { it.isDigit() }
     }
+
+    companion object {
+        const val CREDIT_CARD_NUMBER_LENGTH = 16
+    }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt
index 92d77c6..f535c19 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CustomMask.kt
@@ -1,7 +1,7 @@
 package com.hipo.maskededittext.masks
 
 import com.hipo.maskededittext.Mask
-import com.hipo.maskededittext.maskers.BaseMasker.Companion.POUND
+import com.hipo.maskededittext.maskers.BaseMasker.Companion.HASH
 
 class CustomMask(private val customMaskPattern: String, private val customReturnPattern: String) : Mask() {
 
@@ -23,10 +23,10 @@ class CustomMask(private val customMaskPattern: String, private val customReturn
         val filteredText = StringBuilder(returnPattern)
         maskedText.mapIndexed { index, char ->
             char.toString().takeIf {
-                maskPattern[index] == POUND
+                maskPattern[index] == HASH
             }.orEmpty()
         }.joinToString("").map { filteredMaskedTextChar ->
-            filteredText[filteredText.indexOfFirst { it == POUND }] = filteredMaskedTextChar
+            filteredText[filteredText.indexOfFirst { it == HASH }] = filteredMaskedTextChar
         }
         return filteredText.toString()
     }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt
index 13fba29..dcd7ae1 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/DateMonthYearMask.kt
@@ -29,7 +29,7 @@ class DateMonthYearMask : Mask() {
     }
 
     companion object {
-        private const val INPUT_DATE_FORMAT = "MM/yyyy"
+        private const val INPUT_DATE_FORMAT = "MM/yy"
         private const val OUTPUT_DATE_FORMAT = "MM-yy"
     }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
index b549c7e..d319942 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
@@ -1,6 +1,7 @@
 package com.hipo.maskededittext.utils.extensions
 
 import com.hipo.maskededittext.Mask
+import com.hipo.maskededittext.masks.CreditCardMask
 import com.hipo.maskededittext.masks.IBANMask
 
 //region Regex Patterns
@@ -50,6 +51,16 @@ internal fun String.formatAsIban(): String {
     return formattedIban.replace("(\\w{4})".toRegex(), "$1 ").trim()
 }
 
+internal fun String.formatAsCreditCard(): String {
+    val cardNumber = filter { it.isDigit() }
+    val formattedIban = if (cardNumber.length > CreditCardMask.CREDIT_CARD_NUMBER_LENGTH) {
+        cardNumber.substring(0, CreditCardMask.CREDIT_CARD_NUMBER_LENGTH)
+    } else {
+        cardNumber
+    }
+    return formattedIban.replace("(\\w{4})".toRegex(), "$1 ").trim()
+}
+
 internal fun String.formatAsDateMonthYear(year: Int, mask: Mask): String {
     var dateMonthYear = filter { it.isDigit() }
     if (dateMonthYear.isEmpty()) return ""
@@ -72,18 +83,7 @@ internal fun String.formatAsDateMonthYear(year: Int, mask: Mask): String {
 
     if (dateMonthYear.isEmpty()) return monthField.formatAsMask(mask)
 
-    yearField = if (dateMonthYear[0].digitToInt() < year / 10) {
-        "${year / 10}"
-    } else {
-        "${dateMonthYear[0]}"
-    }
-    if (dateMonthYear.length > 1) {
-        if (dateMonthYear[1].digitToInt() < year % 10) {
-            yearField += year % 10
-        } else {
-            yearField += dateMonthYear[1]
-        }
-    }
+    yearField = dateMonthYear
 
     return "$monthField$yearField".formatAsMask(mask)
 }
diff --git a/maskededittext/src/main/res/drawable/ic_android.xml b/maskededittext/src/main/res/drawable/ic_android.xml
deleted file mode 100644
index d38b911..0000000
--- a/maskededittext/src/main/res/drawable/ic_android.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FF0000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"/>
-</vector>
diff --git a/maskededittext/src/main/res/drawable/ic_error.xml b/maskededittext/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000..38e300a
--- /dev/null
+++ b/maskededittext/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M15,9L12,12M12,12L9,15M12,12L15,15M12,12L9,9M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12Z"
+        android:strokeWidth="1.5"
+        android:strokeColor="#111218"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/maskededittext/src/main/res/layout/custom_masked_input_layout.xml b/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
index 9168fa6..b446f3e 100644
--- a/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
+++ b/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
@@ -36,7 +36,7 @@
         app:layout_constraintBottom_toBottomOf="@id/textInputLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/textInputLayout"
-        tools:srcCompat="@drawable/ic_android"
+        tools:srcCompat="@drawable/ic_error"
         tools:visibility="visible" />
 
     <TextView
@@ -47,9 +47,7 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textInputLayout"
-        tools:text="Error Text"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toBottomOf="@id/textInputLayout" />
 
     <TextView
         android:id="@+id/helperTextView"
@@ -59,8 +57,6 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/errorTextView"
-        tools:text="Helper Text"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toBottomOf="@id/errorTextView" />
 
 </merge>
diff --git a/maskededittext/src/main/res/values/attrs.xml b/maskededittext/src/main/res/values/attrs.xml
index 695a4d7..8ca7da7 100644
--- a/maskededittext/src/main/res/values/attrs.xml
+++ b/maskededittext/src/main/res/values/attrs.xml
@@ -1,27 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="maskType" format="enum">
-        <enum name="date" value="0" />
-        <enum name="phone" value="1" />
-        <enum name="ssn" value="2" />
-        <enum name="currency" value="3" />
-        <enum name="custom" value="4" />
-        <enum name="static_text" value="5" />
-        <enum name="credit_card" value="6" />
-        <enum name="date_mm_yyyy" value="7" />
-        <enum name="iban" value="8" />
-        <enum name="tc_id" value="9" />
-    </attr>
-    <attr name="decimalSeparator" format="string" />
-    <attr name="groupingSeparator" format="string" />
-    <attr name="maskPattern" format="string" />
-    <attr name="returnPattern" format="string" />
-    <attr name="currencyDecimalLimit" format="integer" />
-    <attr name="currencyPrefix" format="string" />
-    <attr name="currencySuffix" format="string" />
-    <attr name="isCursorFixed" format="boolean" />
-
     <declare-styleable name="MaskedInputLayout">
         <attr name="android:text" />
         <attr name="android:hint" />
@@ -37,15 +16,28 @@
         <attr name="error" format="string" />
         <attr name="helper" format="string" />
 
-        <attr name="currencyDecimalLimit" />
-        <attr name="currencyPrefix" />
-        <attr name="currencySuffix" />
-        <attr name="decimalSeparator" />
-        <attr name="groupingSeparator" />
-        <attr name="maskPattern" />
-        <attr name="maskType" />
-        <attr name="returnPattern" />
-        <attr name="isCursorFixed" />
+        <attr name="decimalSeparator" format="string" />
+        <attr name="groupingSeparator" format="string" />
+        <attr name="maskPattern" format="string" />
+        <attr name="returnPattern" format="string" />
+        <attr name="currencyDecimalLimit" format="integer" />
+        <attr name="currencyPrefix" format="string" />
+        <attr name="currencySuffix" format="string" />
+        <attr name="isCursorFixed" format="boolean" />
+
+        <attr name="maskType" format="enum">
+            <enum name="date" value="0" />
+            <enum name="phone" value="1" />
+            <enum name="ssn" value="2" />
+            <enum name="currency" value="3" />
+            <enum name="custom" value="4" />
+            <enum name="static_text" value="5" />
+            <enum name="credit_card" value="6" />
+            <enum name="date_mm_yyyy" value="7" />
+            <enum name="iban" value="8" />
+            <enum name="tc_id" value="9" />
+        </attr>
+
     </declare-styleable>
 
 </resources>
diff --git a/maskededittext/src/main/res/values/colors.xml b/maskededittext/src/main/res/values/colors.xml
new file mode 100644
index 0000000..e179d34
--- /dev/null
+++ b/maskededittext/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+
+    <color name="gray_300">#8F929E</color>
+    <color name="red_300">#E54360</color>
+</resources>
diff --git a/maskededittext/src/main/res/values/dimens.xml b/maskededittext/src/main/res/values/dimens.xml
index f4b6570..58db362 100644
--- a/maskededittext/src/main/res/values/dimens.xml
+++ b/maskededittext/src/main/res/values/dimens.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="spacing_12">12dp</dimen>
     <dimen name="spacing_40">40dp</dimen>
 </resources>
diff --git a/maskededittext/src/main/res/values/strings.xml b/maskededittext/src/main/res/values/strings.xml
index d880297..e76910e 100644
--- a/maskededittext/src/main/res/values/strings.xml
+++ b/maskededittext/src/main/res/values/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="exception_pound_count">POUND count must be same for maskPattern and returnMaskPattern</string>
-    <string name="exception_mask_pound">Custom mask maskPattern must contain #</string>
-    <string name="exception_mask_pound_static">Static mask must contain maskPattern</string>
-    <string name="exception_return_pound">Custom mask returnType must contain #</string>
+    <string name="exception_hash_count">HASH count must be same for maskPattern and returnMaskPattern</string>
+    <string name="exception_mask_hash">Custom mask maskPattern must contain #</string>
+    <string name="exception_mask_hash_static">Static mask must contain maskPattern</string>
+    <string name="exception_return_hash">Custom mask returnType must contain #</string>
     <string name="exception_unselected_mask">maskType must be selected</string>
     <string name="currency_mask_pattern">#,##0.00</string>
 </resources>
diff --git a/maskededittext/src/main/res/values/themes_custom_input_layout_item.xml b/maskededittext/src/main/res/values/themes_custom_input_layout_item.xml
new file mode 100644
index 0000000..7294587
--- /dev/null
+++ b/maskededittext/src/main/res/values/themes_custom_input_layout_item.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="MaskedInputTextLayout" />
+
+    <style name="MaskedInputTextLayoutTheme">
+        <item name="textInputLayoutStyle">@style/InputLayoutStyle</item>
+        <item name="textInputEditTextStyle">@style/InputEditTextStyle</item>
+        <item name="textInputErrorStyle">@style/TextInputErrorStyle</item>
+        <item name="textInputHelperStyle">@style/TextInputHelperStyle</item>
+        <item name="endIconStyle">@style/EndIconStyle</item>
+    </style>
+
+    <style name="InputLayoutStyle" parent="Base.Widget.MaterialComponents.TextInputLayout">
+        <item name="android:minHeight">56dp</item>
+        <item name="android:textColorHint">@color/gray_300</item>
+        <item name="hintTextColor">@color/gray_300</item>
+        <item name="strokeWidth">0dp</item>
+        <item name="boxStrokeWidthFocused">0dp</item>
+        <item name="errorTextColor">@color/red_300</item>
+        <item name="errorIconDrawable">@drawable/ic_error</item>
+        <item name="errorIconTint">@color/red_300</item>
+        <item name="passwordToggleTint">@color/red_300</item>
+    </style>
+
+    <style name="InputEditTextStyle" parent="Widget.AppCompat.EditText">
+        <item name="android:textColor">@color/black</item>
+        <item name="android:imeOptions">actionNext</item>
+        <item name="android:inputType">text</item>
+        <item name="android:paddingTop">@dimen/spacing_12</item>
+        <item name="android:paddingBottom">@dimen/spacing_12</item>
+        <item name="android:maxLines">1</item>
+    </style>
+
+    <style name="TextInputErrorStyle">
+        <item name="android:maxLines">1</item>
+        <item name="android:layout_marginTop">@dimen/spacing_12</item>
+        <item name="android:textColor">@color/red_300</item>
+        <item name="android:drawablePadding">@dimen/spacing_12</item>
+        <item name="drawableStartCompat">@drawable/ic_error</item>
+        <item name="drawableTint">@color/red_300</item>
+    </style>
+
+    <style name="TextInputHelperStyle">
+        <item name="android:maxLines">1</item>
+        <item name="android:layout_marginTop">@dimen/spacing_12</item>
+        <item name="android:textColor">@color/gray_300</item>
+    </style>
+
+    <style name="EndIconStyle">
+        <item name="srcCompat">@drawable/ic_error</item>
+        <item name="android:padding">8dp</item>
+    </style>
+
+</resources>

From 6af0601747ba202c8a5b6f54a9caf8c2793b7cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Mon, 26 Jul 2021 11:34:38 +0300
Subject: [PATCH 09/18] :recycle: Remove unused function parameter and Fix
 SSNMask input length related bug

---
 .../hipo/maskededittext/maskers/DateMonthYearMasker.kt |  6 +++---
 .../java/com/hipo/maskededittext/maskers/Masker.kt     | 10 +++++-----
 .../utils/extensions/StringExtensions.kt               |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt
index 9a39aae..d0c1c7f 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/DateMonthYearMasker.kt
@@ -54,14 +54,14 @@ class DateMonthYearMasker(
             text = text
             return
         }
-        val formattedDate = charSequence.toString().formatAsDateMonthYear(lastTwoDigitOfYear, mask)
+        val formattedDate = charSequence.toString().formatAsDateMonthYear(mask)
         endLength = formattedDate.length
         selection = handleCursorIndex(formattedDate, start + (endLength - startLength), false)
         text = formattedDate
     }
 
     private fun handleDeletion(charSequence: CharSequence, start: Int) {
-        val formattedDate = charSequence.toString().formatAsDateMonthYear(lastTwoDigitOfYear, mask)
+        val formattedDate = charSequence.toString().formatAsDateMonthYear(mask)
         if (start == 0) {
             selection = formattedDate.length
             text = formattedDate
@@ -73,7 +73,7 @@ class DateMonthYearMasker(
     }
 
     private fun handleRestoration(charSequence: CharSequence) {
-        val formattedDateMonthYear = charSequence.toString().formatAsDateMonthYear(lastTwoDigitOfYear, mask)
+        val formattedDateMonthYear = charSequence.toString().formatAsDateMonthYear(mask)
         selection = formattedDateMonthYear.length
         text = formattedDateMonthYear
     }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
index d53dde6..e324ab6 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/Masker.kt
@@ -12,15 +12,12 @@ class Masker(
     override val inputType: Int
         get() = InputType.TYPE_CLASS_NUMBER
 
-    private var selection = 0
-
     private var text: String by Delegates.observable("") { _, _, newValue ->
-        onTextMaskedListener(newValue, selection)
+        onTextMaskedListener(newValue, text.length)
     }
 
     override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
         if (charSequence.isNullOrEmpty()) {
-            selection = 0
             text = ""
             return
         }
@@ -38,7 +35,10 @@ class Masker(
     private fun removeLastItem(chars: CharSequence) = chars.substring(0, chars.length - 1)
 
     private fun handleAddition(charSequence: CharSequence, start: Int) {
-        if (charSequence.isEmpty()) return
+        if (charSequence.isEmpty() || charSequence.length >= mask.maskPattern.length) {
+            text = text
+            return
+        }
         addFirstMaskIfNeed(start)
         text += charSequence.last()
         addUpcomingMasks(start)
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
index d319942..a063b84 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/utils/extensions/StringExtensions.kt
@@ -53,20 +53,20 @@ internal fun String.formatAsIban(): String {
 
 internal fun String.formatAsCreditCard(): String {
     val cardNumber = filter { it.isDigit() }
-    val formattedIban = if (cardNumber.length > CreditCardMask.CREDIT_CARD_NUMBER_LENGTH) {
+    val formattedCreditCard = if (cardNumber.length > CreditCardMask.CREDIT_CARD_NUMBER_LENGTH) {
         cardNumber.substring(0, CreditCardMask.CREDIT_CARD_NUMBER_LENGTH)
     } else {
         cardNumber
     }
-    return formattedIban.replace("(\\w{4})".toRegex(), "$1 ").trim()
+    return formattedCreditCard.replace("(\\w{4})".toRegex(), "$1 ").trim()
 }
 
-internal fun String.formatAsDateMonthYear(year: Int, mask: Mask): String {
+internal fun String.formatAsDateMonthYear(mask: Mask): String {
     var dateMonthYear = filter { it.isDigit() }
     if (dateMonthYear.isEmpty()) return ""
 
     val monthField: String
-    var yearField: String
+    val yearField: String
 
     if (dateMonthYear[0].digitToInt() > 1) {
         monthField = "0${dateMonthYear[0]}"

From 50385d7190fff6f443fd6df770cf2df6926e737a Mon Sep 17 00:00:00 2001
From: Mirac Ozkan <mirac.ozkan123@gmail.com>
Date: Mon, 26 Jul 2021 12:41:38 +0300
Subject: [PATCH 10/18] :rocket: Release MaskedEditText 1.2.11

---
 maskededittext/library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maskededittext/library.properties b/maskededittext/library.properties
index 5be0e6a..1bddf3c 100644
--- a/maskededittext/library.properties
+++ b/maskededittext/library.properties
@@ -1,4 +1,4 @@
 artifact=maskededittext
 libraryName=com.hipo.maskededittext
-libraryVersion=1.2.10
+libraryVersion=1.2.11
 libraryDescription=Masked edit text to format phone number, date, ssn and custom types.

From 4d01532d8355eae393e19febf1f7bf9b663df980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mira=C3=A7=20=C3=96zkan?= <mirac.ozkan123@gmail.com>
Date: Mon, 9 Aug 2021 23:59:02 +0300
Subject: [PATCH 11/18] :recycle: Add zero or replace new input if the change
 is after the decimal separator

---
 app/src/main/res/layout/activity_main.xml     |   2 +
 .../maskededittext/maskers/CurrencyMasker.kt  | 173 +++++++++++++-----
 2 files changed, 126 insertions(+), 49 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1c2cf6a..dcb6f95 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,6 +25,8 @@
             android:layout_marginTop="@dimen/spacing_40"
             android:hint="Currency"
             android:theme="@style/MaskedInputTextLayoutTheme"
+            app:currencyPrefix="$"
+            app:currencySuffix="$"
             app:maskType="currency" />
 
         <com.hipo.maskededittext.MaskedTextInputLayout
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
index 3fc174e..d36f275 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
@@ -67,85 +67,131 @@ class CurrencyMasker(
             return
         }
 
-        if (charSequence.length <= start) {
+        if (charSequence.length < start) {
             val currentCurrencyValue = if (text.isEmpty()) defaultText else text
             selection = getFormattedCurrencyDecimalLimitLeftIndex(currentCurrencyValue)
             text = currentCurrencyValue
             return
         }
 
-        if (!charSequence.contains(localeDecimalFormatSymbols.decimalSeparator) && isDeletion) {
-            onTextMaskedListener(text, start)
-            return
+        if (isDeletion) {
+            handleDeletion(charSequence, start)
+        } else {
+            handleAddition(charSequence, start, selectionStart)
         }
+    }
 
+    private fun handleAddition(charSequence: CharSequence, start: Int, selectionStart: Int) {
         if ((charSequence[start] == localeDecimalFormatSymbols.decimalSeparator ||
-                charSequence[start] == localeDecimalFormatSymbols.groupingSeparator) && !isDeletion
+                charSequence[start] == localeDecimalFormatSymbols.groupingSeparator)
         ) {
             val currentCurrencyValue = if (text.isEmpty()) defaultText else text
-            selection =
-                getFormattedCurrencyDecimalLimitRightIndex(currentCurrencyValue) - currencyPrefixLength - currencySuffixLength
+            selection = getFormattedCurrencyDecimalLimitRightIndex(currentCurrencyValue) -
+                currencyPrefixLength -
+                currencySuffixLength
             text = currentCurrencyValue
             return
         }
+        var rawCurrency = removePrefixAndSuffix(charSequence)
+        if (isAddedAfterDecimalPart(rawCurrency)) {
+            rawCurrency = replaceWithAddedNumber(rawCurrency, start - currencyPrefixLength)
+        }
+        val startLength = rawCurrency.length
 
-        val inputWithoutPrefixAndSuffix =
-            if (formattedCurrencyPrefix.isNotBlank() || formattedCurrencySuffix.isNotBlank()) {
-                charSequence.removeWithRegex("[$formattedCurrencyPrefix$formattedCurrencySuffix]")
-            } else {
-                charSequence
-            }
-        val startLength = inputWithoutPrefixAndSuffix.length
+        var formattedCurrency = applyCurrencyPattern(rawCurrency)
+        val endLength = formattedCurrency.length
 
-        try {
-            val currencyWithoutGroupSeparator =
-                inputWithoutPrefixAndSuffix.removeWithRegex("[${localeDecimalFormatSymbols.groupingSeparator}]")
+        val cursorIndex = handleCursorForAddition(
+            subtractCurrencyPrefixIfValidOrZero(selectionStart + (endLength - startLength)),
+            formattedCurrency
+        )
 
-            currencyFormatter.applyPattern(WHOLE_NUMBER_FORMAT)
-            val parsedNumber = currencyFormatter.parse(currencyWithoutGroupSeparator)!!
-            currencyFormatter.applyPattern(mask.maskPattern)
-            var formattedCurrency = currencyFormatter.format(parsedNumber)
-
-            val endLength = formattedCurrency.length
-            val cursorIndex = handleCursor(
-                subtractCurrencyPrefixIfValidOrZero(selectionStart + (endLength - startLength)),
-                formattedCurrency,
-                isDeletion
-            )
-
-            formattedCurrency = addSuffixAndPrefix(formattedCurrency)
-            selection = cursorIndex
-            text = formattedCurrency
-        } catch (e: ParseException) {
-            e.printStackTrace()
+        formattedCurrency = addSuffixAndPrefix(formattedCurrency)
+        selection = cursorIndex
+        text = formattedCurrency
+
+    }
+
+    private fun handleDeletion(charSequence: CharSequence, start: Int) {
+        if (!charSequence.contains(localeDecimalFormatSymbols.decimalSeparator)) {
+            onTextMaskedListener(text, start)
+            return
+        }
+        var rawCurrency = removePrefixAndSuffix(charSequence)
+
+        if (isDeletedBeforeDecimalPart(rawCurrency)) {
+            rawCurrency = insertZero(rawCurrency, start - currencyPrefixLength)
         }
+
+        val startLength = rawCurrency.length
+
+        var formattedCurrency = applyCurrencyPattern(rawCurrency)
+        val endLength = formattedCurrency.length
+
+        val cursorIndex = handleCursorForDeletion(
+            subtractCurrencyPrefixIfValidOrZero(start + (endLength - startLength)),
+            formattedCurrency,
+            endLength - startLength == 0
+        )
+
+        formattedCurrency = addSuffixAndPrefix(formattedCurrency)
+        selection = cursorIndex
+        text = formattedCurrency
     }
 
-    private fun handleCursor(selection: Int, formattedCurrency: String, isDeletion: Boolean): Int = when {
+    private fun handleCursorForDeletion(selection: Int, formattedCurrency: String, isItemDeleted: Boolean): Int = when {
         selection <= 0 -> getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
         selection >= formattedCurrency.length -> {
-            if (isDeletion) {
-                selection - 1 + currencyPrefixLength
-            } else {
-                getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
-            }
+            if (isItemDeleted) selection + currencyPrefixLength else selection + currencyPrefixLength - 1
         }
-        isDeletion && (formattedCurrency[selection - 1] == localeDecimalFormatSymbols.groupingSeparator) -> {
+        formattedCurrency[selection - 1] == localeDecimalFormatSymbols.groupingSeparator -> {
             selection + currencyPrefixLength - 1
         }
         selection in (formattedCurrency.length - currencyMaskerSettings.decimalLimit)..formattedCurrency.length -> {
-            if (isDeletion) {
-                selection - 1 + currencyPrefixLength
+            selection + currencyPrefixLength
+        }
+        selection > 0 && selection <= formattedCurrency.length -> selection + currencyPrefixLength
+        else -> selection - 1
+    }
+
+    private fun handleCursorForAddition(selection: Int, formattedCurrency: String): Int = when {
+        selection <= 0 -> getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
+        selection >= formattedCurrency.length -> getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
+        selection in (formattedCurrency.length - currencyMaskerSettings.decimalLimit)..formattedCurrency.length -> {
+            if (selection + 1 > formattedCurrency.length) {
+                getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
             } else {
-                if (selection + 1 >= formattedCurrency.length) {
-                    getFormattedCurrencyDecimalLimitLeftIndex(formattedCurrency)
-                } else {
-                    selection + 1 + currencyPrefixLength
-                }
+                selection + currencyPrefixLength
             }
         }
         selection > 0 && selection <= formattedCurrency.length -> selection + currencyPrefixLength
-        else -> if (isDeletion) selection - 1 else selection
+        else -> selection
+    }
+
+    private fun removePrefixAndSuffix(charSequence: CharSequence): CharSequence {
+        return if (formattedCurrencyPrefix.isNotBlank() || formattedCurrencySuffix.isNotBlank()) {
+            charSequence.removeWithRegex("[$formattedCurrencyPrefix$formattedCurrencySuffix]")
+        } else {
+            charSequence
+        }
+    }
+
+    private fun removeGroupingSeparator(charSequence: CharSequence): String {
+        return charSequence.removeWithRegex("[${localeDecimalFormatSymbols.groupingSeparator}]")
+    }
+
+    private fun applyCurrencyPattern(charSequence: CharSequence): String {
+        return try {
+            val currencyWithoutGroupSeparator = removeGroupingSeparator(charSequence)
+            currencyFormatter.applyPattern(WHOLE_NUMBER_FORMAT)
+            val parsedNumber = currencyFormatter.parse(currencyWithoutGroupSeparator)!!
+            currencyFormatter.applyPattern(mask.maskPattern)
+            currencyFormatter.format(parsedNumber)
+        } catch (e: ParseException) {
+            e.printStackTrace()
+            ""
+        }
+
     }
 
     private fun subtractCurrencyPrefixIfValidOrZero(cursor: Int): Int {
@@ -164,6 +210,33 @@ class CurrencyMasker(
         return "$formattedCurrencyPrefix$currencyValue$formattedCurrencySuffix"
     }
 
+    private fun replaceWithAddedNumber(charSequence: CharSequence, start: Int): String {
+        val currencyValue = charSequence.toString()
+        if (charSequence.length - 1 <= start) {
+            return currencyValue.substring(0, charSequence.length - 1)
+        }
+        return currencyValue.replaceRange(start, start + 2, charSequence[start].toString())
+    }
+
+    private fun insertZero(charSequence: CharSequence, start: Int): String {
+        val currencyValue = charSequence.toString()
+        return currencyValue.replaceRange(start, start, ZERO)
+    }
+
+    private fun isAddedAfterDecimalPart(charSequence: CharSequence): Boolean {
+        val decimalValue = charSequence.toString()
+            .substringAfter(localeDecimalFormatSymbols.decimalSeparator)
+            .filter { it.isDigit() }
+        return decimalValue.length >= currencyMaskerSettings.decimalLimit + 1
+    }
+
+    private fun isDeletedBeforeDecimalPart(charSequence: CharSequence): Boolean {
+        val decimalValue = charSequence.toString()
+            .substringAfter(localeDecimalFormatSymbols.decimalSeparator)
+            .filter { it.isDigit() }
+        return decimalValue.length <= currencyMaskerSettings.decimalLimit - 1
+    }
+
     override fun getTextWithReturnPattern(): String? {
         return null
     }
@@ -173,6 +246,8 @@ class CurrencyMasker(
 
         private const val WHOLE_NUMBER_FORMAT = "#,##0"
 
+        private const val ZERO = "0"
+
         fun checkIfLimitSafe(currencyDecimalLimit: Int) {
             if (currencyDecimalLimit < NO_DECIMAL_LIMIT) {
                 throw IllegalArgumentException("currencyDecimalLimit must be equal or bigger than -1")

From f3f4bed73777fd13a4ffbe744e82ff925550b42b Mon Sep 17 00:00:00 2001
From: Mirac Ozkan <mirac.ozkan123@gmail.com>
Date: Tue, 10 Aug 2021 00:01:00 +0300
Subject: [PATCH 12/18] :rocket: Release MaskedEditText 1.2.12

---
 maskededittext/library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maskededittext/library.properties b/maskededittext/library.properties
index 1bddf3c..af250d9 100644
--- a/maskededittext/library.properties
+++ b/maskededittext/library.properties
@@ -1,4 +1,4 @@
 artifact=maskededittext
 libraryName=com.hipo.maskededittext
-libraryVersion=1.2.11
+libraryVersion=1.2.12
 libraryDescription=Masked edit text to format phone number, date, ssn and custom types.

From 7f811f29775f9bc3db4eae44434b33a1920df0c3 Mon Sep 17 00:00:00 2001
From: Yasin Cetiner <yasincetiner.ce@gmail.com>
Date: Tue, 10 Aug 2021 11:15:06 +0300
Subject: [PATCH 13/18] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Fix=20currency=20inp?=
 =?UTF-8?q?ut=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_main.xml                 | 4 +---
 .../com/hipo/maskededittext/maskers/CurrencyMasker.kt     | 6 ++++--
 .../main/res/values/themes_custom_input_layout_item.xml   | 8 ++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dcb6f95..8ebf0e4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,9 +24,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_40"
             android:hint="Currency"
-            android:theme="@style/MaskedInputTextLayoutTheme"
-            app:currencyPrefix="$"
-            app:currencySuffix="$"
+            android:theme="@style/MaskedInputTextLayoutTheme.Currency"
             app:maskType="currency" />
 
         <com.hipo.maskededittext.MaskedTextInputLayout
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
index d36f275..420d4fb 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
@@ -6,6 +6,7 @@ import android.text.method.DigitsKeyListener
 import com.hipo.maskededittext.Mask
 import com.hipo.maskededittext.model.CurrencyMaskerSettings
 import com.hipo.maskededittext.utils.extensions.removeWithRegex
+import java.math.RoundingMode
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.text.ParseException
@@ -55,6 +56,7 @@ class CurrencyMasker(
         maximumIntegerDigits = 2
         minimumFractionDigits = 0
         maximumFractionDigits = 2
+        roundingMode = RoundingMode.DOWN
         decimalFormatSymbols = localeDecimalFormatSymbols
     }
 
@@ -225,14 +227,14 @@ class CurrencyMasker(
 
     private fun isAddedAfterDecimalPart(charSequence: CharSequence): Boolean {
         val decimalValue = charSequence.toString()
-            .substringAfter(localeDecimalFormatSymbols.decimalSeparator)
+            .substringAfter(localeDecimalFormatSymbols.decimalSeparator, "")
             .filter { it.isDigit() }
         return decimalValue.length >= currencyMaskerSettings.decimalLimit + 1
     }
 
     private fun isDeletedBeforeDecimalPart(charSequence: CharSequence): Boolean {
         val decimalValue = charSequence.toString()
-            .substringAfter(localeDecimalFormatSymbols.decimalSeparator)
+            .substringAfter(localeDecimalFormatSymbols.decimalSeparator, "")
             .filter { it.isDigit() }
         return decimalValue.length <= currencyMaskerSettings.decimalLimit - 1
     }
diff --git a/maskededittext/src/main/res/values/themes_custom_input_layout_item.xml b/maskededittext/src/main/res/values/themes_custom_input_layout_item.xml
index 7294587..7d95b98 100644
--- a/maskededittext/src/main/res/values/themes_custom_input_layout_item.xml
+++ b/maskededittext/src/main/res/values/themes_custom_input_layout_item.xml
@@ -3,6 +3,10 @@
 
     <style name="MaskedInputTextLayout" />
 
+    <style name="MaskedInputTextLayoutTheme.Currency">
+        <item name="textInputEditTextStyle">@style/InputEditTextStyle.Currency</item>
+    </style>
+
     <style name="MaskedInputTextLayoutTheme">
         <item name="textInputLayoutStyle">@style/InputLayoutStyle</item>
         <item name="textInputEditTextStyle">@style/InputEditTextStyle</item>
@@ -32,6 +36,10 @@
         <item name="android:maxLines">1</item>
     </style>
 
+    <style name="InputEditTextStyle.Currency">
+        <item name="android:maxLength">18</item>
+    </style>
+
     <style name="TextInputErrorStyle">
         <item name="android:maxLines">1</item>
         <item name="android:layout_marginTop">@dimen/spacing_12</item>

From 9d11d72a358b3d416a8b53a132d94b8bd77a6f86 Mon Sep 17 00:00:00 2001
From: Yasin Cetiner <yasincetiner.ce@gmail.com>
Date: Tue, 10 Aug 2021 11:16:58 +0300
Subject: [PATCH 14/18] :rocket: Release MaskedEditText 1.2.13

---
 maskededittext/library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maskededittext/library.properties b/maskededittext/library.properties
index af250d9..e1f503d 100644
--- a/maskededittext/library.properties
+++ b/maskededittext/library.properties
@@ -1,4 +1,4 @@
 artifact=maskededittext
 libraryName=com.hipo.maskededittext
-libraryVersion=1.2.12
+libraryVersion=1.2.13
 libraryDescription=Masked edit text to format phone number, date, ssn and custom types.

From 66b6836396b15ec044f9da5441f18c4121c220a1 Mon Sep 17 00:00:00 2001
From: Yasin Cetiner <yasincetiner.ce@gmail.com>
Date: Wed, 11 Aug 2021 02:29:46 +0300
Subject: [PATCH 15/18] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Fix=20iban=20masker?=
 =?UTF-8?q?=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maskededittext/MaskedTextInputEditText.kt | 30 ++++++++++++++-----
 .../hipo/maskededittext/maskers/BaseMasker.kt |  2 ++
 .../maskededittext/maskers/CurrencyMasker.kt  | 23 ++++++++++----
 .../hipo/maskededittext/maskers/IBANMasker.kt |  9 ++++++
 .../hipo/maskededittext/masks/CurrencyMask.kt |  2 +-
 .../model/CurrencyMaskerSettings.kt           |  8 ++---
 .../res/layout/custom_masked_input_layout.xml |  4 +--
 7 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
index 519e09c..6a4b101 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
@@ -1,6 +1,7 @@
 package com.hipo.maskededittext
 
 import android.content.Context
+import android.graphics.Rect
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.AttributeSet
@@ -63,6 +64,7 @@ class MaskedTextInputEditText @JvmOverloads constructor(
     private var textWatcher: TextWatcher? = null
     private var masker: BaseMasker? = null
     private var isCursorFixed = false
+    private val textWatchers = mutableSetOf<TextWatcher>()
 
     var maskPattern: String = ""
     var returnMaskPattern: String = ""
@@ -97,6 +99,11 @@ class MaskedTextInputEditText @JvmOverloads constructor(
         super.onSelectionChanged(selStart, selEnd)
     }
 
+    override fun addTextChangedListener(watcher: TextWatcher?) {
+        super.addTextChangedListener(watcher)
+        watcher?.let { textWatchers.add(it) }
+    }
+
     fun updateCurrencyModel(currencyMaskerSettings: CurrencyMaskerSettings) {
         this.currencySettings = currencyMaskerSettings
         maskType = CurrencyMask(currencyMaskerSettings = currencySettings)
@@ -112,10 +119,10 @@ class MaskedTextInputEditText @JvmOverloads constructor(
             isCursorFixed = attrs.getBoolean(R.styleable.MaskedInputLayout_isCursorFixed, false)
 
             currencySettings.decimalSeparator =
-                attrs.getString(R.styleable.MaskedInputLayout_decimalSeparator) ?: COMMA
+                attrs.getString(R.styleable.MaskedInputLayout_decimalSeparator)?.first() ?: COMMA
 
             currencySettings.groupingSeparator =
-                attrs.getString(R.styleable.MaskedInputLayout_groupingSeparator) ?: DOT
+                attrs.getString(R.styleable.MaskedInputLayout_groupingSeparator)?.first() ?: DOT
 
             maskPattern = attrs.getString(R.styleable.MaskedInputLayout_maskPattern)
                 ?: context.getString(R.string.currency_mask_pattern)
@@ -158,6 +165,13 @@ class MaskedTextInputEditText @JvmOverloads constructor(
         addTextChangedListener(textWatcher)
     }
 
+    override fun onFocusChanged(focused: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+        super.onFocusChanged(focused, direction, previouslyFocusedRect)
+        post {
+            masker?.onFocusChanged(focused, direction, previouslyFocusedRect)
+        }
+    }
+
     private fun setMasker(mask: Mask) {
         masker = when (mask) {
             is UnselectedMask -> return
@@ -187,11 +201,13 @@ class MaskedTextInputEditText @JvmOverloads constructor(
     }
 
     private fun setEditTextWithoutTriggerListener(newText: String, selection: Int?) {
-        removeTextChangedListener(textWatcher)
+        textWatchers.forEach {
+            removeTextChangedListener(it)
+        }
         setText(newText)
         setSelection(selection ?: newText.length)
-        textWatcher?.let { textWatcher ->
-            addTextChangedListener(textWatcher)
+        textWatchers?.forEach {
+            addTextChangedListener(it)
         }
         onTextChangedListener?.invoke(newText)
     }
@@ -221,7 +237,7 @@ class MaskedTextInputEditText @JvmOverloads constructor(
     companion object {
         private val logTag = this::class.java.simpleName
         private const val HASH = '#'
-        private const val COMMA = ","
-        private const val DOT = "."
+        private const val COMMA = ','
+        private const val DOT = '.'
     }
 }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
index 1de81d6..bddb108 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/BaseMasker.kt
@@ -1,5 +1,6 @@
 package com.hipo.maskededittext.maskers
 
+import android.graphics.Rect
 import android.text.method.DigitsKeyListener
 import com.hipo.maskededittext.Mask
 
@@ -7,6 +8,7 @@ abstract class BaseMasker {
     abstract fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int)
     abstract fun getTextWithReturnPattern(): String?
 
+    open fun onFocusChanged(focused: Boolean, direction: Int, previouslyFocusedRect: Rect?) {}
     open fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int, selectionStart: Int) {}
 
     abstract val onTextMaskedListener: (String, Int?) -> Unit
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
index 420d4fb..a1f1484 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
@@ -1,5 +1,6 @@
 package com.hipo.maskededittext.maskers
 
+import android.graphics.Rect
 import android.text.InputType.TYPE_CLASS_NUMBER
 import android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL
 import android.text.method.DigitsKeyListener
@@ -42,13 +43,9 @@ class CurrencyMasker(
 
     private var selection = 0
 
-    private var text by Delegates.observable("", { _, _, newValue ->
-        onTextMaskedListener(newValue, selection)
-    })
-
     private val localeDecimalFormatSymbols = DecimalFormatSymbols(currencyMaskerSettings.locale).apply {
-        decimalSeparator = currencyMaskerSettings.decimalSeparator.first()
-        groupingSeparator = currencyMaskerSettings.groupingSeparator.first()
+        decimalSeparator = currencyMaskerSettings.decimalSeparator
+        groupingSeparator = currencyMaskerSettings.groupingSeparator
     }
 
     private val currencyFormatter = DecimalFormat().apply {
@@ -60,6 +57,10 @@ class CurrencyMasker(
         decimalFormatSymbols = localeDecimalFormatSymbols
     }
 
+    private var text by Delegates.observable(defaultText, { _, _, newValue ->
+        onTextMaskedListener(newValue, selection)
+    })
+
     override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
         val isDeletion = count == IS_REMOVED
 
@@ -83,6 +84,16 @@ class CurrencyMasker(
         }
     }
 
+    override fun onFocusChanged(focused: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+        super.onFocusChanged(focused, direction, previouslyFocusedRect)
+        if (focused) {
+            selection = text.indexOf(currencyMaskerSettings.decimalSeparator)
+            if (selection != -1) {
+                text = text
+            }
+        }
+    }
+
     private fun handleAddition(charSequence: CharSequence, start: Int, selectionStart: Int) {
         if ((charSequence[start] == localeDecimalFormatSymbols.decimalSeparator ||
                 charSequence[start] == localeDecimalFormatSymbols.groupingSeparator)
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt
index 47ac088..8d8553b 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/IBANMasker.kt
@@ -36,12 +36,21 @@ class IBANMasker(
             text = IBANMask.IBAN_PREFIX
             return
         }
+
+        if (charSequence.length < IBANMask.IBAN_PREFIX.length) {
+            selection = IBANMask.IBAN_PREFIX.length
+            text = IBANMask.IBAN_PREFIX
+            return
+        }
+
         if (start < IBANMask.IBAN_PREFIX.length) {
             selection = text.length
             text = text
             return
         }
+
         startLength = charSequence.length
+
         when (count) {
             IS_REMOVED -> handleDeletion(charSequence, start)
             IS_ADDED -> handleAddition(charSequence, selectionStart)
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
index 3bbf4f6..0ed124b 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/masks/CurrencyMask.kt
@@ -16,7 +16,7 @@ class CurrencyMask(
 
     override fun getParsedText(maskedText: String): String? {
         val filteredText = filterMaskedText(maskedText).takeIf { isValidToParse(maskedText) } ?: defaultCurrencyValue
-        return filteredText.filter { it.isDigit() || it == currencyMaskerSettings?.decimalSeparator?.first() }
+        return filteredText.filter { it.isDigit() || it == currencyMaskerSettings?.decimalSeparator }
     }
 
     override fun isValidToParse(maskedText: String): Boolean {
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt b/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
index 4b706d4..b3ad0b0 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/model/CurrencyMaskerSettings.kt
@@ -4,15 +4,15 @@ import java.util.Locale
 
 data class CurrencyMaskerSettings(
     var decimalLimit: Int = DEFAULT_DECIMAL_LIMIT,
-    var decimalSeparator: String = COMMA,
-    var groupingSeparator: String = DOT,
+    var decimalSeparator: Char = COMMA,
+    var groupingSeparator: Char = DOT,
     var prefix: String = "",
     var suffix: String = "",
     var locale: Locale = Locale.getDefault()
 ) {
     companion object {
         const val DEFAULT_DECIMAL_LIMIT = 2
-        private const val DOT = "."
-        private const val COMMA = ","
+        private const val DOT = '.'
+        private const val COMMA = ','
     }
 }
diff --git a/maskededittext/src/main/res/layout/custom_masked_input_layout.xml b/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
index b446f3e..9e56fdd 100644
--- a/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
+++ b/maskededittext/src/main/res/layout/custom_masked_input_layout.xml
@@ -2,8 +2,8 @@
 <merge 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="match_parent"
-    android:layout_height="wrap_content"
+    tools:layout_height="wrap_content"
+    tools:layout_width="match_parent"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <com.google.android.material.textfield.TextInputLayout

From 34bf6c0d47988a2da272519ee78fdaca7794cdce Mon Sep 17 00:00:00 2001
From: Yasin Cetiner <yasincetiner.ce@gmail.com>
Date: Wed, 11 Aug 2021 02:30:45 +0300
Subject: [PATCH 16/18] :rocket: Release MaskedEditText 1.2.14

---
 maskededittext/library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maskededittext/library.properties b/maskededittext/library.properties
index e1f503d..ac6c304 100644
--- a/maskededittext/library.properties
+++ b/maskededittext/library.properties
@@ -1,4 +1,4 @@
 artifact=maskededittext
 libraryName=com.hipo.maskededittext
-libraryVersion=1.2.13
+libraryVersion=1.2.14
 libraryDescription=Masked edit text to format phone number, date, ssn and custom types.

From a0088b7b1809a71fe7e0e6b0710fc4daf31df4f6 Mon Sep 17 00:00:00 2001
From: Yasin Cetiner <yasincetiner.ce@gmail.com>
Date: Sat, 14 Aug 2021 00:36:52 +0300
Subject: [PATCH 17/18] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Fix=20currency=20and?=
 =?UTF-8?q?=20phone=20masker=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maskededittext/MaskedTextInputEditText.kt | 22 ++++++++-----------
 .../maskededittext/MaskedTextInputLayout.kt   | 10 ++++-----
 .../maskededittext/maskers/CurrencyMasker.kt  | 11 +++++-----
 .../maskers/PhoneNumberMasker.kt              |  4 +++-
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
index 6a4b101..3cbbcc0 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputEditText.kt
@@ -64,7 +64,6 @@ class MaskedTextInputEditText @JvmOverloads constructor(
     private var textWatcher: TextWatcher? = null
     private var masker: BaseMasker? = null
     private var isCursorFixed = false
-    private val textWatchers = mutableSetOf<TextWatcher>()
 
     var maskPattern: String = ""
     var returnMaskPattern: String = ""
@@ -99,11 +98,6 @@ class MaskedTextInputEditText @JvmOverloads constructor(
         super.onSelectionChanged(selStart, selEnd)
     }
 
-    override fun addTextChangedListener(watcher: TextWatcher?) {
-        super.addTextChangedListener(watcher)
-        watcher?.let { textWatchers.add(it) }
-    }
-
     fun updateCurrencyModel(currencyMaskerSettings: CurrencyMaskerSettings) {
         this.currencySettings = currencyMaskerSettings
         maskType = CurrencyMask(currencyMaskerSettings = currencySettings)
@@ -177,7 +171,7 @@ class MaskedTextInputEditText @JvmOverloads constructor(
             is UnselectedMask -> return
             is CustomMask -> handleCustomMask(mask)
             is StaticTextMask -> handleStaticTextMask(mask)
-            is CurrencyMask -> CurrencyMasker(mask, ::setEditTextWithoutTriggerListener, currencySettings)
+            is CurrencyMask -> CurrencyMasker(mask, ::setEditTextWithoutTriggerListener, ::updateSelection, currencySettings)
             is CreditCardMask -> CreditCardMasker(mask, ::setEditTextWithoutTriggerListener)
             is IBANMask -> IBANMasker(mask, ::setEditTextWithoutTriggerListener)
             is PhoneMask -> PhoneNumberMasker(mask, ::setEditTextWithoutTriggerListener)
@@ -200,18 +194,20 @@ class MaskedTextInputEditText @JvmOverloads constructor(
         setText(defaultText)
     }
 
-    private fun setEditTextWithoutTriggerListener(newText: String, selection: Int?) {
-        textWatchers.forEach {
-            removeTextChangedListener(it)
-        }
+    fun setEditTextWithoutTriggerListener(newText: String, selection: Int? = null) {
+        removeTextChangedListener(textWatcher)
         setText(newText)
         setSelection(selection ?: newText.length)
-        textWatchers?.forEach {
-            addTextChangedListener(it)
+        textWatcher?.let { textWatcher ->
+            addTextChangedListener(textWatcher)
         }
         onTextChangedListener?.invoke(newText)
     }
 
+    private fun updateSelection(selection: Int? = null) {
+        setSelection(selection ?: text?.length ?: 0)
+    }
+
     private fun handleCustomMask(mask: Mask): Masker = when {
         maskPattern.contains(HASH).not() -> {
             throw Exception("$logTag: ${context.getString(R.string.exception_mask_hash)}")
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
index 7b26bd0..6897f9e 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/MaskedTextInputLayout.kt
@@ -10,7 +10,6 @@ import androidx.annotation.DrawableRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
-import androidx.core.widget.addTextChangedListener
 import com.hipo.maskededittext.databinding.CustomMaskedInputLayoutBinding
 import com.hipo.maskededittext.model.CurrencyMaskerSettings
 import com.hipo.maskededittext.model.CustomInputState
@@ -19,6 +18,7 @@ import com.hipo.maskededittext.utils.extensions.setTextAndVisibility
 import com.hipo.maskededittext.utils.extensions.show
 import com.hipo.maskededittext.utils.extensions.showKeyboard
 import com.hipo.maskededittext.utils.viewbinding.viewBinding
+import kotlin.properties.Delegates
 
 class MaskedTextInputLayout @JvmOverloads constructor(
     context: Context,
@@ -103,7 +103,9 @@ class MaskedTextInputLayout @JvmOverloads constructor(
             }
         }
 
-    var onTextChanged: ((text: String) -> Unit)? = null
+    var onTextChanged: ((String) -> Unit)? by Delegates.observable(null, { _, _, newValue ->
+        editText.onTextChangedListener = newValue
+    })
 
     init {
         loadAttrs(attrs)
@@ -123,10 +125,6 @@ class MaskedTextInputLayout @JvmOverloads constructor(
     }
 
     private fun initUi() {
-        binding.textInputEditText.addTextChangedListener {
-            onTextChanged?.invoke(text)
-        }
-
         binding.iconImageView.setOnClickListener {
             endIconClick?.invoke()
         }
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
index a1f1484..ee44d20 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/CurrencyMasker.kt
@@ -16,6 +16,7 @@ import kotlin.properties.Delegates
 class CurrencyMasker(
     override val mask: Mask,
     override val onTextMaskedListener: (String, Int?) -> Unit,
+    val updateSelection: (Int?) -> Unit,
     private val currencyMaskerSettings: CurrencyMaskerSettings
 ) : BaseMasker() {
 
@@ -41,8 +42,6 @@ class CurrencyMasker(
         "${formattedCurrencyPrefix}0${localeDecimalFormatSymbols.decimalSeparator}00${formattedCurrencySuffix}"
     }
 
-    private var selection = 0
-
     private val localeDecimalFormatSymbols = DecimalFormatSymbols(currencyMaskerSettings.locale).apply {
         decimalSeparator = currencyMaskerSettings.decimalSeparator
         groupingSeparator = currencyMaskerSettings.groupingSeparator
@@ -61,6 +60,10 @@ class CurrencyMasker(
         onTextMaskedListener(newValue, selection)
     })
 
+    private var selection by Delegates.observable(0, { _, _, newValue ->
+        updateSelection(newValue)
+    })
+
     override fun onTextChanged(charSequence: CharSequence?, start: Int, count: Int, before: Int, selectionStart: Int) {
         val isDeletion = count == IS_REMOVED
 
@@ -88,9 +91,6 @@ class CurrencyMasker(
         super.onFocusChanged(focused, direction, previouslyFocusedRect)
         if (focused) {
             selection = text.indexOf(currencyMaskerSettings.decimalSeparator)
-            if (selection != -1) {
-                text = text
-            }
         }
     }
 
@@ -122,7 +122,6 @@ class CurrencyMasker(
         formattedCurrency = addSuffixAndPrefix(formattedCurrency)
         selection = cursorIndex
         text = formattedCurrency
-
     }
 
     private fun handleDeletion(charSequence: CharSequence, start: Int) {
diff --git a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
index 22cd972..9720209 100644
--- a/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
+++ b/maskededittext/src/main/java/com/hipo/maskededittext/maskers/PhoneNumberMasker.kt
@@ -39,11 +39,13 @@ class PhoneNumberMasker(
             text = defaultPhoneFormat
             return
         }
+
         if (start < phoneMaskMinCharCount) {
             selection = text.length
-            text = text
+            text = if (text.isEmpty()) charSequence.toString() else text
             return
         }
+
         startLength = charSequence.length
         when (count) {
             IS_REMOVED -> handleDeletion(charSequence, selectionStart)

From e1feda14e6fe440a2b3a0be2a3542a67cb2a12e9 Mon Sep 17 00:00:00 2001
From: Yasin Cetiner <yasincetiner.ce@gmail.com>
Date: Sat, 14 Aug 2021 00:39:04 +0300
Subject: [PATCH 18/18] =?UTF-8?q?=F0=9F=9A=80=20Release=20MaskedEditText?=
 =?UTF-8?q?=201.2.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maskededittext/library.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maskededittext/library.properties b/maskededittext/library.properties
index ac6c304..d6682b2 100644
--- a/maskededittext/library.properties
+++ b/maskededittext/library.properties
@@ -1,4 +1,4 @@
 artifact=maskededittext
 libraryName=com.hipo.maskededittext
-libraryVersion=1.2.14
+libraryVersion=1.2.15
 libraryDescription=Masked edit text to format phone number, date, ssn and custom types.