diff --git a/build.gradle b/build.gradle
index c93b711..0b30bc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.70'
+    ext.kotlin_version = '1.5.31'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/example/build.gradle b/example/build.gradle
index 2d2f895..a270266 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.goodiebag.pinview.example"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -25,8 +24,8 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    testImplementation 'junit:junit:4.13.2'
     implementation project(':pinview')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
index c361d8e..bfdc1ea 100644
--- a/example/src/main/AndroidManifest.xml
+++ b/example/src/main/AndroidManifest.xml
@@ -8,10 +8,11 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
diff --git a/example/src/main/java/com/goodiebag/pinview/example/MainActivity.kt b/example/src/main/java/com/goodiebag/pinview/example/MainActivity.kt
index 49bd504..c116d10 100644
--- a/example/src/main/java/com/goodiebag/pinview/example/MainActivity.kt
+++ b/example/src/main/java/com/goodiebag/pinview/example/MainActivity.kt
@@ -1,32 +1,67 @@
 package com.goodiebag.pinview.example
 
+import android.annotation.SuppressLint
 import android.graphics.Color
 import android.os.Bundle
+import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.res.ResourcesCompat
 import com.goodiebag.pinview.Pinview
-import com.goodiebag.pinview.Pinview.PinViewEventListener
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val scaledDensity = resources.displayMetrics.scaledDensity
+
         setContentView(R.layout.activity_main)
+        val pinViews = listOf<Pinview>(
+            findViewById(R.id.pinview0),
+            findViewById(R.id.pinview1),
+            findViewById(R.id.pinview2),
+            findViewById(R.id.pinview3),
+            findViewById(R.id.pinview4),
+            findViewById(R.id.pinview5),
+            findViewById(R.id.pinview6),
+            findViewById(R.id.pinview7),
+        )
+        findViewById<Button>(R.id.clearButton).setOnClickListener {
+            pinViews.forEach { it.value = "" }
+            pinViews[0].requestPinEntryFocus() // Reopen keyboard on first pin
+        }
 
-        val pinview1 = findViewById<Pinview>(R.id.pinview1)
-        pinview1.setPinViewEventListener(object : PinViewEventListener {
-            override fun onDataEntered(pinview: Pinview?, fromUser: Boolean) {
-                Toast.makeText(this@MainActivity, pinview!!.value, Toast.LENGTH_SHORT).show()
-            }
-        })
+        val pinview0 = pinViews[0]
+        pinview0.setPinViewEventListener { pinview: Pinview, fromUser: Boolean ->
+            Toast.makeText(this@MainActivity, pinview.value, Toast.LENGTH_SHORT).show()
+        }
+        setFont(pinview0)
+        pinview0.setTextPadding(0, (4 * scaledDensity).toInt(), 0, 0)
 
         // pinView Customize
-        val pinview5 = findViewById<Pinview>(R.id.pinview5)
-        pinview5.apply {
+        pinViews[4].apply {
             setCursorShape(R.drawable.example_cursor)
             //setCursorColor(Color.BLUE);
-            setTextSize(12)
+            textSize = 12
             setTextColor(Color.BLACK)
             showCursor(true)
         }
+
+        val widePinview = pinViews[6]
+        val defaultTextSize = widePinview.textSize
+        val minTextSizeScalePercentage = resources.getDimension(R.dimen.minimum_text_size) / resources.getDimension(R.dimen.desired_text_size)
+        // Auto adjust text size for when the Pinview which is wider than screen
+        widePinview.setPinViewWidthUpdateListener { pinView: Pinview, width: Int ->
+            // Scale text, but avoid going smaller than a minimum size
+            val percentDownScaledWidth = (width / pinView.pinWidth.toFloat()).coerceAtLeast(minTextSizeScalePercentage)
+            pinView.textSize = (defaultTextSize * percentDownScaledWidth).toInt()
+        }
+    }
+
+    @SuppressLint("NewApi")
+    private fun setFont(pinview1: Pinview) {
+        // resources.getFont only available from SDK 26
+        val typeface = ResourcesCompat.getFont(this, R.font.poppins_semibold)
+        pinview1.setTypeface(typeface)
     }
+
 }
