diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 7e1385d..990efe1 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 7675afe..c67d820 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/AutoFitTextViewLibrary/AndroidManifest.xml b/AutoFitTextViewLibrary/AndroidManifest.xml
index 5cf5251..82e47a7 100644
--- a/AutoFitTextViewLibrary/AndroidManifest.xml
+++ b/AutoFitTextViewLibrary/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.lb.autofittextviewtest" >
+<manifest package="com.lb.autofittextviewtest">
 
-  <application />
+  <application/>
 
 </manifest>
diff --git a/AutoFitTextViewLibrary/build.gradle b/AutoFitTextViewLibrary/build.gradle
index 7937b5f..6294cb0 100644
--- a/AutoFitTextViewLibrary/build.gradle
+++ b/AutoFitTextViewLibrary/build.gradle
@@ -37,7 +37,7 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    compile "androidx.core:core-ktx:+"
+    compile "androidx.core:core-ktx:1.0.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
diff --git a/AutoFitTextViewLibrary/project.properties b/AutoFitTextViewLibrary/project.properties
index 93c8c3c..e195e98 100644
--- a/AutoFitTextViewLibrary/project.properties
+++ b/AutoFitTextViewLibrary/project.properties
@@ -9,7 +9,6 @@
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
 # Project target.
 target=android-21
 android.library=true