\ No newline at end of file
diff --git a/example/src/main/res/font/poppins_semibold.ttf b/example/src/main/res/font/poppins_semibold.ttf
new file mode 100644
index 0000000..3b8622f
Binary files /dev/null and b/example/src/main/res/font/poppins_semibold.ttf differ
diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml
index 254eaf0..461a657 100644
--- a/example/src/main/res/layout/activity_main.xml
+++ b/example/src/main/res/layout/activity_main.xml
@@ -1,102 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:id="@+id/activity_main"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#e1e1e1"
-              android:orientation="vertical"
-              android:paddingLeft="@dimen/activity_horizontal_margin"
-              android:paddingTop="@dimen/activity_vertical_margin"
-              android:paddingRight="@dimen/activity_horizontal_margin"
-              android:paddingBottom="@dimen/activity_vertical_margin">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Number"/>
+<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:id="@+id/activity_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#e1e1e1">
 
-    <com.goodiebag.pinview.Pinview
-        android:id="@+id/pinview1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cursorVisible="false"
-        app:forceKeyboard="true"
-        app:hint=""
-        app:inputType="number"
-        app:password="false"
-        app:pinBackground="@drawable/example_drawable_with_grey_disabled"
-        app:pinHeight="40dp"
-        app:pinLength="4"
-        app:pinWidth="40dp"/>
-
-    <TextView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Text"/>
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin">
 
-    <com.goodiebag.pinview.Pinview
-        android:id="@+id/pinview2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cursorVisible="false"
-        app:forceKeyboard="true"
-        app:hint=""
-        app:inputType="text"
-        app:password="false"
-        app:pinBackground="@drawable/example_drawable"
-        app:pinHeight="40dp"
-        app:pinLength="4"
-        app:pinWidth="40dp"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Number-Password"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Number" />
 
-    <com.goodiebag.pinview.Pinview
-        android:id="@+id/pinview3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cursorVisible="false"
-        app:hint="0"
-        app:inputType="number"
-        app:password="true"
-        app:pinBackground="@drawable/example_drawable"
-        app:pinHeight="40dp"
-        app:pinLength="4"
-        app:pinWidth="40dp"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Text-Password"/>
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview0"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cursorVisible="false"
+            app:forceKeyboard="true"
+            app:hint=""
+            app:inputType="number"
+            app:password="false"
+            app:pinBackground="@drawable/example_drawable_with_grey_disabled"
+            app:pinHeight="40dp"
+            app:pinLength="4"
+            app:pinWidth="40dp"
+            tools:hint="0" />
 
-    <com.goodiebag.pinview.Pinview
-        android:id="@+id/pinview4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:cursorVisible="false"
-        app:hint="0"
-        app:inputType="text"
-        app:password="true"
-        app:pinBackground="@drawable/example_drawable"
-        app:pinHeight="40dp"
-        app:pinLength="4"
-        app:pinWidth="40dp"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Custom Pin View"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Text" />
 