diff --git a/AutoFitTextViewLibrary/src/com/lb/auto_fit_textview/AutoResizeTextView.kt b/AutoFitTextViewLibrary/src/com/lb/auto_fit_textview/AutoResizeTextView.kt
index e25a84b..5e2801a 100644
--- a/AutoFitTextViewLibrary/src/com/lb/auto_fit_textview/AutoResizeTextView.kt
+++ b/AutoFitTextViewLibrary/src/com/lb/auto_fit_textview/AutoResizeTextView.kt
@@ -21,16 +21,16 @@ import androidx.appcompat.widget.AppCompatTextView
  * More info here: https://code.google.com/p/android/issues/detail?id=22493 and here in case you wish to fix it: http://stackoverflow.com/a/21851239/878126
  */
 class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = android.R.attr.textViewStyle) : AppCompatTextView(context, attrs, defStyle) {
-    private val _availableSpaceRect = RectF()
-    private val _sizeTester: SizeTester
-    private var _maxTextSize: Float = 0.toFloat()
-    private var _spacingMult = 1.0f
-    private var _spacingAdd = 0.0f
-    private var _minTextSize: Float = 0.toFloat()
-    private var _widthLimit: Int = 0
-    private var _maxLines: Int = 0
-    private var _initialized = false
-    private var _paint: TextPaint? = null
+    private val availableSpaceRect = RectF()
+    private val sizeTester: SizeTester
+    private var maxTextSize: Float = 0.toFloat()
+    private var spacingMult = 1.0f
+    private var spacingAdd = 0.0f
+    private var minTextSize: Float = 0.toFloat()
+    private var widthLimit: Int = 0
+    private var maxLines: Int = 0
+    private var initialized = false
+    private var textPaint: TextPaint? = null
 
     private interface SizeTester {
         /**
@@ -45,19 +45,19 @@ class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: Attr
 
     init {
         // using the minimal recommended font size
-        _minTextSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 12f, resources.displayMetrics)
-        _maxTextSize = textSize
-        _paint = TextPaint(paint)
-        if (_maxLines == 0)
+        minTextSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 12f, resources.displayMetrics)
+        maxTextSize = textSize
+        textPaint = TextPaint(paint)
+        if (maxLines == 0)
         // no value was assigned during construction
-            _maxLines = NO_LINE_LIMIT
+            maxLines = NO_LINE_LIMIT
         // prepare size tester:
-        _sizeTester = object : SizeTester {
+        sizeTester = object : SizeTester {
             internal val textRect = RectF()
 
             @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
             override fun onTestSize(suggestedSize: Int, availableSpace: RectF): Int {
-                _paint!!.textSize = suggestedSize.toFloat()
+                textPaint!!.textSize = suggestedSize.toFloat()
                 val transformationMethod = transformationMethod
                 val text: String
                 if (transformationMethod != null)
@@ -66,10 +66,10 @@ class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: Attr
                     text = getText().toString()
                 val singleLine = maxLines == 1
                 if (singleLine) {
-                    textRect.bottom = _paint!!.fontSpacing
-                    textRect.right = _paint!!.measureText(text)
+                    textRect.bottom = textPaint!!.fontSpacing
+                    textRect.right = textPaint!!.measureText(text)
                 } else {
-                    val layout = StaticLayout(text, _paint, _widthLimit, Alignment.ALIGN_NORMAL, _spacingMult, _spacingAdd, true)
+                    val layout = StaticLayout(text, textPaint, widthLimit, Alignment.ALIGN_NORMAL, spacingMult, spacingAdd, true)
                     // return early if we have more lines
                     if (maxLines != NO_LINE_LIMIT && layout.lineCount > maxLines)
                         return 1
@@ -93,7 +93,7 @@ class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: Attr
                 // else, too big
             }
         }
-        _initialized = true
+        initialized = true
     }
 
     fun isValidWordWrap(before: Char, after: Char): Boolean {
@@ -111,38 +111,38 @@ class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: Attr
     }
 
     override fun setTextSize(size: Float) {
-        _maxTextSize = size
+        maxTextSize = size
         adjustTextSize()
     }
 
     override fun setMaxLines(maxLines: Int) {
         super.setMaxLines(maxLines)
-        _maxLines = maxLines
+        this.maxLines = maxLines
         adjustTextSize()
     }
 
     override fun getMaxLines(): Int {
-        return _maxLines
+        return maxLines
     }
 
     override fun setSingleLine() {
         super.setSingleLine()
-        _maxLines = 1
+        maxLines = 1
         adjustTextSize()
     }
 
     override fun setSingleLine(singleLine: Boolean) {
         super.setSingleLine(singleLine)
         if (singleLine)
-            _maxLines = 1
+            maxLines = 1
         else
-            _maxLines = NO_LINE_LIMIT
+            maxLines = NO_LINE_LIMIT
         adjustTextSize()
     }
 
     override fun setLines(lines: Int) {
         super.setLines(lines)
-        _maxLines = lines
+        maxLines = lines
         adjustTextSize()
     }
 
@@ -153,14 +153,14 @@ class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: Attr
             Resources.getSystem()
         else
             c.resources
-        _maxTextSize = TypedValue.applyDimension(unit, size, r.displayMetrics)
+        maxTextSize = TypedValue.applyDimension(unit, size, r.displayMetrics)
         adjustTextSize()
     }
 
     override fun setLineSpacing(add: Float, mult: Float) {
         super.setLineSpacing(add, mult)
-        _spacingMult = mult
-        _spacingAdd = add
+        spacingMult = mult
+        spacingAdd = add
     }
 
     /**
@@ -169,7 +169,7 @@ class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: Attr
      * @param minTextSize
      */
     fun setMinTextSize(minTextSize: Float) {
-        _minTextSize = minTextSize
+        this.minTextSize = minTextSize
         adjustTextSize()
     }
 
@@ -181,23 +181,23 @@ class AutoResizeTextView @JvmOverloads constructor(context: Context, attrs: Attr
         //    @Override
         //    public void run()
         //      {
-        if (!_initialized)
+        if (!initialized)
             return
-        val startSize = _minTextSize.toInt()
+        val startSize = minTextSize.toInt()
         val heightLimit = measuredHeight - compoundPaddingBottom - compoundPaddingTop
-        _widthLimit = measuredWidth - compoundPaddingLeft - compoundPaddingRight
-        if (_widthLimit <= 0)
+        widthLimit = measuredWidth - compoundPaddingLeft - compoundPaddingRight
+        if (widthLimit <= 0)
             return
-        _paint = TextPaint(paint)
-        _availableSpaceRect.right = _widthLimit.toFloat()
-        _availableSpaceRect.bottom = heightLimit.toFloat()
+        textPaint = TextPaint(paint)
+        availableSpaceRect.right = widthLimit.toFloat()
+        availableSpaceRect.bottom = heightLimit.toFloat()
         superSetTextSize(startSize)
         //      }
         //    });
     }
 
     private fun superSetTextSize(startSize: Int) {
-        val textSize = binarySearch(startSize, _maxTextSize.toInt(), _sizeTester, _availableSpaceRect)
+        val textSize = binarySearch(startSize, maxTextSize.toInt(), sizeTester, availableSpaceRect)
         super.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize.toFloat())
     }
 
diff --git a/AutoFitTextViewSample/AndroidManifest.xml b/AutoFitTextViewSample/AndroidManifest.xml
index 54d4171..335ebc0 100644
--- a/AutoFitTextViewSample/AndroidManifest.xml
+++ b/AutoFitTextViewSample/AndroidManifest.xml
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.example.autofittextviewsample"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          android:installLocation="auto">
+<manifest package="com.example.autofittextviewsample" xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat.Light">
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+  <application
+    android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/Theme.AppCompat.Light">
+    <activity
+      android:name=".MainActivity" android:label="@string/app_name">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <activity android:name=".Main2Activity">
-        </activity>
-    </application>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+    <activity android:name=".Main2Activity"></activity>
+  </application>
 
 </manifest>
diff --git a/AutoFitTextViewSample/build.gradle b/AutoFitTextViewSample/build.gradle
index 3c10f6e..edd186c 100644
--- a/AutoFitTextViewSample/build.gradle
+++ b/AutoFitTextViewSample/build.gradle
@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.autofittextviewsample"
-        minSdkVersion 14
+        minSdkVersion 17
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
@@ -41,8 +41,9 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation project(':AutoFitTextViewLibrary')
-    compile "androidx.core:core-ktx:+"
+    compile "androidx.core:core-ktx:1.0.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
 repositories {
     mavenCentral()
diff --git a/AutoFitTextViewSample/lint.xml b/AutoFitTextViewSample/lint.xml
index ee0eead..9c0ed5a 100644
--- a/AutoFitTextViewSample/lint.xml
+++ b/AutoFitTextViewSample/lint.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<lint>
-</lint>
\ No newline at end of file
+<lint></lint>
diff --git a/AutoFitTextViewSample/project.properties b/AutoFitTextViewSample/project.properties
index f5fc260..fb9fae5 100644
--- a/AutoFitTextViewSample/project.properties
+++ b/AutoFitTextViewSample/project.properties
@@ -9,7 +9,6 @@
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
 # Project target.
 target=android-21
 android.library.reference.1=..\\AutoFitTextViewLibrary
diff --git a/AutoFitTextViewSample/res/layout/activity_main.xml b/AutoFitTextViewSample/res/layout/activity_main.xml
index 9c9fcc8..855d748 100644
--- a/AutoFitTextViewSample/res/layout/activity_main.xml
+++ b/AutoFitTextViewSample/res/layout/activity_main.xml
@@ -1,115 +1,52 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:context=".MainActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+  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">
 
-    <RelativeLayout
-        android:id="@+id/parametersContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:columnCount="2"
-        android:orientation="horizontal"
-        android:padding="4dp">
+  <EditText
+    android:id="@+id/contentEditText" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="fill_horizontal" android:ems="10"
+    android:hint="content" android:text="content text sample" app:layout_constraintTop_toTopOf="parent"/>
 
-        <EditText
-            android:id="@+id/contentEditText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:layout_alignRight="@+id/widthSeekBar"
-            android:layout_gravity="fill_horizontal"
-            android:ems="10"
-            android:hint="content"
-            android:text="content text sample"/>
+  <TextView
+    android:id="@+id/maxLineCountTitleTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp"
+    android:gravity="center_vertical" android:text="max lines count:" app:layout_constraintBottom_toBottomOf="@id/minusLineCountButton"
+    app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/contentEditText"/>
 
-        <Button
-            android:id="@+id/minusLineCountButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contentEditText"
-            android:layout_toRightOf="@+id/textView2"
-            android:text="-"/>
+  <Button
+    android:id="@+id/minusLineCountButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="-"
+    app:layout_constraintStart_toEndOf="@id/maxLineCountTitleTextView" app:layout_constraintTop_toBottomOf="@id/contentEditText"/>
 
-        <TextView
-            android:id="@+id/linesCountTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/minusLineCountButton"
-            android:layout_alignBottom="@+id/minusLineCountButton"
-            android:layout_toRightOf="@+id/minusLineCountButton"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:text="2"/>
+  <TextView
+    android:id="@+id/linesCountTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="10dp" android:paddingRight="10dp"
+    android:text="2" app:layout_constraintBottom_toBottomOf="@id/minusLineCountButton" app:layout_constraintStart_toEndOf="@id/minusLineCountButton"
+    app:layout_constraintTop_toBottomOf="@id/contentEditText"/>
 
-        <Button
-            android:id="@+id/plusLineCountButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/contentEditText"
-            android:layout_toRightOf="@+id/linesCountTextView"
-            android:text="+"/>
 
-        <TextView
-            android:id="@+id/textView1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@id/textView2"
-            android:text="width:"
-            android:textSize="20dp"/>
+  <Button
+    android:id="@+id/plusLineCountButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/contentEditText" android:text="+"
+    app:layout_constraintStart_toEndOf="@id/linesCountTextView" app:layout_constraintTop_toBottomOf="@id/contentEditText"/>
 
-        <SeekBar
-            android:id="@+id/widthSeekBar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/textView1"
-            android:layout_below="@+id/minusLineCountButton"
-            android:layout_toRightOf="@+id/textView1"
-            android:max="100"
-            android:progress="50"/>
+  <TextView
+    android:id="@+id/widthTitleTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="width:"
+    android:textSize="20dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/minusLineCountButton"/>
 
-        <TextView
-            android:id="@+id/TextView01"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_below="@+id/textView1"
-            android:text="height:"
-            android:textSize="20dp"/>
+  <SeekBar
+    android:id="@+id/widthSeekBar" android:layout_width="0px" android:layout_height="wrap_content" android:layout_marginEnd="4dp" android:progress="50"
+    app:layout_constraintBottom_toBottomOf="@id/widthTitleTextView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/widthTitleTextView"
+    app:layout_constraintTop_toBottomOf="@id/minusLineCountButton"/>
 
-        <TextView
-            android:id="@+id/textView2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/minusLineCountButton"
-            android:layout_alignParentLeft="true"
-            android:layout_alignTop="@+id/minusLineCountButton"
-            android:gravity="center_vertical"
-            android:text="max lines count:"/>
+  <TextView
+    android:id="@+id/heightTitleTextView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/widthTitleTextView"
+    android:layout_marginStart="4dp" android:text="height:" android:textSize="20dp" app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/widthTitleTextView"/>
 
-        <SeekBar
-            android:id="@+id/heightSeekBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/TextView01"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/widthSeekBar"
-            android:layout_toEndOf="@+id/TextView01"
-            android:layout_toRightOf="@+id/TextView01"
-            android:max="100"
-            android:progress="50"/>
-    </RelativeLayout>
 
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_below="@+id/parametersContainer"
-        android:background="#ffff0000">
-    </FrameLayout>
+  <SeekBar
+    android:id="@+id/heightSeekBar" android:layout_width="0px" android:layout_height="wrap_content" android:layout_marginEnd="4dp" android:max="100" android:progress="50"
+    app:layout_constraintBottom_toBottomOf="@id/heightTitleTextView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/heightTitleTextView"
+    app:layout_constraintTop_toBottomOf="@id/widthTitleTextView"/>
 
-</RelativeLayout>
+  <FrameLayout
+    android:id="@+id/textViewContainer" android:layout_width="match_parent" android:layout_height="0px" android:background="#ffff0000"
+    app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/heightTitleTextView"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/AutoFitTextViewSample/res/layout/activity_main2.xml b/AutoFitTextViewSample/res/layout/activity_main2.xml
index 9c45707..6794a85 100644
--- a/AutoFitTextViewSample/res/layout/activity_main2.xml
+++ b/AutoFitTextViewSample/res/layout/activity_main2.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    android:id="@+id/activity_main2"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.example.autofittextviewsample.Main2Activity">
+<androidx.recyclerview.widget.RecyclerView
+  android:id="@+id/recyclerView" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"
+  android:layout_margin="@dimen/activity_horizontal_margin"/>
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:layout_width="match_parent" android:id="@android:id/list"
-        android:layout_height="match_parent"></androidx.recyclerview.widget.RecyclerView>
-
-</RelativeLayout>
diff --git a/AutoFitTextViewSample/res/layout/item.xml b/AutoFitTextViewSample/res/layout/item.xml
index e2a98e4..9464b5c 100644
--- a/AutoFitTextViewSample/res/layout/item.xml
+++ b/AutoFitTextViewSample/res/layout/item.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="50dp">
+  xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="50dp">
 
-    <com.lb.auto_fit_textview.AutoResizeTextView
-        android:id="@android:id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:text="hi"
-        android:textSize="1000dp"/>
+  <com.lb.auto_fit_textview.AutoResizeTextView
+    android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_vertical" android:text="hi"
+    android:textSize="1000dp"/>
 </FrameLayout>
diff --git a/AutoFitTextViewSample/res/menu/main.xml b/AutoFitTextViewSample/res/menu/main.xml
index 09774be..b1bbbaa 100644
--- a/AutoFitTextViewSample/res/menu/main.xml
+++ b/AutoFitTextViewSample/res/menu/main.xml
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:icon="@android:drawable/ic_menu_info_details"
-        android:title="@string/more_info"
-        app:showAsAction="always">
-        <menu>
-            <group
-                android:checkableBehavior="none"
-                android:menuCategory="container">
-                <item
-                    android:id="@+id/menuItem_show_recyclerViewSample"
-                    android:title="show RecyclerView sample"/>
-                <item
-                    android:id="@+id/menuItem_current_repository_website"
-                    android:title="@string/repository_website"></item>
-                <item
-                    android:id="@+id/menuItem_all_my_repositories"
-                    android:title="@string/all_my_repositories"></item>
-                <item
-                    android:id="@+id/menuItem_all_my_apps"
-                    android:title="@string/all_my_apps"></item>
-            </group>
-        </menu>
-    </item>
+  <item
+    android:icon="@android:drawable/ic_menu_info_details" android:title="@string/more_info" app:showAsAction="always">
+    <menu>
+      <group
+        android:checkableBehavior="none" android:menuCategory="container">
+        <item
+          android:id="@+id/menuItem_show_recyclerViewSample" android:title="show RecyclerView sample"/>
+        <item
+          android:id="@+id/menuItem_current_repository_website" android:title="@string/repository_website"></item>
+        <item
+          android:id="@+id/menuItem_all_my_repositories" android:title="@string/all_my_repositories"></item>
+        <item
+          android:id="@+id/menuItem_all_my_apps" android:title="@string/all_my_apps"></item>
+      </group>
+    </menu>
+  </item>
 
 </menu>
diff --git a/AutoFitTextViewSample/res/values-w820dp/dimens.xml b/AutoFitTextViewSample/res/values-w820dp/dimens.xml
index 63fc816..1e656d6 100644
--- a/AutoFitTextViewSample/res/values-w820dp/dimens.xml
+++ b/AutoFitTextViewSample/res/values-w820dp/dimens.xml
@@ -1,6 +1,6 @@
 <resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
+  <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+       (such as screen margins) for screens with more than 820dp of available width. This
+       would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+  <dimen name="activity_horizontal_margin">64dp</dimen>
 </resources>
diff --git a/AutoFitTextViewSample/res/values/dimens.xml b/AutoFitTextViewSample/res/values/dimens.xml
index 47c8224..acf94cc 100644
--- a/AutoFitTextViewSample/res/values/dimens.xml
+++ b/AutoFitTextViewSample/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+  <!-- Default screen margins, per the Android Design guidelines. -->
+  <dimen name="activity_horizontal_margin">16dp</dimen>
+  <dimen name="activity_vertical_margin">16dp</dimen>
 </resources>
diff --git a/AutoFitTextViewSample/res/values/strings.xml b/AutoFitTextViewSample/res/values/strings.xml
index 0f29a7e..4da72d2 100644
--- a/AutoFitTextViewSample/res/values/strings.xml
+++ b/AutoFitTextViewSample/res/values/strings.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">AutoFitTextViewSample</string>
-    <string name="action_settings">Settings</string>
-    <string name="repository_website">Repository website</string>
-    <string name="all_my_repositories">All my repositories</string>
-    <string name="all_my_apps">All my apps</string>
-    <string name="more_info">More info</string>
-    <string name="randomize">Randomize</string>
+  <string name="app_name">AutoFitTextViewSample</string>
+  <string name="action_settings">Settings</string>
+  <string name="repository_website">Repository website</string>
+  <string name="all_my_repositories">All my repositories</string>
+  <string name="all_my_apps">All my apps</string>
+  <string name="more_info">More info</string>
+  <string name="randomize">Randomize</string>
 
 </resources>
diff --git a/AutoFitTextViewSample/src/com/example/autofittextviewsample/Main2Activity.kt b/AutoFitTextViewSample/src/com/example/autofittextviewsample/Main2Activity.kt
index 7cecc61..4503944 100644
--- a/AutoFitTextViewSample/src/com/example/autofittextviewsample/Main2Activity.kt
+++ b/AutoFitTextViewSample/src/com/example/autofittextviewsample/Main2Activity.kt
@@ -9,13 +9,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.Adapter
+import kotlinx.android.synthetic.main.activity_main2.*
 
 class Main2Activity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main2)
-        val recyclerView = findViewById<View>(android.R.id.list) as RecyclerView
         recyclerView.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         recyclerView.adapter = object : Adapter<ViewHolder>() {
             override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
diff --git a/AutoFitTextViewSample/src/com/example/autofittextviewsample/MainActivity.kt b/AutoFitTextViewSample/src/com/example/autofittextviewsample/MainActivity.kt
index 40169c7..24b9184 100644
--- a/AutoFitTextViewSample/src/com/example/autofittextviewsample/MainActivity.kt
+++ b/AutoFitTextViewSample/src/com/example/autofittextviewsample/MainActivity.kt
@@ -7,32 +7,26 @@ import android.text.Editable
 import android.text.TextUtils.TruncateAt
 import android.text.TextWatcher
 import android.util.TypedValue
-import android.view.*
+import android.view.Gravity
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup.LayoutParams
 import android.view.ViewTreeObserver.OnPreDrawListener
-import android.widget.EditText
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.lb.auto_fit_textview.AutoResizeTextView
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
     // private final Random _random =new Random();
     // private static final String ALLOWED_CHARACTERS ="qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890";
-    private var _contentEditText: EditText? = null
-    private var _textViewcontainer: ViewGroup? = null
-    private var _widthSeekBar: SeekBar? = null
-    private var _heightSeekBar: SeekBar? = null
-    private var _linesCountTextView: TextView? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        _textViewcontainer = findViewById<View>(R.id.container) as ViewGroup
-        _contentEditText = findViewById<View>(R.id.contentEditText) as EditText
-        _contentEditText!!.addTextChangedListener(object : TextWatcher {
+        contentEditText!!.addTextChangedListener(object : TextWatcher {
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
@@ -41,8 +35,6 @@ class MainActivity : AppCompatActivity() {
                 recreateTextView()
             }
         })
-        _widthSeekBar = findViewById<View>(R.id.widthSeekBar) as SeekBar
-        _heightSeekBar = findViewById<View>(R.id.heightSeekBar) as SeekBar
         val seekBarChangeListener = object : OnSeekBarChangeListener {
             override fun onStopTrackingTouch(seekBar: SeekBar) {}
 
@@ -52,44 +44,43 @@ class MainActivity : AppCompatActivity() {
                 recreateTextView()
             }
         }
-        _heightSeekBar!!.setOnSeekBarChangeListener(seekBarChangeListener)
-        _widthSeekBar!!.setOnSeekBarChangeListener(seekBarChangeListener)
-        _linesCountTextView = findViewById<View>(R.id.linesCountTextView) as TextView
+        heightSeekBar!!.setOnSeekBarChangeListener(seekBarChangeListener)
+        widthSeekBar!!.setOnSeekBarChangeListener(seekBarChangeListener)
         findViewById<View>(R.id.plusLineCountButton).setOnClickListener {
-            var maxLinesCount = Integer.parseInt(_linesCountTextView!!.text.toString())
-            _linesCountTextView!!.text = Integer.toString(++maxLinesCount)
+            var maxLinesCount = Integer.parseInt(linesCountTextView!!.text.toString())
+            linesCountTextView!!.text = Integer.toString(++maxLinesCount)
             recreateTextView()
         }
         findViewById<View>(R.id.minusLineCountButton).setOnClickListener(OnClickListener {
-            var maxLinesCount = Integer.parseInt(_linesCountTextView!!.text.toString())
+            var maxLinesCount = Integer.parseInt(linesCountTextView!!.text.toString())
             if (maxLinesCount == 1)
                 return@OnClickListener
-            _linesCountTextView!!.text = Integer.toString(--maxLinesCount)
+            linesCountTextView!!.text = Integer.toString(--maxLinesCount)
             recreateTextView()
         })
-        runJustBeforeBeingDrawn(_textViewcontainer!!, Runnable { recreateTextView() })
+        runJustBeforeBeingDrawn(textViewContainer!!, Runnable { recreateTextView() })
 
 
     }
 
     protected fun recreateTextView() {
-        _textViewcontainer!!.removeAllViews()
-        val maxWidth = _textViewcontainer!!.width
-        val maxHeight = _textViewcontainer!!.height
+        textViewContainer!!.removeAllViews()
+        val maxWidth = textViewContainer!!.width
+        val maxHeight = textViewContainer!!.height
         val textView = AutoResizeTextView(this@MainActivity)
         textView.gravity = Gravity.CENTER
-        val width = _widthSeekBar!!.progress * maxWidth / _widthSeekBar!!.max
-        val height = _heightSeekBar!!.progress * maxHeight / _heightSeekBar!!.max
-        val maxLinesCount = Integer.parseInt(_linesCountTextView!!.text.toString())
+        val width = widthSeekBar!!.progress * maxWidth / widthSeekBar!!.max
+        val height = heightSeekBar!!.progress * maxHeight / heightSeekBar!!.max
+        val maxLinesCount = Integer.parseInt(linesCountTextView!!.text.toString())
         textView.maxLines = maxLinesCount
         textView.textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, maxHeight.toFloat(), resources.displayMetrics)
         textView.ellipsize = TruncateAt.END
         // since we use it only once per each click, we don't need to cache the results, ever
         textView.layoutParams = LayoutParams(width, height)
         textView.setBackgroundColor(-0xff0100)
-        val text = _contentEditText!!.text.toString()
+        val text = contentEditText!!.text.toString()
         textView.text = text
-        _textViewcontainer!!.addView(textView)
+        textViewContainer!!.addView(textView)
     }
 
     // private String getRandomText()
diff --git a/build.gradle b/build.gradle
index c073375..1dd0ad7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.20'
     repositories {
         jcenter()
         google()