-    <com.goodiebag.pinview.Pinview
-        android:id="@+id/pinview5"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:inputType="text"
-        app:pinHeight="40dp"
-        app:pinLength="4"
-        app:pinWidth="40dp"/>
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cursorVisible="false"
+            app:forceKeyboard="true"
+            app:hint=""
+            app:inputType="text"
+            app:password="false"
+            app:pinBackground="@drawable/example_drawable"
+            app:pinHeight="40dp"
+            app:pinLength="4"
+            app:pinWidth="40dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Number-Password" />
+
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cursorVisible="false"
+            app:hint="0"
+            app:inputType="number"
+            app:password="true"
+            app:pinBackground="@drawable/example_drawable"
+            app:pinHeight="40dp"
+            app:pinLength="4"
+            app:pinWidth="40dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Text-Password" />
+
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cursorVisible="false"
+            app:hint="0"
+            app:inputType="text"
+            app:password="true"
+            app:pinBackground="@drawable/example_drawable"
+            app:pinHeight="40dp"
+            app:pinLength="4"
+            app:pinWidth="40dp"
+            app:textSize="9sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Custom Pin View (with dp textSize)" />
+
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:inputType="text"
+            app:pinHeight="40dp"
+            app:pinLength="4"
+            app:pinWidth="40dp"
+            app:textSize="18dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Auto adjusting width and to fit, and height to square" />
+
+        <!-- pinHeight 0dp means set height equal to width. Width is auto-adjusted if pin is too wide to fit screen by default, see Pinview.autoAdjustWidth -->
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:inputType="text"
+            app:pinHeight="0dp"
+            app:pinLength="4"
+            app:pinWidth="40dp"
+            app:textSize="@dimen/desired_text_size" />
+
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview6"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:inputType="text"
+            app:pinHeight="0dp"
+            app:pinLength="8"
+            app:pinWidth="40dp"
+            app:textSize="@dimen/desired_text_size" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Auto adjusting width, but keep fixed height (note we don't auto-adjust text-size)" />
+
+        <com.goodiebag.pinview.Pinview
+            android:id="@+id/pinview7"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:inputType="text"
+            app:pinHeight="40dp"
+            app:pinLength="8"
+            app:pinWidth="40dp" />
 
-</LinearLayout>
+        <Button
+            android:id="@+id/clearButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="clear all" />
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/example/src/main/res/values/dimens.xml b/example/src/main/res/values/dimens.xml
index 47c8224..571117e 100644
--- a/example/src/main/res/values/dimens.xml
+++ b/example/src/main/res/values/dimens.xml
@@ -2,4 +2,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="desired_text_size">22dp</dimen>
+    <dimen name="minimum_text_size">12dp</dimen>
 </resources>
diff --git a/pinview/build.gradle b/pinview/build.gradle
index 5c0fe94..663255c 100644
--- a/pinview/build.gradle
+++ b/pinview/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 3
         versionName "1.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -26,8 +25,8 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    testImplementation 'junit:junit:4.13.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
diff --git a/pinview/src/main/AndroidManifest.xml b/pinview/src/main/AndroidManifest.xml
index aa785b8..ba57c8f 100644
--- a/pinview/src/main/AndroidManifest.xml
+++ b/pinview/src/main/AndroidManifest.xml
@@ -1,10 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.goodiebag.pinview">
-
-    <application
-        android:allowBackup="true"
-        android:supportsRtl="true">
-
-    </application>
-
-</manifest>
+    package="com.goodiebag.pinview"/>
\ No newline at end of file
diff --git a/pinview/src/main/java/com/goodiebag/pinview/Pinview.kt b/pinview/src/main/java/com/goodiebag/pinview/Pinview.kt
index 61b3ee0..4271c53 100644
--- a/pinview/src/main/java/com/goodiebag/pinview/Pinview.kt
+++ b/pinview/src/main/java/com/goodiebag/pinview/Pinview.kt
@@ -21,7 +21,9 @@ package com.goodiebag.pinview
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Color
 import android.graphics.PorterDuff
+import android.graphics.Typeface
 import android.text.Editable
 import android.text.InputFilter
 import android.text.TextWatcher
@@ -29,14 +31,15 @@ import android.util.AttributeSet
 import android.view.Gravity
 import android.view.KeyEvent
 import android.view.View
+import android.view.View.OnLayoutChangeListener
 import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import java.util.*
+import kotlin.math.abs
 import kotlin.math.max
 
 /**
@@ -54,20 +57,25 @@ import kotlin.math.max
  * @author Pavan
  * @author Koushik
  */
-class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : LinearLayout(context, attrs, defStyleAttr), TextWatcher, View.OnFocusChangeListener, View.OnKeyListener {
+class Pinview @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr), TextWatcher, View.OnFocusChangeListener, View.OnKeyListener {
     private val DENSITY = getContext().resources.displayMetrics.density
 
     /**
      * Attributes
      */
     private var mPinLength = 4
-    private val editTextList: MutableList<EditText>? = ArrayList()
+    private val pinTextViewList: MutableList<TextView> = ArrayList()
     private var mPinWidth = 50
     private var mTextSize = 12
     private var mPinHeight = 50
     private var mSplitWidth = 20
     private var mCursorVisible = false
     private var mDelPressed = false
+    private var mTypeFace: Typeface? = null
 
     @get:DrawableRes
     @DrawableRes
@@ -76,11 +84,13 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
     private var mPassword = false
     private var mHint: String? = ""
     private var inputType = InputType.TEXT
-    private var finalNumberPin = false
     private var mListener: PinViewEventListener? = null
+    private var mWidthUpdateListener: (Pinview, Int) -> Unit = { _, _ -> }
     private var fromSetValue = false
     private var mForceKeyboard = true
 
+    private var appliedPinHeight = 0 // For auto adjusting to square pin sizes
+
     enum class InputType {
         TEXT, NUMBER
     }
@@ -89,13 +99,13 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
      * Interface for onDataEntered event.
      */
     interface PinViewEventListener {
-        fun onDataEntered(pinview: Pinview?, fromUser: Boolean)
+        fun onDataEntered(pinview: Pinview, fromUser: Boolean)
     }
 
     var mClickListener: OnClickListener? = null
-    var currentFocus: View? = null
+    var currentFocus: View? = null // Will be null if there are no pin-views
     var filters = arrayOfNulls<InputFilter>(1)
-    var params: LayoutParams? = null
+    lateinit var params: LayoutParams
 
     /**
      * A method to take care of all the initialisations.
@@ -109,32 +119,71 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         mPinHeight *= DENSITY.toInt()
         mPinWidth *= DENSITY.toInt()
         mSplitWidth *= DENSITY.toInt()
+        appliedPinHeight = if (mPinHeight > 0) mPinHeight else mPinWidth
         setWillNotDraw(false)
         initAttributes(context, attrs, defStyleAttr)
-        params = LayoutParams(mPinWidth, mPinHeight)
+        params = LayoutParams(mPinWidth, appliedPinHeight)
         orientation = HORIZONTAL
         createEditTexts()
         super.setOnClickListener {
             var focused = false
-            for (editText in editTextList!!) {
-                if (editText.length() == 0) {
-                    editText.requestFocus()
+            for (pin in pinTextViewList) {
+                pin.maxWidth = mPinWidth
+                if (pin.length() == 0) {
+                    pin.requestFocus()
                     openKeyboard()
                     focused = true
                     break
                 }
             }
-            if (!focused && editTextList.size > 0) { // Focus the last view
-                editTextList[editTextList.size - 1].requestFocus()
-            }
-            if (mClickListener != null) {
-                mClickListener!!.onClick(this@Pinview)
+            if (!focused && pinTextViewList.size > 0) { // Focus the last view
+                pinTextViewList[pinTextViewList.size - 1].requestFocus()
             }
+            mClickListener?.onClick(this@Pinview)
         }
         // Bring up the keyboard
-        val firstEditText: View? = editTextList?.first()
-        firstEditText?.postDelayed({ openKeyboard() }, 200)
+        val firstEditText: View? = pinTextViewList.firstOrNull() // list is empty, if pinLength==0
+        firstEditText?.postDelayed({ openKeyboardIfForced() }, 200)
         updateEnabledState()
+        // View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom
+        val listener = OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+            if (pinTextViewList.isNotEmpty()) {
+                val lastPin = pinTextViewList.last()
+                val containerEndCoordinate = this@Pinview.let { it.x + it.width }
+                val lastPinEndCoordinate = lastPin.x + lastPin.width
+                if (lastPin.width > mPinWidth) {
+                    // Turn off auto width distribution, because otherwise they always scale to fit available space
+                    useFixedWidthPins()
+                } else if (autoAdjustWidth && lastPinEndCoordinate > containerEndCoordinate) {
+                    if (autoAdjustWidth) {
+                        // Pin is too wide, we need to reduce it
+                        useWeightedWidthPins()
+                    }
+                } else if (mPinHeight == 0 && abs(lastPin.width - appliedPinHeight) > 0.1f) {
+                    // allow some difference, in case something moves on layout and reduce risk of infinite layout loop, and because its floats and equal is bad
+                    // Check if something changed they layout or sizing
+                    appliedPinHeight = lastPin.width
+                    params.height = appliedPinHeight
+                    updateEditTexts()
+                    requestLayout()
+                } else {
+                    mWidthUpdateListener(this, lastPin.width)
+                }
+            }
+        }
+        addOnLayoutChangeListener(listener)
+    }
+
+    private fun useWeightedWidthPins() {
+        params.weight = 1f
+        updateEditTexts() // apply the new params
+        requestLayout()
+    }
+
+    private fun useFixedWidthPins() {
+        params.weight = 0f
+        updateEditTexts() // apply the new params
+        requestLayout()
     }
 
     /**
@@ -142,13 +191,17 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
      */
     private fun createEditTexts() {
         removeAllViews()
-        editTextList!!.clear()
-        var editText: EditText
+        pinTextViewList.clear()
+        var editText: TextView
 
         for (i in 0 until mPinLength) {
-            editText = EditText(context)
+            editText = TextView(context)
+            editText.text = "" // Lets ensure its never null
             editText.textSize = mTextSize.toFloat()
-            editTextList.add(i, editText)
+            editText.isFocusableInTouchMode = true // EditText behaviour
+            editText.setTextColor(Color.BLACK) // color like EditText instead of greish
+            mTypeFace.let { editText.typeface = it }
+            pinTextViewList.add(i, editText)
             this.addView(editText)
             generateOneEditText(editText, "" + i)
         }
@@ -173,7 +226,9 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         mPinHeight = array.getDimension(R.styleable.Pinview_pinHeight, mPinHeight.toFloat()).toInt()
         mPinWidth = array.getDimension(R.styleable.Pinview_pinWidth, mPinWidth.toFloat()).toInt()
         mSplitWidth = array.getDimension(R.styleable.Pinview_splitWidth, mSplitWidth.toFloat()).toInt()
-        mTextSize = array.getDimension(R.styleable.Pinview_textSize, mTextSize.toFloat()).toInt()
+        // We expect mTextSize to be sp, but we allow specifying via xml in any dimension resource as standard. Hence the scaling here
+        val scaledDensity = resources.displayMetrics.scaledDensity
+        mTextSize = (array.getDimensionPixelSize(R.styleable.Pinview_textSize, (mTextSize * scaledDensity).toInt()) / scaledDensity).toInt()
         mCursorVisible = array.getBoolean(R.styleable.Pinview_cursorVisible, mCursorVisible)
         mPassword = array.getBoolean(R.styleable.Pinview_password, mPassword)
         mForceKeyboard = array.getBoolean(R.styleable.Pinview_forceKeyboard, mForceKeyboard)
@@ -191,8 +246,8 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
      * @param tag
      */
     @SuppressLint("ClickableViewAccessibility")
-    private fun generateOneEditText(styleEditText: EditText, tag: String) {
-        params!!.setMargins(mSplitWidth / 2, mSplitWidth / 2, mSplitWidth / 2, mSplitWidth / 2)
+    private fun generateOneEditText(styleEditText: TextView, tag: String) {
+        params.setMargins(mSplitWidth / 2, mSplitWidth / 2, mSplitWidth / 2, mSplitWidth / 2)
 
         filters[0] = InputFilter.LengthFilter(1)
 
@@ -241,7 +296,7 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
     var value: String
         get() {
             val sb = StringBuilder()
-            for (et in editTextList!!) {
+            for (et in pinTextViewList) {
                 sb.append(et.text.toString())
             }
             return sb.toString()
@@ -250,26 +305,19 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
             val regex = Regex("[0-9]*") // Allow empty string to clear the fields
             fromSetValue = true
 
-            if (inputType == InputType.NUMBER && !value.matches(regex) || editTextList.isNullOrEmpty()) {
+            if (inputType == InputType.NUMBER && !value.matches(regex) || pinTextViewList.isNullOrEmpty()) {
                 return
             }
 
-            var lastTagHavingValue = -1
-            for (i in editTextList.indices) {
-                if (value.length > i) {
-                    lastTagHavingValue = i
-                    editTextList[i].setText(value[i].toString())
-                } else {
-                    editTextList[i].setText("")
-                }
+            for (i in pinTextViewList.indices) {
+                pinTextViewList[i].text = if (value.length > i) value[i].toString() else ""
             }
             if (mPinLength > 0) {
-                currentFocus = editTextList[mPinLength - 1]
-                if (lastTagHavingValue == mPinLength - 1) {
-                    currentFocus = editTextList[mPinLength - 1]
-                    if (inputType == InputType.NUMBER || mPassword) {
-                        this.finalNumberPin = true
-                    }
+                currentFocus = pinTextViewList[mPinLength - 1]
+                if (value.length < mPinLength) {
+                    currentFocus = pinTextViewList[value.length]
+                } else {
+                    currentFocus = pinTextViewList[mPinLength - 1]
                     this.mListener?.onDataEntered(this, false)
                 }
                 currentFocus?.requestFocus()
@@ -279,25 +327,37 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         }
 
     /**
-     * Requsets focus on current pin view and opens keyboard if forceKeyboard is enabled.
+     * Requests focus on current pin view and opens keyboard if forceKeyboard is enabled.
+     * If open keyboard is disabled in XML, use openKeyboard() after calling this method, to explicitly open keyboard.
      *
-     * @return the current focused pin view. It can be used to open softkeyboard manually.
+     * @return the current focused pin view. It can be used to open soft-keyboard manually.
      */
-    fun requestPinEntryFocus(): View? {
+    fun requestPinEntryFocus(): View {
         val currentTag = max(0, indexOfCurrentFocus)
-        val currentEditText = editTextList?.get(currentTag)
-        currentEditText?.requestFocus()
-        openKeyboard()
+        val currentEditText = pinTextViewList[currentTag]
+        currentEditText.requestFocus()
+        openKeyboardIfForced() // See javadoc for this method.
         return currentEditText
     }
 
-    private fun openKeyboard() {
+    private fun openKeyboardIfForced() {
         if (mForceKeyboard) {
-            val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
-            inputMethodManager?.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY)
+            openKeyboard()
         }
     }
 
+    /**
+     * Request the keyboard to open on the currently focused view
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    fun openKeyboard() {
+        val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        val currentTag = max(0, indexOfCurrentFocus)
+        val currentEditText = pinTextViewList[currentTag]
+        // See https://developer.android.com/reference/android/view/inputmethod/InputMethodManager#SHOW_FORCED
+        inputMethodManager.showSoftInput(currentEditText, InputMethodManager.SHOW_FORCED)
+    }
+
     /**
      * Clears the values in the Pinview
      */
@@ -312,7 +372,7 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
                 mDelPressed = false
                 return
             }
-            for (editText in editTextList!!) {
+            for (editText in pinTextViewList) {
                 if (editText.length() == 0) {
                     if (editText !== view) {
                         editText.requestFocus()
@@ -322,8 +382,8 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
                     return
                 }
             }
-            if (editTextList[editTextList.size - 1] !== view) {
-                editTextList[editTextList.size - 1].requestFocus()
+            if (pinTextViewList[pinTextViewList.size - 1] !== view) {
+                pinTextViewList[pinTextViewList.size - 1].requestFocus()
             } else {
                 currentFocus = view
             }
@@ -339,13 +399,13 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
      */
     private fun setTransformation() {
         if (mPassword) {
-            for (editText in editTextList!!) {
+            for (editText in pinTextViewList) {
                 editText.removeTextChangedListener(this)
                 editText.transformationMethod = PinTransformationMethod()
                 editText.addTextChangedListener(this)
             }
         } else {
-            for (editText in editTextList!!) {
+            for (editText in pinTextViewList) {
                 editText.removeTextChangedListener(this)
                 editText.transformationMethod = null
                 editText.addTextChangedListener(this)
@@ -365,38 +425,27 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
      * @param count
      */
     override fun onTextChanged(charSequence: CharSequence, start: Int, i1: Int, count: Int) {
-
         if (charSequence.length == 1 && currentFocus != null) {
             val currentTag = indexOfCurrentFocus
             if (currentTag < mPinLength - 1) {
                 var delay: Long = 1
                 if (mPassword) delay = 25
                 postDelayed({
-                    val nextEditText = editTextList?.get(currentTag + 1)
-                    nextEditText?.isEnabled = true
-                    nextEditText?.requestFocus()
+                    val nextEditText = pinTextViewList[currentTag + 1]
+                    nextEditText.isEnabled = true
+                    nextEditText.requestFocus()
                 }, delay)
             }
-
-            if (currentTag == mPinLength - 1 && inputType == InputType.NUMBER || currentTag == mPinLength - 1 && mPassword) {
-                finalNumberPin = true
-            }
         } else if (charSequence.isEmpty()) {
-            if(indexOfCurrentFocus < 0){
+            if (indexOfCurrentFocus < 0) {
                 return
             }
-            val currentTag = indexOfCurrentFocus
             this.mDelPressed = true
-
-            //For the last cell of the non password text fields. Clear the text without changing the focus.
-            if (!this.editTextList?.get(currentTag)?.text.isNullOrEmpty()) {
-                this.editTextList?.get(currentTag)?.setText("")
-            }
         }
 
-        this.editTextList?.forEach { item ->
+        this.pinTextViewList.forEach { item ->
             if (item.text.isNotEmpty()) {
-                val index = this.editTextList.indexOf(item) + 1
+                val index = this.pinTextViewList.indexOf(item) + 1
                 if (!this.fromSetValue && index == mPinLength) {
                     this.mListener?.onDataEntered(this, true)
                 }
@@ -412,8 +461,8 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
     private fun updateEnabledState() {
         val currentTag = max(0, indexOfCurrentFocus)
 
-        for (index in editTextList!!.indices) {
-            val editText = editTextList[index]
+        for (index in pinTextViewList.indices) {
+            val editText = pinTextViewList[index]
             editText.isEnabled = index <= currentTag
         }
     }
@@ -432,27 +481,22 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         if (keyEvent.action == KeyEvent.ACTION_UP && i == KeyEvent.KEYCODE_DEL) {
             // Perform action on Del press
             val currentTag = indexOfCurrentFocus
-            val currentEditText = editTextList?.get(currentTag)?.text
-            //Last tile of the number pad. Clear the edit text without changing the focus.
-            if (inputType == InputType.NUMBER && currentTag == mPinLength - 1 && finalNumberPin ||
-                    mPassword && currentTag == mPinLength - 1 && finalNumberPin) {
-                if (!currentEditText.isNullOrEmpty()) {
-                    this.editTextList?.get(currentTag)?.setText("")
-                }
-                finalNumberPin = false
+            val currentPin = pinTextViewList[currentTag]
+            // Last tile of the number pad. Clear the edit text without changing the focus.
+            if (currentTag == mPinLength - 1 && currentPin.text.isNotEmpty()) {
+                pinTextViewList[currentTag].text = ""
             } else if (currentTag > 0) {
                 mDelPressed = true
-                if (currentEditText.isNullOrEmpty()) {
-                    //Takes it back one tile
-                    this.editTextList?.get(currentTag - 1)?.requestFocus()
+                if (currentPin.text.isEmpty()) {
+                    // Takes it back one tile
+                    pinTextViewList[currentTag - 1].requestFocus()
+                    pinTextViewList[currentTag - 1].text = ""
+                } else {
+                    currentPin.text = ""
                 }
-                this.editTextList?.get(currentTag)?.setText("")
             } else {
-                //For the first cell
-
-                if (!currentEditText.isNullOrEmpty()) {
-                    editTextList?.get(currentTag)?.setText("")
-                }
+                // For the first cell
+                currentPin.text = ""
             }
             return true
         }
@@ -463,15 +507,15 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
      * Getters and Setters
      */
     private val indexOfCurrentFocus: Int
-        get() = editTextList!!.indexOf(currentFocus)
+        get() = pinTextViewList.indexOf(currentFocus)
 
     var splitWidth: Int
         get() = mSplitWidth
         set(splitWidth) {
             mSplitWidth = splitWidth
             val margin = splitWidth / 2
-            params?.setMargins(margin, margin, margin, margin)
-            this.editTextList?.forEach {
+            params.setMargins(margin, margin, margin, margin)
+            this.pinTextViewList.forEach {
                 it.layoutParams = params
             }
         }
@@ -480,8 +524,8 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         get() = mPinHeight
         set(pinHeight) {
             mPinHeight = pinHeight
-            params?.height = pinHeight
-            this.editTextList?.forEach {
+            params.height = pinHeight
+            this.pinTextViewList.forEach {
                 it.layoutParams = params
             }
         }
@@ -490,12 +534,34 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         get() = mPinWidth
         set(pinWidth) {
             mPinWidth = pinWidth
-            params?.width = pinWidth
-            this.editTextList?.forEach {
+            params.width = pinWidth
+            this.pinTextViewList.forEach {
                 it.layoutParams = params
             }
         }
 
+    var textSize: Int
+        get() = mTextSize
+        set(value) {
+            // Don't requestLayout if no change
+            if (value != mTextSize) {
+                mTextSize = value
+                updateEditTexts()
+            }
+        }
+
+    /**
+     * Ensure the pins fit within the Pinview parent.
+     */
+    var autoAdjustWidth: Boolean = true
+        set(value) {
+            field = value
+            if (!value) {
+                useFixedWidthPins()
+            }
+            requestLayout()
+        }
+
     var pinLength: Int
         get() = mPinLength
         set(pinLength) {
@@ -514,14 +580,14 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         get() = mHint
         set(mHint) {
             this.mHint = mHint
-            this.editTextList?.forEach {
+            this.pinTextViewList.forEach {
                 it.hint = mHint
             }
         }
 
     fun setPinBackgroundRes(@DrawableRes res: Int) {
         pinBackground = res
-        this.editTextList?.forEach {
+        this.pinTextViewList.forEach {
             it.setBackgroundResource(res)
         }
     }
@@ -537,7 +603,7 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
     fun setInputType(inputType: InputType) {
         this.inputType = inputType
         val keyInputType = keyboardInputType
-        editTextList?.forEach {
+        pinTextViewList.forEach {
             it.inputType = keyInputType
         }
     }
@@ -546,30 +612,77 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
         mListener = listener
     }
 
+    fun setPinViewEventListener(listener: (Pinview, Boolean) -> Unit) {
+        mListener = object : PinViewEventListener {
+            override fun onDataEntered(pinview: Pinview, fromUser: Boolean) {
+                listener(pinview, fromUser)
+            }
+        }
+    }
+
+    fun clearPinViewEventListener() {
+        mListener = null
+    }
+
+    fun setPinViewWidthUpdateListener(listener: (Pinview, Int) -> Unit) {
+        mWidthUpdateListener = listener
+    }
+
     fun showCursor(status: Boolean) {
         mCursorVisible = status
-        this.editTextList?.forEach { it.isCursorVisible = status }
+        this.pinTextViewList.forEach { it.isCursorVisible = status }
+    }
+
+    fun setTypeface(typeFace: Typeface?) {
+        mTypeFace = typeFace
+        updateEditTexts()
     }
 
-    fun setTextSize(textSize: Int) {
-        mTextSize = textSize
-        this.editTextList?.forEach { it.textSize = mTextSize.toFloat() }
+    private fun updateEditTexts() {
+        for (pin in pinTextViewList) {
+            pin.textSize = mTextSize.toFloat()
+            pin.layoutParams = params
+            pin.requestLayout()
+            mTypeFace?.let { pin.typeface = it }
+        }
+    }
+
+    /**
+     * Permit custom changes directly applied to the TextView pin-views.
+     *
+     * If the applied font has a slight offset, it can be adjusted by applying a padding like
+     * <pre>
+     * val fontScaledDensity = app.resources.displayMetrics.scaledDensity
+     * textView.setPadding(0, (20 * fontScaledDensity).toInt(), 0, 0)
+     * </pre>
+     * @return
+     */
+    fun getTextViews(): List<TextView> {
+        return Collections.unmodifiableList(pinTextViewList)
     }
 
     fun setCursorColor(@ColorInt color: Int) {
-        this.editTextList?.forEach {
+        this.pinTextViewList.forEach {
             setCursorColor(it, color)
         }
     }
 
     fun setTextColor(@ColorInt color: Int) {
-        this.editTextList?.forEach {
+        this.pinTextViewList.forEach {
             it.setTextColor(color)
         }
     }
 
+    fun setTextPadding(left: Int, top: Int, right: Int, bottom: Int) {
+        pinTextViewList.forEach {
+            it.setPadding(left, top, right, bottom)
+        }
+    }
+
+    @SuppressLint("SoonBlockedPrivateApi")
+    @Deprecated("Will fail when targeting API-31 and above")
     fun setCursorShape(@DrawableRes shape: Int) {
-        editTextList?.forEach {
+        pinTextViewList.forEach {
             try {
                 val field = TextView::class.java.getDeclaredField("mCursorDrawableRes")
                 field.isAccessible = true
@@ -577,10 +690,11 @@ class Pinview @JvmOverloads constructor(context: Context, attrs: AttributeSet? =
             } catch (ignored: Exception) {
             }
         }
-
     }
 
-    private fun setCursorColor(view: EditText, @ColorInt color: Int) {
+    @SuppressLint("SoonBlockedPrivateApi")
+    @Deprecated("Will fail when targeting API-31 and above")
+    private fun setCursorColor(view: TextView, @ColorInt color: Int) {
         try {
             // Get the cursor resource id
             var field = TextView::class.java.getDeclaredField("mCursorDrawableRes")