From c412d61202bae1a09b404616eb396a208d75cbde Mon Sep 17 00:00:00 2001
From: yaroslav-android <yaroslav.ovdiienko@uptech.team>
Date: Wed, 23 Oct 2019 01:33:41 +0300
Subject: [PATCH 01/28] - deprecate old view and related classes - add new
 ScopePikerView

---
 .../rangepickerview/rangepicker/BaseView.kt   | 19 +++++++++++++++++++
 .../rangepicker/RangePickerView.kt            |  2 +-
 .../rangepicker/ScopePickerView.kt            | 11 +++++++++++
 .../rangepicker/model/Option.kt               |  2 +-
 .../rangepicker/model/RectShape.kt            |  2 +-
 .../rangepicker/model/enums/Direction.kt      |  2 +-
 .../rangepicker/model/enums/OptionsState.kt   |  2 +-
 .../rangepicker/model/enums/TouchMode.kt      |  2 +-
 .../util/view/AttributeSetParser.kt           |  2 +-
 .../util/view/IndexContainer.kt               |  2 +-
 10 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/BaseView.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt

diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/BaseView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/BaseView.kt
new file mode 100644
index 0000000..41c1c79
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/BaseView.kt
@@ -0,0 +1,19 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.os.Build
+import android.util.AttributeSet
+import android.view.View
+
+
+open class BaseView : View {
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int)
+            : super(context, attrs, defStyleAttr, defStyleRes)
+
+
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
index 27b3d42..053a430 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
@@ -32,7 +32,7 @@ import yaroslav.ovdiienko.idivision.rangepickerview.util.view.IndexContainer
 import kotlin.math.abs
 import kotlin.math.max
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 class RangePickerView : View {
     private val rectangleBackgroundPaint: Paint = Paint()
     private val lineBackgroundPaint: Paint = Paint()
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt
new file mode 100644
index 0000000..2cf1268
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt
@@ -0,0 +1,11 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker
+
+import android.content.Context
+import android.util.AttributeSet
+
+
+class ScopePickerView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : BaseView(context, attrs, defStyleAttr) {
+
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/Option.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/Option.kt
index 009785a..cc351dd 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/Option.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/Option.kt
@@ -1,6 +1,6 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 data class Option(private val option: String) {
     fun getOption(): String {
         return option
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/RectShape.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/RectShape.kt
index ceb96ed..b4f4a79 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/RectShape.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/RectShape.kt
@@ -3,7 +3,7 @@ package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model
 import android.graphics.Rect
 import android.graphics.RectF
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 class RectShape {
     var coordinateRect: RectF = RectF()
     var textBoundsRect: Rect = Rect()
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/Direction.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/Direction.kt
index f3918cc..6e3cc54 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/Direction.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/Direction.kt
@@ -1,6 +1,6 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 enum class Direction {
     TO_RIGHT,
     TO_LEFT,
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/OptionsState.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/OptionsState.kt
index f1cef45..f933e90 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/OptionsState.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/OptionsState.kt
@@ -1,6 +1,6 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 enum class OptionsState(val tapId: Int) {
     SINGLE(0),
     MULTIPLE(1),
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/TouchMode.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/TouchMode.kt
index 2ae89ae..ccc3415 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/TouchMode.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/TouchMode.kt
@@ -1,6 +1,6 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 enum class TouchMode {
     TOUCH_MODE_IDLE,
     TOUCH_MODE_DOWN,
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt
index d2a7995..42f5ba3 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt
@@ -11,7 +11,7 @@ import yaroslav.ovdiienko.idivision.rangepickerview.R
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.RangePickerView
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.RangePickerView.Companion.DEFAULT_TEXT_SIZE
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 class AttributeSetParser(private val context: Context, attributeSet: AttributeSet?) {
     private val displayMetrics = context.resources.displayMetrics
 
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt
index 2d6f174..19de3c9 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt
@@ -2,7 +2,7 @@ package yaroslav.ovdiienko.idivision.rangepickerview.util.view
 
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.OptionsState
 
-
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 class IndexContainer {
     var firstPreviousIndex: Int = -1
     var secondPreviousIndex: Int = -1

From 311305db5b65b61834a2851f51d671394c9fc7b9 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <yaroslav@Yaroslavs-MacBook-Pro.local>
Date: Fri, 1 Nov 2019 04:00:07 +0200
Subject: [PATCH 02/28] - prepare classes for the view redesign

---
 .../idivision/rangepicker/MainActivity.kt     |  15 ++-
 app/src/main/res/layout/activity_main.xml     |  24 +++--
 build.gradle                                  |   2 +-
 .../rangepicker/RangePickerView.kt            |  24 +++--
 .../rangepicker/ScopePickerView.kt            |  11 --
 .../{rangepicker => scopepicker}/BaseView.kt  |   4 +-
 .../scopepicker/PickerAgreement.kt            |  31 ++++++
 .../scopepicker/ScopePickerView.kt            | 101 ++++++++++++++++++
 .../model/AnimationRect.kt}                   |  14 +--
 .../scopepicker/model/State.kt                |  12 +++
 .../scopepicker/model/enums/AnimateRect.kt    |   6 ++
 .../scopepicker/model/enums/Mode.kt           |  11 ++
 .../model/exceptions/MaxSizeException.kt      |   7 ++
 .../exceptions/MaxWordLengthException.kt      |   7 ++
 .../scopepicker/strategy/DuoPickStrategy.kt   |   5 +
 .../strategy/SinglePickStrategy.kt            |   5 +
 .../scopepicker/strategy/Strategy.kt          |   5 +
 .../rangepickerview/util/Dimension.kt         |  14 +++
 .../rangepickerview/util/DisplayUtils.kt      |  43 +++-----
 .../rangepickerview/util/TouchAssistant.kt    |   6 ++
 .../util/extension/PaintExtensions.kt         |  35 ++++++
 .../util/view/ViewAttributes.kt               |  16 +++
 22 files changed, 323 insertions(+), 75 deletions(-)
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{rangepicker => scopepicker}/BaseView.kt (90%)
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{rangepicker/model/AnimatableRectF.kt => scopepicker/model/AnimationRect.kt} (73%)
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt

diff --git a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
index 9ff342a..cfb044e 100644
--- a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
+++ b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
@@ -12,14 +12,19 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+//        oldView()
+        newView()
+    }
+
+    private fun oldView() {
         picker.apply {
             setOptions(getOptions())
             setDefaultSelectedPositions(0 to 4)
             setOnRangeSelectedListener { view, leftPoint, rightPoint ->
                 Toast.makeText(
-                    this@MainActivity,
-                    view.getSelectedIndexes().toString(),
-                    Toast.LENGTH_SHORT
+                        this@MainActivity,
+                        view.getSelectedIndexes().toString(),
+                        Toast.LENGTH_SHORT
                 ).show()
             }
         }
@@ -30,6 +35,10 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun newView() {
+
+    }
+
     private fun getOptions(): List<Option> {
         return listOf(
             Option("Single"),
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 69b2664..ec319a7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,6 +8,16 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
+    <Button
+        android:id="@+id/btn_get_values"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="16dp"
+        android:text="get"
+        android:visibility="gone" />
+
     <yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.RangePickerView
         android:id="@+id/picker"
         android:layout_width="match_parent"
@@ -15,16 +25,14 @@
         android:layout_marginLeft="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginRight="8dp"
+        android:visibility="gone"
         app:backgroundSelectedTint="@color/colorPrimary"
         app:cornerRadius="5dp" />
 
-    <Button
-        android:id="@+id/btn_get_values"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:layout_marginTop="16dp"
-        android:layout_marginRight="16dp"
-        android:text="get" />
+    <yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp" />
 </LinearLayout>
 
diff --git a/build.gradle b/build.gradle
index c5f1d76..3749a6f 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.31'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
index 053a430..3fe040a 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
@@ -18,19 +18,21 @@ import android.view.View
 import android.view.ViewConfiguration
 import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
-import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.AnimatableRectF
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.Option
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.RectShape
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.AnimatedRectProperties
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.Direction
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.OptionsState
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.TouchMode
+import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
 import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.addAnimationEndListener
 import yaroslav.ovdiienko.idivision.rangepickerview.util.view.AttributeSetParser
 import yaroslav.ovdiienko.idivision.rangepickerview.util.view.IndexContainer
 import kotlin.math.abs
 import kotlin.math.max
+import kotlin.math.min
 
 @Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 class RangePickerView : View {
@@ -38,9 +40,9 @@ class RangePickerView : View {
     private val lineBackgroundPaint: Paint = Paint()
     private val textPaint: Paint = Paint()
     private val firstSelectedRect =
-        AnimatableRectF()
+        AnimationRect()
     private val secondSelectedRect =
-        AnimatableRectF()
+        AnimationRect()
     private val viewBounds = Rect()
 
     private var backgroundSelectedTint: Int = 0
@@ -50,7 +52,7 @@ class RangePickerView : View {
     private var stripThickness: Float = 0f
 
     private val options: MutableList<Pair<Option, RectShape>> = mutableListOf()
-    private val displayUtils: DisplayUtils =
+    private val displayUtils: Dimension =
         DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
     private var touchSlop: Int = 0
 
@@ -164,7 +166,7 @@ class RangePickerView : View {
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        minimumHeight = displayUtils.convertDpToPx(DEFAULT_MIN_HEIGHT)
+        minimumHeight = displayUtils.toDp(DEFAULT_MIN_HEIGHT.toFloat()).toInt()
         val desiredWidth =
             suggestedMinimumWidth + paddingLeft + paddingRight
         val desiredHeight =
@@ -181,15 +183,15 @@ class RangePickerView : View {
 
     private fun measureDimension(desiredSize: Int, measureSpec: Int): Int {
         var result: Int
-        val specMode = View.MeasureSpec.getMode(measureSpec)
-        val specSize = View.MeasureSpec.getSize(measureSpec)
+        val specMode = MeasureSpec.getMode(measureSpec)
+        val specSize = MeasureSpec.getSize(measureSpec)
 
-        if (specMode == View.MeasureSpec.EXACTLY) {
+        if (specMode == MeasureSpec.EXACTLY) {
             result = specSize
         } else {
             result = desiredSize
-            if (specMode == View.MeasureSpec.AT_MOST) {
-                result = Math.min(result, specSize)
+            if (specMode == MeasureSpec.AT_MOST) {
+                result = min(result, specSize)
             }
         }
 
@@ -671,7 +673,7 @@ class RangePickerView : View {
 
     private fun getObjectAnimation(
         property: AnimatedRectProperties,
-        oldRect: AnimatableRectF,
+        oldRect: AnimationRect,
         rect: RectF,
         duration: Long,
         listener: ValueAnimator.AnimatorUpdateListener? = null
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt
deleted file mode 100644
index 2cf1268..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/ScopePickerView.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker
-
-import android.content.Context
-import android.util.AttributeSet
-
-
-class ScopePickerView @JvmOverloads constructor(
-    context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : BaseView(context, attrs, defStyleAttr) {
-
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/BaseView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
similarity index 90%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/BaseView.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
index 41c1c79..9697119 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/BaseView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
 
 import android.annotation.TargetApi
 import android.content.Context
@@ -14,6 +14,4 @@ open class BaseView : View {
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int)
             : super(context, attrs, defStyleAttr, defStyleRes)
-
-
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
new file mode 100644
index 0000000..23d8150
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
@@ -0,0 +1,31 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
+
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums.Mode
+
+// TODO: provide documentation
+interface PickerAgreement {
+    fun setOptions(options: List<String>)
+    fun changeMode(mode: Mode)
+
+    // Planned:
+    // fun getSelectedItems(): Pair<Int, Int>
+    // fun setSelectedItems(items: Pair<Int, Int>)
+    // fun addOnScopeSelectedListener(...)
+    // fun removeOnScopeSelectedListener(...)
+    // fun addOnScopeChangeListener(...)
+    // fun removeOnScopeChangeListener(...)
+    // fun resetToDefaultState(withAnimation: Boolean = true)
+
+    // Nice to have:
+    // fun setStripColor(color: Int)
+    // fun setSelectedBoxColor(color: Int)
+    // fun setSelectedTextColor(color: Int)
+    // fun setUnselectedTextColor(color: Int)
+    // [?] fun setVibrationPattern(...)
+    // [?] fun enableVibration(...)
+    // [?] fun disableVibration(...)
+    // fun setCornerRadius(radius: Int)
+    // fun setFont(font: Int)
+    // fun setTextSize(size: Int)
+    // fun setStripThickness(thickness: Int)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
new file mode 100644
index 0000000..ed54433
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
@@ -0,0 +1,101 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.WindowManager
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.State
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums.Mode
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxSizeException
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxWordLengthException
+import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
+import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
+import yaroslav.ovdiienko.idivision.rangepickerview.util.TouchAssistant
+import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
+
+
+class ScopePickerView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : BaseView(context, attrs, defStyleAttr), PickerAgreement {
+
+    private val dimension: Dimension =
+            DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
+    private val viewBounds = Rect()
+    private val viewAttributes = ViewAttributes()
+    private val touchAssistant = TouchAssistant()
+
+    private val paint: Paint = Paint()
+    private val leftBox = AnimationRect()
+    private val rightBox = AnimationRect()
+
+    private var mode: Mode = Mode.Duo
+    private val data: LinkedHashMap<Int, State> = LinkedHashMap()
+
+    private var isFirstDraw = true
+
+    init {
+        val parser = ViewAttributes.Parser(attrs)
+        viewAttributes.applyValues(parser)
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        drawOnce {
+
+        }
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        return super.onTouchEvent(event)
+    }
+
+    override fun performClick(): Boolean {
+        return super.performClick()
+    }
+
+    override fun setOptions(options: List<String>) {
+        if (MAX_ELEMENTS_ALLOWED < options.size) {
+            throw MaxSizeException(
+                    "Maximum available size is $MAX_ELEMENTS_ALLOWED elements, " +
+                            "current size is ${options.size} elements")
+        }
+
+        options.forEach { word ->
+            if (MAX_LETTERS_IN_WORD_ALLOWED < word.length) {
+                throw MaxWordLengthException(
+                        "Maximum word length is $MAX_LETTERS_IN_WORD_ALLOWED characters, " +
+                                "current word \"$word\" length is ${word.length} characters")
+            }
+        }
+    }
+
+    override fun changeMode(mode: Mode) {
+        this.mode = mode
+    }
+
+    private fun reset() {
+        isFirstDraw = true
+    }
+
+    private fun drawOnce(drawBlock: () -> Unit) {
+        if (isFirstDraw) {
+            drawBlock.invoke()
+            isFirstDraw = false
+        }
+    }
+
+    companion object {
+        const val MAX_ELEMENTS_ALLOWED = 5
+        const val MAX_LETTERS_IN_WORD_ALLOWED = 15
+    }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/AnimatableRectF.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
similarity index 73%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/AnimatableRectF.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
index 3d0b3fe..2611a0c 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/AnimatableRectF.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
@@ -1,21 +1,13 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
 
 import android.graphics.Rect
 import android.graphics.RectF
 
 
-class AnimatableRectF : RectF {
+class AnimationRect : RectF {
     constructor() : super()
-
-    constructor(left: Float, top: Float, right: Float, bottom: Float) : super(
-        left,
-        top,
-        right,
-        bottom
-    )
-
+    constructor(left: Float, top: Float, right: Float, bottom: Float) : super(left, top, right, bottom)
     constructor(r: RectF) : super(r)
-
     constructor(r: Rect) : super(r)
 
     fun setTop(top: Float) {
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
new file mode 100644
index 0000000..c815cff
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
@@ -0,0 +1,12 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+
+import android.graphics.Rect
+import android.graphics.RectF
+
+
+data class State(
+        var coordinates: RectF = RectF(),
+        var text: String = "",
+        var textBounds: Rect = Rect(),
+        var isSelected: Boolean = false
+)
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
new file mode 100644
index 0000000..8b1c389
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
@@ -0,0 +1,6 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums
+
+sealed class AnimateRect(val property: String) {
+    object Left : AnimateRect("left")
+    object Right : AnimateRect("right")
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt
new file mode 100644
index 0000000..c3511a8
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt
@@ -0,0 +1,11 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums
+
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.DuoPickStrategy
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.SinglePickStrategy
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.Strategy
+
+
+sealed class Mode(strategy: Strategy) {
+    object Single : Mode(SinglePickStrategy())
+    object Duo : Mode(DuoPickStrategy())
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt
new file mode 100644
index 0000000..90839ad
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt
@@ -0,0 +1,7 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
+
+
+class MaxSizeException : RuntimeException {
+    constructor(message: String) : super(message)
+    constructor(error: Throwable) : super(error)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt
new file mode 100644
index 0000000..e463975
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt
@@ -0,0 +1,7 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
+
+
+class MaxWordLengthException : RuntimeException {
+    constructor(message: String) : super(message)
+    constructor(error: Throwable) : super(error)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
new file mode 100644
index 0000000..e9be474
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
@@ -0,0 +1,5 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
+
+
+class DuoPickStrategy : Strategy {
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
new file mode 100644
index 0000000..32d2501
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
@@ -0,0 +1,5 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
+
+
+class SinglePickStrategy : Strategy {
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
new file mode 100644
index 0000000..de3ee67
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
@@ -0,0 +1,5 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
+
+
+interface Strategy {
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
new file mode 100644
index 0000000..9a6f811
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
@@ -0,0 +1,14 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util
+
+
+interface Dimension {
+    fun toDp(dp: Float): Float
+    fun dpToPx(px: Float): Float
+    fun toSp(sp: Float): Float
+    fun spToPx(px: Float): Float
+
+    fun getMinWidthValue(): Int
+    fun getMaxWidthValue(): Int
+    fun getScreenHeight(): Int
+    fun getScreenWidth(): Int
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
index a782768..17374d0 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
@@ -2,64 +2,53 @@ package yaroslav.ovdiienko.idivision.rangepickerview.util
 
 import android.util.DisplayMetrics
 import android.view.WindowManager
+import kotlin.math.max
+import kotlin.math.min
 
 
-class DisplayUtils(private val windowManager: WindowManager) {
+class DisplayUtils(private val windowManager: WindowManager) : Dimension {
     private val displayMetrics: DisplayMetrics = DisplayMetrics()
 
     init {
         windowManager.defaultDisplay.getMetrics(displayMetrics)
     }
 
-    fun convertDpToPx(dp: Int): Int {
-        val scale = displayMetrics.density
-        return (dp * scale + 0.5f).toInt()
-    }
+    override fun toDp(dp: Float) = multiply(displayMetrics.density, dp)
 
-    fun convertDpToPxFloat(dp: Float): Int {
-        val scale = displayMetrics.density
-        return (dp * scale + 0.5f).toInt()
-    }
+    override fun dpToPx(px: Float) = divide(displayMetrics.density, px)
 
-    fun convertPxToDp(px: Int): Int {
-        val scale = displayMetrics.density
-        return (px / scale + 0.5f).toInt()
-    }
+    override fun toSp(sp: Float) = multiply(displayMetrics.scaledDensity, sp)
 
-    fun convertSpToPx(sp: Int): Int {
-        val scale = displayMetrics.scaledDensity
-        return (sp * scale + 0.5f).toInt()
-    }
+    override fun spToPx(px: Float) = divide(displayMetrics.scaledDensity, px)
 
-    fun convertPxToSp(px: Int): Int {
-        val scale = displayMetrics.scaledDensity
-        return (px / scale + 0.5f).toInt()
-    }
+    private fun divide(metrics: Float, value: Float) = (value / metrics + 0.5f)
+
+    private fun multiply(metrics: Float, value: Float) = (value * metrics + 0.5f)
 
-    fun getMinWidthValue(): Int {
+    override fun getMinWidthValue(): Int {
         val display = windowManager.defaultDisplay
         val metrics = DisplayMetrics()
         display.getMetrics(metrics)
         val heightPixels = metrics.heightPixels
         val widthPixels = metrics.widthPixels
-        return Math.min(heightPixels, widthPixels)
+        return min(heightPixels, widthPixels)
     }
 
-    fun getMaxWidthValue(): Int {
+    override fun getMaxWidthValue(): Int {
         val display = windowManager.defaultDisplay
         val metrics = DisplayMetrics()
         display.getMetrics(metrics)
-        return Math.max(metrics.heightPixels, metrics.widthPixels)
+        return max(metrics.heightPixels, metrics.widthPixels)
     }
 
-    fun getHeightActivity(): Int {
+    override fun getScreenHeight(): Int {
         val display = windowManager.defaultDisplay
         val metrics = DisplayMetrics()
         display.getMetrics(metrics)
         return metrics.heightPixels
     }
 
-    fun getWidthActivity(): Int {
+    override fun getScreenWidth(): Int {
         val display = windowManager.defaultDisplay
         val metrics = DisplayMetrics()
         display.getMetrics(metrics)
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
new file mode 100644
index 0000000..78a0b7d
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
@@ -0,0 +1,6 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util
+
+
+class TouchAssistant {
+    // TODO: add touch handling
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
new file mode 100644
index 0000000..1725f2d
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
@@ -0,0 +1,35 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
+
+import android.graphics.Color
+import android.graphics.Paint
+
+
+fun Paint.applySelectedTextSettings() {
+    this.apply {
+        isAntiAlias = true
+        style = Paint.Style.FILL
+        color = Color.parseColor("#ff000000")
+    }
+}
+
+fun Paint.applyTextSettings() {
+    this.apply {
+        isAntiAlias = true
+        style = Paint.Style.FILL
+        color = Color.parseColor("#ff000000")
+    }
+}
+
+fun Paint.applySelectedBoxSettings() {
+    this.apply {
+        isAntiAlias = true
+        style = Paint.Style.FILL
+    }
+}
+
+fun Paint.applyStripSettings() {
+    this.apply {
+        isAntiAlias = true
+        style = Paint.Style.FILL
+    }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
new file mode 100644
index 0000000..ffd3604
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
@@ -0,0 +1,16 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.view
+
+import android.util.AttributeSet
+
+
+class ViewAttributes {
+    // TODO: add values for view
+
+    fun applyValues(newValues: Parser) {
+
+    }
+
+    class Parser(val attrs: AttributeSet?) {
+        // TODO: setup view attributes parse methods
+    }
+}
\ No newline at end of file

From 26e9e601bf9b71bb01b47500a5e7fc6f8266bb09 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Thu, 28 Nov 2019 17:37:29 +0200
Subject: [PATCH 03/28] - add attributes for new view - add extensions for
 Android, View, Paint, Rect - add view attributes parser - add calculations
 helper for size change on move - basic setup for Scope View

---
 .idea/codeStyles/Project.xml                  | 125 ++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml          |   5 +
 .idea/misc.xml                                |   4 +
 .idea/runConfigurations.xml                   |  12 ++
 .idea/vcs.xml                                 |   6 +
 .../idivision/rangepicker/MainActivity.kt     |  15 +-
 .../scopepicker/ScopePickerView.kt            |  44 +++---
 .../scopepicker/model/CalculationsHelper.kt   |  29 ++++
 .../util/extension/AndroidExtensions.kt       |  42 ++++++
 .../util/extension/PaintExtensions.kt         |   5 +-
 .../util/extension/RectExtensions.kt          |  16 ++
 .../util/extension/ViewExtensions.kt          |  16 ++
 .../util/view/ViewAttributes.kt               | 141 +++++++++++++++++-
 rangepickerview/src/main/res/values/attrs.xml |  11 ++
 .../src/main/res/values/colors.xml            |   1 -
 15 files changed, 440 insertions(+), 32 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/runConfigurations.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..45b5654
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,125 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <AndroidXmlCodeStyleSettings>
+      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
+    </AndroidXmlCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..f5c6d9e
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..7f68460
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
index cfb044e..7beb3d5 100644
--- a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
+++ b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
@@ -1,6 +1,7 @@
 package yaroslav.ovdiienko.idivision.rangepicker
 
 import android.os.Bundle
+import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_main.*
@@ -12,23 +13,25 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-//        oldView()
-        newView()
+        oldView()
+//        newView()
     }
 
     private fun oldView() {
         picker.apply {
+            visibility = View.VISIBLE
             setOptions(getOptions())
             setDefaultSelectedPositions(0 to 4)
             setOnRangeSelectedListener { view, leftPoint, rightPoint ->
                 Toast.makeText(
-                        this@MainActivity,
-                        view.getSelectedIndexes().toString(),
-                        Toast.LENGTH_SHORT
+                    this@MainActivity,
+                    view.getSelectedIndexes().toString(),
+                    Toast.LENGTH_SHORT
                 ).show()
             }
         }
 
+        btn_get_values.visibility = View.VISIBLE
         btn_get_values.setOnClickListener {
             Toast.makeText(this, "${picker.getSelectedItems()}", Toast.LENGTH_SHORT).show()
             picker.resetToDefaultState()
@@ -48,4 +51,4 @@ class MainActivity : AppCompatActivity() {
             Option("5+")
         )
     }
-}
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
index ed54433..31003d5 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
@@ -15,17 +15,19 @@ import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
 import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
 import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
 import yaroslav.ovdiienko.idivision.rangepickerview.util.TouchAssistant
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.drawOnce
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
 import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
 
 
 class ScopePickerView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
 ) : BaseView(context, attrs, defStyleAttr), PickerAgreement {
 
     private val dimension: Dimension =
-            DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
+        DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
     private val viewBounds = Rect()
     private val viewAttributes = ViewAttributes()
     private val touchAssistant = TouchAssistant()
@@ -37,10 +39,10 @@ class ScopePickerView @JvmOverloads constructor(
     private var mode: Mode = Mode.Duo
     private val data: LinkedHashMap<Int, State> = LinkedHashMap()
 
-    private var isFirstDraw = true
+    internal var isFirstDraw = true
 
     init {
-        val parser = ViewAttributes.Parser(attrs)
+        val parser = ViewAttributes.Parser(context, attrs)
         viewAttributes.applyValues(parser)
     }
 
@@ -51,12 +53,21 @@ class ScopePickerView @JvmOverloads constructor(
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         drawOnce {
-
+            // skip for now.
         }
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        return super.onTouchEvent(event)
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+            }
+            MotionEvent.ACTION_MOVE -> {
+                requestDisallowInterceptTouchEvent()
+                invalidate()
+            }
+            else -> return super.onTouchEvent(event)
+        }
+        return true
     }
 
     override fun performClick(): Boolean {
@@ -66,15 +77,17 @@ class ScopePickerView @JvmOverloads constructor(
     override fun setOptions(options: List<String>) {
         if (MAX_ELEMENTS_ALLOWED < options.size) {
             throw MaxSizeException(
-                    "Maximum available size is $MAX_ELEMENTS_ALLOWED elements, " +
-                            "current size is ${options.size} elements")
+                "Maximum available size is $MAX_ELEMENTS_ALLOWED elements, " +
+                        "current size is ${options.size} elements"
+            )
         }
 
         options.forEach { word ->
             if (MAX_LETTERS_IN_WORD_ALLOWED < word.length) {
                 throw MaxWordLengthException(
-                        "Maximum word length is $MAX_LETTERS_IN_WORD_ALLOWED characters, " +
-                                "current word \"$word\" length is ${word.length} characters")
+                    "Maximum word length is $MAX_LETTERS_IN_WORD_ALLOWED characters, " +
+                            "current word \"$word\" length is ${word.length} characters"
+                )
             }
         }
     }
@@ -87,13 +100,6 @@ class ScopePickerView @JvmOverloads constructor(
         isFirstDraw = true
     }
 
-    private fun drawOnce(drawBlock: () -> Unit) {
-        if (isFirstDraw) {
-            drawBlock.invoke()
-            isFirstDraw = false
-        }
-    }
-
     companion object {
         const val MAX_ELEMENTS_ALLOWED = 5
         const val MAX_LETTERS_IN_WORD_ALLOWED = 15
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
new file mode 100644
index 0000000..803991b
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
@@ -0,0 +1,29 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+
+
+import kotlin.math.abs
+
+
+class CalculationsHelper {
+    var desiredCenterOfRect: Float = 0f
+    var startingCenterOfRect: Float = 0f
+
+    var widthOfDesiredRect: Float = 0f
+    var widthOfStartingRect: Float = 0f
+
+    var deltaWidth: Float = 0f
+    var deltaCenter: Float = 0f
+
+    fun calculateOnDirectionChange(): CalculationsHelper {
+        return this.apply {
+            deltaWidth = widthOfDesiredRect - widthOfStartingRect
+            deltaCenter = abs(desiredCenterOfRect - startingCenterOfRect)
+        }
+    }
+
+    fun calculateWidthChanges(lastCenterAfterMove: Float): Float {
+        return with(deltaCenter - lastCenterAfterMove) {
+            if (this != 0f) (this * deltaWidth) / deltaCenter else deltaCenter
+        }
+    }
+}
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
new file mode 100644
index 0000000..0f671da
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
@@ -0,0 +1,42 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
+
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.Typeface
+import android.os.Build
+import android.util.TypedValue
+import androidx.core.content.res.ResourcesCompat
+
+
+fun buildVersionGE(version: Int): Boolean = Build.VERSION.SDK_INT >= version
+
+val Float.dp: Float
+    get() = TypedValue.applyDimension(
+        TypedValue.COMPLEX_UNIT_DIP,
+        this,
+        Resources.getSystem().displayMetrics
+    )
+
+val Float.sp: Float
+    get() = TypedValue.applyDimension(
+        TypedValue.COMPLEX_UNIT_SP,
+        this,
+        Resources.getSystem().displayMetrics
+    )
+
+fun Context.getFont(fontResId: Int): Typeface? {
+    return try {
+        if (buildVersionGE(Build.VERSION_CODES.O)) {
+            resources.getFont(fontResId)
+        } else {
+            ResourcesCompat.getFont(this, fontResId)
+        }
+    } catch (e: Exception) {
+        val font = Typeface.createFromAsset(assets, "display_regular.otf")
+        when (e) {
+            is Resources.NotFoundException,
+            is NullPointerException -> font
+            else -> font
+        }
+    }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
index 1725f2d..ab9f4b9 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
@@ -20,16 +20,17 @@ fun Paint.applyTextSettings() {
     }
 }
 
-fun Paint.applySelectedBoxSettings() {
+fun Paint.applyStripSettings() {
     this.apply {
         isAntiAlias = true
         style = Paint.Style.FILL
     }
 }
 
-fun Paint.applyStripSettings() {
+fun Paint.applySelectedBoxSettings() {
     this.apply {
         isAntiAlias = true
         style = Paint.Style.FILL
+        color = Color.BLUE
     }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
new file mode 100644
index 0000000..23c978d
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
@@ -0,0 +1,16 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
+
+import android.graphics.RectF
+
+
+internal fun RectF.update(
+    left: Float = this.left,
+    top: Float = this.top,
+    right: Float = this.right,
+    bottom: Float = this.bottom
+) {
+    this.left = left
+    this.top = top
+    this.right = right
+    this.bottom = bottom
+}
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
new file mode 100644
index 0000000..a6d8133
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
@@ -0,0 +1,16 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
+
+
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
+
+
+internal fun ScopePickerView.drawOnce(drawBlock: () -> Unit) {
+    if (isFirstDraw) {
+        drawBlock.invoke()
+        isFirstDraw = false
+    }
+}
+
+internal fun ScopePickerView.requestDisallowInterceptTouchEvent() {
+    parent.requestDisallowInterceptTouchEvent(true)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
index ffd3604..1cd17ab 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
@@ -1,16 +1,149 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.util.view
 
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.Typeface
 import android.util.AttributeSet
+import androidx.core.content.ContextCompat
+import yaroslav.ovdiienko.idivision.rangepickerview.R
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.dp
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.getFont
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.sp
 
 
 class ViewAttributes {
-    // TODO: add values for view
+    var pointerBackgroundColor: Int = 0
+        private set
 
-    fun applyValues(newValues: Parser) {
+    var stripBackgroundColor: Int = 0
+        private set
+
+    var textColorOnPoint: Int = 0
+        private set
+
+    var textColorOnSurface: Int = 0
+        private set
+
+    var pointerCornerRadius: Float = 0f
+        private set
+
+    var stripThickness: Float = 0f
+        private set
+
+    var textSize: Float = 0f
+        private set
+
+    var fontFamily: Typeface? = null
+        private set
 
+    fun applyValues(newValues: Parser) {
+        newValues.parse(this)
     }
 
-    class Parser(val attrs: AttributeSet?) {
-        // TODO: setup view attributes parse methods
+    class Parser(private val context: Context, private val attrs: AttributeSet?) {
+        private val typedAttributes: TypedArray? =
+            context.obtainStyledAttributes(attrs, R.styleable.ScopePickerView)
+
+        private val defaultPointerBackgroundColor: Int by lazy {
+            ContextCompat.getColor(context, R.color.colorBlueSelectedPicker)
+        }
+        private val defaultTextColorOnSurface: Int by lazy {
+            ContextCompat.getColor(context, R.color.colorTextBlack)
+        }
+        private val defaultTextColorOnPoint: Int by lazy {
+            ContextCompat.getColor(context, R.color.colorTextWhite)
+        }
+
+        private val defaultStripBackgroundColor: Int by lazy {
+            ContextCompat.getColor(context, R.color.colorGreyBgPiker)
+        }
+
+        private val defaultStripThickness: Float by lazy { DEFAULT_STROKE_WIDTH.dp }
+
+        private val defaultPointerCornerRadius: Float by lazy { DEFAULT_CORNER_RADIUS.dp }
+
+        private val defaultTextSize: Float by lazy { DEFAULT_TEXT_SIZE.sp }
+
+        private val defaultTextFont: Int by lazy { R.font.display_regular }
+
+        internal fun parse(viewAttributes: ViewAttributes) {
+            viewAttributes.apply {
+                pointerBackgroundColor = getPointerBackgroundColor()
+                stripBackgroundColor = getStripBackgroundColor()
+                textColorOnPoint = getTextColorOnPoint()
+                textColorOnSurface = getTextColorOnSurface()
+                pointerCornerRadius = getPointerCornerRadius()
+                stripThickness = getStripThickness()
+                textSize = getTextSize()
+                fontFamily = getFontRes()
+            }
+
+            typedAttributes?.recycle()
+        }
+
+        private fun getPointerBackgroundColor(): Int {
+            return parseColorRes(
+                R.styleable.ScopePickerView_pointerBackgroundColor,
+                defaultPointerBackgroundColor
+            )
+        }
+
+        private fun getStripBackgroundColor(): Int {
+            return parseColorRes(
+                R.styleable.ScopePickerView_stripBackgroundColor,
+                defaultStripBackgroundColor
+            )
+        }
+
+        private fun getTextColorOnPoint(): Int {
+            return parseColorRes(
+                R.styleable.ScopePickerView_textColorOnPoint,
+                defaultTextColorOnPoint
+            )
+        }
+
+        private fun getTextColorOnSurface(): Int {
+            return parseColorRes(
+                R.styleable.ScopePickerView_textColorOnSurface,
+                defaultTextColorOnSurface
+            )
+        }
+
+        private fun getPointerCornerRadius() =
+            parseDimensionRes(
+                R.styleable.ScopePickerView_pointerCornerRadius,
+                defaultPointerCornerRadius
+            )
+
+        private fun getStripThickness() =
+            parseDimensionRes(R.styleable.ScopePickerView_stripThickness, defaultStripThickness)
+
+        private fun getTextSize() =
+            parseDimensionRes(R.styleable.RangePickerView_android_textSize, defaultTextSize)
+
+        private fun getFontRes(): Typeface? {
+            typedAttributes?.let {
+                val fontResId = it.getResourceId(
+                    R.styleable.RangePickerView_android_fontFamily,
+                    defaultTextFont
+                )
+                return context.getFont(fontResId)
+            }
+
+            return context.getFont(defaultTextFont)
+        }
+
+        private fun parseColorRes(styleableResId: Int, defaultDimension: Int) =
+            typedAttributes?.getColor(styleableResId, defaultDimension) ?: defaultDimension
+
+        private fun parseDimensionRes(styleableResId: Int, defaultDimension: Float) =
+            typedAttributes?.getDimension(styleableResId, defaultDimension) ?: defaultDimension
+
+        companion object {
+            const val DEFAULT_MIN_HEIGHT = 58f
+            const val DEFAULT_CORNER_RADIUS = 74f
+            const val DEFAULT_STROKE_WIDTH = 32f
+            const val DEFAULT_TEXT_SIZE = 14f
+        }
     }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/res/values/attrs.xml b/rangepickerview/src/main/res/values/attrs.xml
index 124f430..5606c15 100644
--- a/rangepickerview/src/main/res/values/attrs.xml
+++ b/rangepickerview/src/main/res/values/attrs.xml
@@ -11,4 +11,15 @@
         <attr name="android:textSize" />
         <attr name="android:fontFamily" />
     </declare-styleable>
+
+    <declare-styleable name="ScopePickerView">
+        <attr name="pointerBackgroundColor" format="color" />
+        <attr name="stripBackgroundColor" format="color" />
+        <attr name="textColorOnPoint" format="color" />
+        <attr name="textColorOnSurface" format="color" />
+        <attr name="pointerCornerRadius" format="dimension" />
+        <attr name="stripThickness" format="dimension" />
+        <attr name="android:textSize" />
+        <attr name="android:fontFamily" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/rangepickerview/src/main/res/values/colors.xml b/rangepickerview/src/main/res/values/colors.xml
index 70d936c..f98e2f0 100644
--- a/rangepickerview/src/main/res/values/colors.xml
+++ b/rangepickerview/src/main/res/values/colors.xml
@@ -8,5 +8,4 @@
 
     <color name="colorGreyBgPiker">#eaeeee</color>
     <color name="colorBlueSelectedPicker">#00caf2</color>
-    <color name="colorBlueBgPickerTransparent">#2800CAF2</color>
 </resources>

From 5d45848dbeded272241abc63d8513c4a2c4554ba Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Thu, 28 Nov 2019 17:46:09 +0200
Subject: [PATCH 04/28] - fix issues with styles

---
 rangepickerview/src/main/res/values/attrs.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/rangepickerview/src/main/res/values/attrs.xml b/rangepickerview/src/main/res/values/attrs.xml
index 5606c15..7680401 100644
--- a/rangepickerview/src/main/res/values/attrs.xml
+++ b/rangepickerview/src/main/res/values/attrs.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="textColorOnSurface" format="color" />
+    <attr name="stripThickness" format="dimension" />
+
     <declare-styleable name="RangePickerView">
         <attr name="backgroundSelectedTint" format="color" />
         <attr name="backgroundStripTint" format="color" />
         <attr name="textColorOnSelected" format="color" />
-        <attr name="textColorOnSurface" format="color" />
+        <attr name="textColorOnSurface" />
         <attr name="cornerRadius" format="dimension" />
-        <attr name="stripThickness" format="dimension" />
+        <attr name="stripThickness" />
         <attr name="extraPadding" format="dimension" />
         <attr name="android:textSize" />
         <attr name="android:fontFamily" />
@@ -16,9 +19,9 @@
         <attr name="pointerBackgroundColor" format="color" />
         <attr name="stripBackgroundColor" format="color" />
         <attr name="textColorOnPoint" format="color" />
-        <attr name="textColorOnSurface" format="color" />
+        <attr name="textColorOnSurface" />
         <attr name="pointerCornerRadius" format="dimension" />
-        <attr name="stripThickness" format="dimension" />
+        <attr name="stripThickness" />
         <attr name="android:textSize" />
         <attr name="android:fontFamily" />
     </declare-styleable>

From a1774fd05ede109508c69adb5fe067d50ac68362 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Thu, 28 Nov 2019 18:48:47 +0200
Subject: [PATCH 05/28] - setup basics for mode switch

---
 .../scopepicker/ScopePickerView.kt            | 21 +++++++++++++++++--
 .../util/view/ViewAttributes.kt               | 10 +++++++++
 rangepickerview/src/main/res/values/attrs.xml |  4 ++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
index 31003d5..5e30ede 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
@@ -36,7 +36,6 @@ class ScopePickerView @JvmOverloads constructor(
     private val leftBox = AnimationRect()
     private val rightBox = AnimationRect()
 
-    private var mode: Mode = Mode.Duo
     private val data: LinkedHashMap<Int, State> = LinkedHashMap()
 
     internal var isFirstDraw = true
@@ -52,9 +51,27 @@ class ScopePickerView @JvmOverloads constructor(
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
+
         drawOnce {
             // skip for now.
         }
+
+        when (viewAttributes.mode) {
+            Mode.Single -> {
+                drawSingleChoiceView()
+            }
+            Mode.Duo -> {
+                drawDualChoiceView()
+            }
+        }
+    }
+
+    private fun drawSingleChoiceView() {
+        // TODO: only one point to draw and set/get options
+    }
+
+    private fun drawDualChoiceView() {
+        // TODO: the same behaviour as in Range Picker View
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
@@ -93,7 +110,7 @@ class ScopePickerView @JvmOverloads constructor(
     }
 
     override fun changeMode(mode: Mode) {
-        this.mode = mode
+        viewAttributes.mode = mode
     }
 
     private fun reset() {
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
index 1cd17ab..19eef2d 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
@@ -6,6 +6,7 @@ import android.graphics.Typeface
 import android.util.AttributeSet
 import androidx.core.content.ContextCompat
 import yaroslav.ovdiienko.idivision.rangepickerview.R
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums.Mode
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.dp
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.getFont
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.sp
@@ -36,6 +37,8 @@ class ViewAttributes {
     var fontFamily: Typeface? = null
         private set
 
+    var mode: Mode = Mode.Duo
+
     fun applyValues(newValues: Parser) {
         newValues.parse(this)
     }
@@ -76,11 +79,18 @@ class ViewAttributes {
                 stripThickness = getStripThickness()
                 textSize = getTextSize()
                 fontFamily = getFontRes()
+                mode = getModes()
             }
 
             typedAttributes?.recycle()
         }
 
+        private fun getModes(): Mode {
+            return with(typedAttributes?.getInt(R.styleable.ScopePickerView_mode, 2)) {
+                if (this == 1) Mode.Single else Mode.Duo
+            }
+        }
+
         private fun getPointerBackgroundColor(): Int {
             return parseColorRes(
                 R.styleable.ScopePickerView_pointerBackgroundColor,
diff --git a/rangepickerview/src/main/res/values/attrs.xml b/rangepickerview/src/main/res/values/attrs.xml
index 7680401..7eea09c 100644
--- a/rangepickerview/src/main/res/values/attrs.xml
+++ b/rangepickerview/src/main/res/values/attrs.xml
@@ -21,6 +21,10 @@
         <attr name="textColorOnPoint" format="color" />
         <attr name="textColorOnSurface" />
         <attr name="pointerCornerRadius" format="dimension" />
+        <attr name="mode" format="enum">
+            <enum name="single" value="1" />
+            <enum name="dual" value="2" />
+        </attr>
         <attr name="stripThickness" />
         <attr name="android:textSize" />
         <attr name="android:fontFamily" />

From 099550724c868321041b87a7186bda87542cc307 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP>
Date: Fri, 13 Dec 2019 11:18:46 +0200
Subject: [PATCH 06/28] - add debug tools

---
 .idea/codeStyles/Project.xml                  |  3 --
 .../idivision/rangepicker/MainActivity.kt     | 18 +++++------
 app/src/main/res/layout/activity_main.xml     |  1 +
 .../scopepicker/PickerAgreement.kt            |  4 +++
 .../scopepicker/ScopePickerView.kt            | 30 ++++++++++++++-----
 .../util/extension/AndroidExtensions.kt       | 19 +++++++++---
 6 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 45b5654..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
index 7beb3d5..876681b 100644
--- a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
+++ b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
@@ -13,8 +13,8 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        oldView()
-//        newView()
+//        oldView()
+        newView()
     }
 
     private fun oldView() {
@@ -39,16 +39,14 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun newView() {
-
+        spv.apply {
+            setOptions(getOptionsStrings())
+        }
     }
 
     private fun getOptions(): List<Option> {
-        return listOf(
-            Option("Single"),
-            Option("2"),
-            Option("3"),
-            Option("4"),
-            Option("5+")
-        )
+        return getOptionsStrings().map { Option(it) }
     }
+
+    private fun getOptionsStrings() = listOf("Single", "2", "3", "4", "5+")
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ec319a7..b43b641 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -30,6 +30,7 @@
         app:cornerRadius="5dp" />
 
     <yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
+        android:id="@+id/spv"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_marginLeft="16dp"
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
index 23d8150..53da708 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
@@ -4,7 +4,11 @@ import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums.Mode
 
 // TODO: provide documentation
 interface PickerAgreement {
+
+    /***/
     fun setOptions(options: List<String>)
+
+    /***/
     fun changeMode(mode: Mode)
 
     // Planned:
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
index 5e30ede..ce8e1e7 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
@@ -1,6 +1,7 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
 
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Rect
@@ -15,8 +16,7 @@ import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
 import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
 import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
 import yaroslav.ovdiienko.idivision.rangepickerview.util.TouchAssistant
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.drawOnce
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.*
 import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
 
 
@@ -26,6 +26,9 @@ class ScopePickerView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : BaseView(context, attrs, defStyleAttr), PickerAgreement {
 
+    internal var isFirstDraw = true
+    private val data: LinkedHashMap<Int, State> = LinkedHashMap()
+
     private val dimension: Dimension =
         DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
     private val viewBounds = Rect()
@@ -36,9 +39,6 @@ class ScopePickerView @JvmOverloads constructor(
     private val leftBox = AnimationRect()
     private val rightBox = AnimationRect()
 
-    private val data: LinkedHashMap<Int, State> = LinkedHashMap()
-
-    internal var isFirstDraw = true
 
     init {
         val parser = ViewAttributes.Parser(context, attrs)
@@ -52,8 +52,13 @@ class ScopePickerView @JvmOverloads constructor(
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
+        debugAction {
+
+        }
+
         drawOnce {
-            // skip for now.
+            log { "click rectangles drawn" }
+            // only for drawing clickable rectangles.
         }
 
         when (viewAttributes.mode) {
@@ -110,15 +115,24 @@ class ScopePickerView @JvmOverloads constructor(
     }
 
     override fun changeMode(mode: Mode) {
+        log { "view mode changed to $mode" }
         viewAttributes.mode = mode
     }
 
     private fun reset() {
+        log { "view reset triggered" }
         isFirstDraw = true
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration?) {
+        super.onConfigurationChanged(newConfig)
+        reset()
+    }
+
     companion object {
-        const val MAX_ELEMENTS_ALLOWED = 5
-        const val MAX_LETTERS_IN_WORD_ALLOWED = 15
+        internal const val MAX_ELEMENTS_ALLOWED = 5
+        internal const val MAX_LETTERS_IN_WORD_ALLOWED = 15
+
+        internal const val DEBUG = true
     }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
index 0f671da..6c667ac 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
@@ -4,27 +4,30 @@ import android.content.Context
 import android.content.res.Resources
 import android.graphics.Typeface
 import android.os.Build
+import android.util.Log
 import android.util.TypedValue
 import androidx.core.content.res.ResourcesCompat
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView.Companion.DEBUG
 
 
-fun buildVersionGE(version: Int): Boolean = Build.VERSION.SDK_INT >= version
+internal fun buildVersionGE(version: Int): Boolean = Build.VERSION.SDK_INT >= version
 
-val Float.dp: Float
+internal val Float.dp: Float
     get() = TypedValue.applyDimension(
         TypedValue.COMPLEX_UNIT_DIP,
         this,
         Resources.getSystem().displayMetrics
     )
 
-val Float.sp: Float
+internal val Float.sp: Float
     get() = TypedValue.applyDimension(
         TypedValue.COMPLEX_UNIT_SP,
         this,
         Resources.getSystem().displayMetrics
     )
 
-fun Context.getFont(fontResId: Int): Typeface? {
+internal fun Context.getFont(fontResId: Int): Typeface? {
     return try {
         if (buildVersionGE(Build.VERSION_CODES.O)) {
             resources.getFont(fontResId)
@@ -39,4 +42,12 @@ fun Context.getFont(fontResId: Int): Typeface? {
             else -> font
         }
     }
+}
+
+internal fun ScopePickerView.log(tag: String = "SPV/Default", msg: () -> String) {
+    if (DEBUG) Log.d(tag, msg.invoke())
+}
+
+internal fun ScopePickerView.debugAction(action: () -> Unit) {
+    if (DEBUG) action.invoke()
 }
\ No newline at end of file

From af942342f700bff35b77e0033b04d1520e966995 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <46504259+yaroslav-android@users.noreply.github.com>
Date: Fri, 13 Dec 2019 11:25:54 +0200
Subject: [PATCH 07/28] Delete misc.xml

---
 .idea/misc.xml | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 .idea/misc.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index f5c6d9e..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file

From 8c7fdd99c79de1b8a9d5ce14275a608123780320 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <46504259+yaroslav-android@users.noreply.github.com>
Date: Fri, 13 Dec 2019 11:26:03 +0200
Subject: [PATCH 08/28] Delete runConfigurations.xml

---
 .idea/runConfigurations.xml | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

From c299913263e002c8f881243e61a1ae056c5d14aa Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <46504259+yaroslav-android@users.noreply.github.com>
Date: Fri, 13 Dec 2019 11:26:11 +0200
Subject: [PATCH 09/28] Delete vcs.xml

---
 .idea/vcs.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

From bdb49732c17021e6f7add7abb78c73b7adbda172 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <46504259+yaroslav-android@users.noreply.github.com>
Date: Fri, 13 Dec 2019 11:26:19 +0200
Subject: [PATCH 10/28] Delete Project.xml

---
 .idea/codeStyles/Project.xml | 122 -----------------------------------
 1 file changed, 122 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 88ea3aa..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file

From 1b0967c2ea88bd4adb576327b8e5b9b3946b9ece Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <46504259+yaroslav-android@users.noreply.github.com>
Date: Fri, 13 Dec 2019 11:26:26 +0200
Subject: [PATCH 11/28] Delete codeStyleConfig.xml

---
 .idea/codeStyles/codeStyleConfig.xml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file

From 37a93a05047e8fc195beb905cc32a2fdc67fb0e5 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP>
Date: Fri, 13 Dec 2019 11:58:54 +0200
Subject: [PATCH 12/28] - add Hyperion

---
 app/build.gradle       | 38 ++++++++++++++++++++++++++++++++++++--
 app/proguard-rules.pro | 25 +++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 46608aa..6164637 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,9 +1,11 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 28
+
     defaultConfig {
         applicationId "yaroslav.ovdiienko.idivision.rangepicker"
 
@@ -15,12 +17,14 @@ android {
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -29,6 +33,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
     testOptions {
         unitTests.includeAndroidResources = true
     }
@@ -44,7 +49,36 @@ dependencies {
     // Android libs
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.2.0-alpha01'
+    implementation 'com.google.android.material:material:1.2.0-alpha02'
+
+    // Hyperion
+    def hyperionVersion = '0.9.27'
+    debugImplementation ("com.willowtreeapps.hyperion:hyperion-core:$hyperionVersion") {
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+        exclude module: 'design'
+    }
+    debugImplementation ("com.willowtreeapps.hyperion:hyperion-attr:$hyperionVersion") {
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+        exclude module: 'design'
+    }
+    debugImplementation ("com.willowtreeapps.hyperion:hyperion-measurement:$hyperionVersion") {
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+        exclude module: 'design'
+    }
+
+    kapt 'com.google.auto.service:auto-service:1.0-rc6'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..af1ad56 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,28 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-keep class com.google.**
+-dontwarn com.google.**	-dontwarn com.google.**
+
+-keep class **.R$* {
+    <fields>;	    <fields>;
+}
+
+-keep public class * extends java.lang.Exception
+
+-dontwarn kotlin.Unit
+
+-dontwarn javax.annotation.**
+
+-keep class com.squareup.picasso.** { *; }
+
+-keep class * implements com.willowtreeapps.hyperion.plugin.v1.Plugin {
+  *;
+}
+-keep class * implements com.willowtreeapps.hyperion.plugin.v1.PluginModule {
+  *;
+}
+-keep class * implements com.willowtreeapps.hyperion.attr.collectors.TypedAttributeCollector {
+  <init>();
+}
\ No newline at end of file

From b70ce77e55071bf847673a37e150d556f3fcc2a3 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP>
Date: Fri, 13 Dec 2019 12:01:37 +0200
Subject: [PATCH 13/28] - add gradle properties

---
 gradle.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index 85be9ea..4a5855f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,3 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file

From b1ba3c16da223a07d506d54f7a49a9352de1ea32 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Sun, 29 Mar 2020 02:55:44 +0200
Subject: [PATCH 14/28] - add changes

---
 .gitignore                   | 4 +++-
 .idea/codeStyles/Project.xml | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index a96af37..ca7302a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,4 +160,6 @@ fabric.properties
 
 # Package Files #
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
\ No newline at end of file
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+/.idea/markdown-navigator.xml
+/.idea/markdown-navigator-enh.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 45b5654..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

From e841f71004c7a4c98c338d5bef4e07c6330b872a Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Sun, 29 Mar 2020 04:00:06 +0300
Subject: [PATCH 15/28] - update verions of plugin and wrapper

---
 .idea/codeStyles/Project.xml             |  3 --
 .idea/markdown-navigator-enh.xml         | 29 +++++++++++++
 .idea/markdown-navigator.xml             | 55 ++++++++++++++++++++++++
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  4 +-
 5 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 .idea/markdown-navigator-enh.xml
 create mode 100644 .idea/markdown-navigator.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 45b5654..88ea3aa 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml
new file mode 100644
index 0000000..12fb99d
--- /dev/null
+++ b/.idea/markdown-navigator-enh.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownEnhProjectSettings">
+    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
+    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imagePathType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+  <component name="MarkdownNavigatorHistory">
+    <PasteImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
+      <highlightList />
+      <directories />
+      <filenames />
+    </PasteImageHistory>
+    <CopyImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
+      <highlightList />
+      <directories />
+      <filenames />
+    </CopyImageHistory>
+    <PasteLinkHistory onPasteImageTargetRef="3" onPasteTargetRef="1" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteWikiElement="2" onPasteReferenceElement="2" hideInapplicableOperations="false" preserveLinkFormat="false" useHeadingForLinkText="false" linkFormat="0" saveAsDefaultOnOK="false" />
+    <TableToJsonHistory>
+      <entries />
+    </TableToJsonHistory>
+    <TableSortHistory>
+      <entries />
+    </TableSortHistory>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..4463382
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FlexmarkProjectSettings">
+    <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
+      <flexmarkSectionLanguages>
+        <option name="1" value="Markdown" />
+        <option name="2" value="HTML" />
+        <option name="3" value="flexmark-ast:1" />
+      </flexmarkSectionLanguages>
+    </FlexmarkHtmlSettings>
+  </component>
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" synchronizePreviewPosition="true" highlightPreviewType="LINE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true" lastLayoutSetsDefault="false">
+      <PanelProvider>
+        <provider providerId="com.vladsch.md.nav.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false" correctedInvalidSettings="false" emojiShortcuts="1" emojiImages="0">
+      <PegdownExtensions>
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="INTELLIJ_DUMMY_IDENTIFIER" value="true" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="PRODUCTION_SPEC_PARSER" value="true" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.md.nav.editor.text.html.generator" providerName="Unmodified HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.md.nav.editor.text.html.css" providerName="No Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+      <cssUriHistory />
+    </CssSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3749a6f..8f36277 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 68f3b83..8516ef7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 22 19:08:07 EEST 2019
+#Sun Mar 29 02:48:18 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

From 934fb52a9db12f966943ccd1e35a266c2aa694e7 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Sun, 29 Mar 2020 04:16:03 +0300
Subject: [PATCH 16/28] - remove IDEA files

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 46b5510..8abd061 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,11 @@ captures/
 .idea/runConfigurations.xml
 .idea/misc.xml
 .idea/inspectionProfiles
+.idea/markdown-navigator-enh.xml
+.idea/markdown-navigator.xml
 .idea/codeStyles
+.idea/codeStyles/Project.xml
+≈codeStyles
 
 # Android Studio 3 in .gitignore file.
 .idea/caches

From a2f58db8b52dcda7a4938dc715a421d14baf89d1 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Mon, 30 Mar 2020 04:03:08 +0300
Subject: [PATCH 17/28] - replace mode with strategy

---
 app/build.gradle                              |   7 +-
 .../idivision/rangepicker/MainActivity.kt     |   2 +-
 .../rangepickerview/scopepicker/BaseView.kt   |  17 +-
 .../scopepicker/PickerAgreement.kt            |  71 +++--
 .../scopepicker/ScopePickerView.kt            | 202 ++++++-------
 .../scopepicker/model/AnimationRect.kt        |  46 +--
 .../scopepicker/model/CalculationsHelper.kt   |  30 +-
 .../scopepicker/model/Coordinates.kt          |   9 +
 .../scopepicker/model/Options.kt              |  50 ++++
 .../scopepicker/model/State.kt                |   8 +-
 .../scopepicker/model/enums/AnimateRect.kt    |   4 +-
 .../scopepicker/model/enums/Mode.kt           |  11 -
 .../MaxOptionCharactersSizeException.kt       |   7 +
 .../exceptions/MaxOptionsSizeException.kt     |   7 +
 .../model/exceptions/MaxSizeException.kt      |   7 -
 .../exceptions/MaxWordLengthException.kt      |   7 -
 .../scopepicker/strategy/DuoPickStrategy.kt   |  62 +++-
 .../strategy/SinglePickStrategy.kt            |  32 ++-
 .../scopepicker/strategy/Strategy.kt          |  44 ++-
 .../scopepicker/strategy/StrategyAgreement.kt |  20 ++
 .../rangepickerview/util/Dimension.kt         |  16 +-
 .../rangepickerview/util/DisplayUtils.kt      |  72 ++---
 .../rangepickerview/util/TouchAssistant.kt    |   2 +-
 .../util/extension/AndroidExtensions.kt       |  54 ++--
 .../util/extension/NativeExtensions.kt        |  31 +-
 .../util/extension/PaintExtensions.kt         |  38 +--
 .../util/extension/RectExtensions.kt          |  16 +-
 .../util/extension/ViewExtensions.kt          |   9 +-
 .../util/view/AttributeSetParser.kt           | 222 +++++++--------
 .../util/view/IndexContainer.kt               |  14 +-
 .../util/view/ViewAttributes.kt               | 266 +++++++++---------
 31 files changed, 785 insertions(+), 598 deletions(-)
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionCharactersSizeException.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionsSizeException.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt

diff --git a/app/build.gradle b/app/build.gradle
index 6164637..cd79f1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "yaroslav.ovdiienko.idivision.rangepicker"
 
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
 
         versionCode 1
         versionName "1.0"
@@ -49,7 +49,7 @@ dependencies {
     // Android libs
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.2.0-alpha02'
+    implementation 'com.google.android.material:material:1.1.0'
 
     // Hyperion
     def hyperionVersion = '0.9.27'
@@ -80,6 +80,7 @@ dependencies {
 
     kapt 'com.google.auto.service:auto-service:1.0-rc6'
 
+    // Tests
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'org.mockito:mockito-core:2.23.0'
diff --git a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
index 876681b..b72e10f 100644
--- a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
+++ b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
@@ -40,7 +40,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun newView() {
         spv.apply {
-            setOptions(getOptionsStrings())
+            addOptions(getOptionsStrings())
         }
     }
 
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
index 9697119..fe68a83 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
@@ -8,10 +8,15 @@ import android.view.View
 
 
 open class BaseView : View {
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int)
-            : super(context, attrs, defStyleAttr, defStyleRes)
+  constructor(context: Context) : super(context)
+  constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+    context,
+    attrs,
+    defStyleAttr
+  )
+
+  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int)
+      : super(context, attrs, defStyleAttr, defStyleRes)
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
index 53da708..12563fe 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
@@ -1,35 +1,48 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
 
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums.Mode
-
 // TODO: provide documentation
 interface PickerAgreement {
 
-    /***/
-    fun setOptions(options: List<String>)
-
-    /***/
-    fun changeMode(mode: Mode)
-
-    // Planned:
-    // fun getSelectedItems(): Pair<Int, Int>
-    // fun setSelectedItems(items: Pair<Int, Int>)
-    // fun addOnScopeSelectedListener(...)
-    // fun removeOnScopeSelectedListener(...)
-    // fun addOnScopeChangeListener(...)
-    // fun removeOnScopeChangeListener(...)
-    // fun resetToDefaultState(withAnimation: Boolean = true)
-
-    // Nice to have:
-    // fun setStripColor(color: Int)
-    // fun setSelectedBoxColor(color: Int)
-    // fun setSelectedTextColor(color: Int)
-    // fun setUnselectedTextColor(color: Int)
-    // [?] fun setVibrationPattern(...)
-    // [?] fun enableVibration(...)
-    // [?] fun disableVibration(...)
-    // fun setCornerRadius(radius: Int)
-    // fun setFont(font: Int)
-    // fun setTextSize(size: Int)
-    // fun setStripThickness(thickness: Int)
+  /***/
+  fun addOption(option: String)
+
+  /***/
+  fun replaceOption(at: Int, newOption: String)
+
+  /***/
+  fun addOptions(newOptions: List<String>)
+
+  /***/
+  fun getOptions(): List<String>
+
+  /***/
+  fun clearOptions()
+
+  /***/
+  fun toSingleChoiceStrategy()
+
+  /***/
+  fun toDuoChoiceStrategy()
+
+  // Planned:
+  // fun getSelectedItems(): Pair<Int, Int>
+  // fun setSelectedItems(items: Pair<Int, Int>)
+  // fun addOnScopeSelectedListener(...)
+  // fun removeOnScopeSelectedListener(...)
+  // fun addOnScopeChangeListener(...)
+  // fun removeOnScopeChangeListener(...)
+  // fun resetToDefaultState(withAnimation: Boolean = true)
+
+  // Nice to have:
+  // fun setStripColor(color: Int)
+  // fun setSelectedBoxColor(color: Int)
+  // fun setSelectedTextColor(color: Int)
+  // fun setUnselectedTextColor(color: Int)
+  // [?] fun setVibrationPattern(...)
+  // [?] fun enableVibration(...)
+  // [?] fun disableVibration(...)
+  // fun setCornerRadius(radius: Int)
+  // fun setFont(font: Int)
+  // fun setTextSize(size: Int)
+  // fun setStripThickness(thickness: Int)
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
index ce8e1e7..12d4597 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
@@ -3,136 +3,112 @@ package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Canvas
-import android.graphics.Paint
 import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.WindowManager
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.State
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums.Mode
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxSizeException
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxWordLengthException
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.DuoPickStrategy
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.SinglePickStrategy
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.Strategy
 import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
 import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
-import yaroslav.ovdiienko.idivision.rangepickerview.util.TouchAssistant
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.*
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.debugAction
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.log
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
 import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
 
 
 class ScopePickerView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyleAttr: Int = 0
 ) : BaseView(context, attrs, defStyleAttr), PickerAgreement {
 
-    internal var isFirstDraw = true
-    private val data: LinkedHashMap<Int, State> = LinkedHashMap()
+  private val dimension: Dimension =
+    DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
+  private val viewAttributes = ViewAttributes()
+  private val viewBounds = Rect()
 
-    private val dimension: Dimension =
-        DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
-    private val viewBounds = Rect()
-    private val viewAttributes = ViewAttributes()
-    private val touchAssistant = TouchAssistant()
+  private var strategy: Strategy = DuoPickStrategy()
 
-    private val paint: Paint = Paint()
-    private val leftBox = AnimationRect()
-    private val rightBox = AnimationRect()
+  init {
+    val parser = ViewAttributes.Parser(context, attrs)
+    viewAttributes.applyValues(parser)
+    strategy.receiveAttributes(viewAttributes)
+  }
 
+  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    strategy.measure(0f)
+  }
 
-    init {
-        val parser = ViewAttributes.Parser(context, attrs)
-        viewAttributes.applyValues(parser)
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-
-        debugAction {
-
-        }
-
-        drawOnce {
-            log { "click rectangles drawn" }
-            // only for drawing clickable rectangles.
-        }
-
-        when (viewAttributes.mode) {
-            Mode.Single -> {
-                drawSingleChoiceView()
-            }
-            Mode.Duo -> {
-                drawDualChoiceView()
-            }
-        }
-    }
-
-    private fun drawSingleChoiceView() {
-        // TODO: only one point to draw and set/get options
-    }
-
-    private fun drawDualChoiceView() {
-        // TODO: the same behaviour as in Range Picker View
-    }
+  override fun onDraw(canvas: Canvas) {
+    super.onDraw(canvas)
 
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        when (event.actionMasked) {
-            MotionEvent.ACTION_DOWN -> {
-            }
-            MotionEvent.ACTION_MOVE -> {
-                requestDisallowInterceptTouchEvent()
-                invalidate()
-            }
-            else -> return super.onTouchEvent(event)
-        }
-        return true
+    debugAction {
+      strategy.draw(canvas)
     }
-
-    override fun performClick(): Boolean {
-        return super.performClick()
-    }
-
-    override fun setOptions(options: List<String>) {
-        if (MAX_ELEMENTS_ALLOWED < options.size) {
-            throw MaxSizeException(
-                "Maximum available size is $MAX_ELEMENTS_ALLOWED elements, " +
-                        "current size is ${options.size} elements"
-            )
-        }
-
-        options.forEach { word ->
-            if (MAX_LETTERS_IN_WORD_ALLOWED < word.length) {
-                throw MaxWordLengthException(
-                    "Maximum word length is $MAX_LETTERS_IN_WORD_ALLOWED characters, " +
-                            "current word \"$word\" length is ${word.length} characters"
-                )
-            }
-        }
-    }
-
-    override fun changeMode(mode: Mode) {
-        log { "view mode changed to $mode" }
-        viewAttributes.mode = mode
-    }
-
-    private fun reset() {
-        log { "view reset triggered" }
-        isFirstDraw = true
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration?) {
-        super.onConfigurationChanged(newConfig)
-        reset()
-    }
-
-    companion object {
-        internal const val MAX_ELEMENTS_ALLOWED = 5
-        internal const val MAX_LETTERS_IN_WORD_ALLOWED = 15
-
-        internal const val DEBUG = true
+  }
+
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    strategy.touch(event)
+
+    when (event.actionMasked) {
+      MotionEvent.ACTION_DOWN -> {
+      }
+      MotionEvent.ACTION_MOVE -> {
+        requestDisallowInterceptTouchEvent()
+        invalidate()
+      }
+      MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> performClick()
+      else -> return super.onTouchEvent(event)
     }
+    return true
+  }
+
+  override fun addOption(option: String) {
+    strategy.addOption(option)
+  }
+
+  override fun replaceOption(at: Int, newOption: String) {
+    strategy.replaceOption(at, newOption)
+  }
+
+  override fun addOptions(newOptions: List<String>) {
+    strategy.addOptions(newOptions)
+  }
+
+  override fun getOptions() = strategy.getOptions()
+
+  override fun clearOptions() {
+    strategy.clearOptions()
+  }
+
+  override fun toSingleChoiceStrategy() {
+    log { "view mode changed to single strategy" }
+    strategy = SinglePickStrategy()
+      .apply { receiveAttributes(viewAttributes) }
+    requestLayout()
+  }
+
+  override fun toDuoChoiceStrategy() {
+    log { "view mode changed to duo strategy" }
+    strategy = DuoPickStrategy()
+      .apply { receiveAttributes(viewAttributes) }
+    requestLayout()
+  }
+
+  private fun reset() {
+    log { "view reset triggered" }
+    // TODO: reset rest of the values
+  }
+
+  override fun onConfigurationChanged(newConfig: Configuration?) {
+    super.onConfigurationChanged(newConfig)
+    reset()
+  }
+
+  companion object {
+    internal const val DEBUG = true
+  }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
index 2611a0c..04aa151 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
@@ -5,24 +5,30 @@ import android.graphics.RectF
 
 
 class AnimationRect : RectF {
-    constructor() : super()
-    constructor(left: Float, top: Float, right: Float, bottom: Float) : super(left, top, right, bottom)
-    constructor(r: RectF) : super(r)
-    constructor(r: Rect) : super(r)
-
-    fun setTop(top: Float) {
-        this.top = top
-    }
-
-    fun setBottom(bottom: Float) {
-        this.bottom = bottom
-    }
-
-    fun setRight(right: Float) {
-        this.right = right
-    }
-
-    fun setLeft(left: Float) {
-        this.left = left
-    }
+  constructor() : super()
+  constructor(left: Float, top: Float, right: Float, bottom: Float) : super(
+    left,
+    top,
+    right,
+    bottom
+  )
+
+  constructor(r: RectF) : super(r)
+  constructor(r: Rect) : super(r)
+
+  fun setTop(top: Float) {
+    this.top = top
+  }
+
+  fun setBottom(bottom: Float) {
+    this.bottom = bottom
+  }
+
+  fun setRight(right: Float) {
+    this.right = right
+  }
+
+  fun setLeft(left: Float) {
+    this.left = left
+  }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
index 803991b..10485b3 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
@@ -5,25 +5,25 @@ import kotlin.math.abs
 
 
 class CalculationsHelper {
-    var desiredCenterOfRect: Float = 0f
-    var startingCenterOfRect: Float = 0f
+  var desiredCenterOfRect: Float = 0f
+  var startingCenterOfRect: Float = 0f
 
-    var widthOfDesiredRect: Float = 0f
-    var widthOfStartingRect: Float = 0f
+  var widthOfDesiredRect: Float = 0f
+  var widthOfStartingRect: Float = 0f
 
-    var deltaWidth: Float = 0f
-    var deltaCenter: Float = 0f
+  var deltaWidth: Float = 0f
+  var deltaCenter: Float = 0f
 
-    fun calculateOnDirectionChange(): CalculationsHelper {
-        return this.apply {
-            deltaWidth = widthOfDesiredRect - widthOfStartingRect
-            deltaCenter = abs(desiredCenterOfRect - startingCenterOfRect)
-        }
+  fun calculateOnDirectionChange(): CalculationsHelper {
+    return this.apply {
+      deltaWidth = widthOfDesiredRect - widthOfStartingRect
+      deltaCenter = abs(desiredCenterOfRect - startingCenterOfRect)
     }
+  }
 
-    fun calculateWidthChanges(lastCenterAfterMove: Float): Float {
-        return with(deltaCenter - lastCenterAfterMove) {
-            if (this != 0f) (this * deltaWidth) / deltaCenter else deltaCenter
-        }
+  fun calculateWidthChanges(lastCenterAfterMove: Float): Float {
+    return with(deltaCenter - lastCenterAfterMove) {
+      if (this != 0f) (this * deltaWidth) / deltaCenter else deltaCenter
     }
+  }
 }
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt
new file mode 100644
index 0000000..b9f47fd
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt
@@ -0,0 +1,9 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+
+
+data class Coordinates(
+  val left: Float,
+  val top: Float,
+  val right: Float,
+  val bottom: Float
+)
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
new file mode 100644
index 0000000..3149b3b
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
@@ -0,0 +1,50 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxOptionCharactersSizeException
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxOptionsSizeException
+
+
+data class Options(private val list: MutableList<String> = mutableListOf()) {
+  fun addOption(option: String) {
+    check(option)
+    list.add(option)
+  }
+
+  fun replaceOption(at: Int, newOption: String) {
+    check(newOption)
+    list[at] = newOption
+  }
+
+  fun addOptions(options: List<String>) {
+    list.addAll(options)
+  }
+
+  fun getOptions() = list.toList()
+
+  internal fun getOption(at: Int) = list[at]
+
+  fun clear() {
+    list.clear()
+  }
+
+  private fun check(candidate: String) {
+    if (MAX_ELEMENTS_ALLOWED < list.size) {
+      throw MaxOptionsSizeException(
+        "Maximum available size is $MAX_ELEMENTS_ALLOWED elements, " +
+            "but size is ${list.size} elements."
+      )
+    }
+
+    if (MAX_LETTERS_IN_WORD_ALLOWED < candidate.length) {
+      throw MaxOptionCharactersSizeException(
+        "Maximum word length is $MAX_LETTERS_IN_WORD_ALLOWED characters, " +
+            "but length of word \"$candidate\" is ${candidate.length} characters."
+      )
+    }
+  }
+
+  companion object {
+    const val MAX_ELEMENTS_ALLOWED = 5
+    const val MAX_LETTERS_IN_WORD_ALLOWED = 6
+  }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
index c815cff..18899d9 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
@@ -5,8 +5,8 @@ import android.graphics.RectF
 
 
 data class State(
-        var coordinates: RectF = RectF(),
-        var text: String = "",
-        var textBounds: Rect = Rect(),
-        var isSelected: Boolean = false
+  var textCoordinates: RectF = RectF(),
+  var textPosition: Int = -1,
+  var textBounds: Rect = Rect(),
+  var isSelected: Boolean = false
 )
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
index 8b1c389..8950138 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
@@ -1,6 +1,6 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums
 
 sealed class AnimateRect(val property: String) {
-    object Left : AnimateRect("left")
-    object Right : AnimateRect("right")
+  object Left : AnimateRect("left")
+  object Right : AnimateRect("right")
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt
deleted file mode 100644
index c3511a8..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/Mode.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums
-
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.DuoPickStrategy
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.SinglePickStrategy
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.Strategy
-
-
-sealed class Mode(strategy: Strategy) {
-    object Single : Mode(SinglePickStrategy())
-    object Duo : Mode(DuoPickStrategy())
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionCharactersSizeException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionCharactersSizeException.kt
new file mode 100644
index 0000000..800f631
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionCharactersSizeException.kt
@@ -0,0 +1,7 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
+
+
+class MaxOptionCharactersSizeException : RuntimeException {
+  constructor(message: String) : super(message)
+  constructor(error: Throwable) : super(error)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionsSizeException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionsSizeException.kt
new file mode 100644
index 0000000..668a2e6
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionsSizeException.kt
@@ -0,0 +1,7 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
+
+
+class MaxOptionsSizeException : RuntimeException {
+  constructor(message: String) : super(message)
+  constructor(error: Throwable) : super(error)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt
deleted file mode 100644
index 90839ad..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxSizeException.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
-
-
-class MaxSizeException : RuntimeException {
-    constructor(message: String) : super(message)
-    constructor(error: Throwable) : super(error)
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt
deleted file mode 100644
index e463975..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxWordLengthException.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
-
-
-class MaxWordLengthException : RuntimeException {
-    constructor(message: String) : super(message)
-    constructor(error: Throwable) : super(error)
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
index e9be474..ba6fcfa 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
@@ -1,5 +1,65 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
 
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Rect
+import android.view.MotionEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
+import yaroslav.ovdiienko.idivision.rangepickerview.util.TouchAssistant
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.debugAction
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.log
+import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
 
-class DuoPickStrategy : Strategy {
+
+class DuoPickStrategy : Strategy() {
+  private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+    style = Paint.Style.FILL
+    color = Color.GREEN
+    strokeWidth = 100f
+  }
+  private val leftBox = AnimationRect()
+  private val rightBox = AnimationRect()
+
+  private val touchAssistant = TouchAssistant()
+
+  override fun getViewBounds(rect: Rect) {
+
+  }
+
+  override fun measure(measuredResults: Float) {
+
+  }
+
+  override fun draw(canvas: Canvas) {
+    debugAction {
+      drawClickRectangles()
+    }
+
+    drawBackgroundBetweenOptions(canvas)
+    // TODO: the same behaviour as in Range Picker View
+  }
+
+  private fun drawClickRectangles() {
+    log { "click rectangles drawn" }
+    // only for drawing clickable rectangles.
+  }
+
+  override fun touch(event: MotionEvent) {
+
+  }
+
+  private fun drawBackgroundBetweenOptions(canvas: Canvas) {
+    canvas.drawLine(
+      leftBox.centerX(),
+      leftBox.centerY(),
+      rightBox.centerX(),
+      rightBox.centerY(),
+      paint
+    )
+  }
+
+  override fun receiveAttributes(attributes: ViewAttributes) {
+
+  }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
index 32d2501..d8697b9 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
@@ -1,5 +1,35 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
 
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.view.MotionEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
+import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
 
-class SinglePickStrategy : Strategy {
+
+// Planned in 1.1.0
+class SinglePickStrategy : Strategy() {
+  private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
+  private val box = AnimationRect()
+
+  override fun draw(canvas: Canvas) {
+    // TODO: only one point to draw and set/get options
+  }
+
+  override fun receiveAttributes(attributes: ViewAttributes) {
+    // TODO: parse attributes
+  }
+
+  override fun touch(event: MotionEvent) {
+    // TODO: handle touches
+  }
+
+  override fun measure(measuredResults: Float) {
+    // TODO: handle measure of text and `Rect`s
+  }
+
+  override fun getViewBounds(rect: Rect) {
+    // TODO: work with bounds
+  }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
index de3ee67..86ee7d8 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
@@ -1,5 +1,47 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
 
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.view.MotionEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.Options
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.State
+import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
 
-interface Strategy {
+
+abstract class Strategy : StrategyAgreement {
+  protected val data: LinkedHashMap<Int, State> = LinkedHashMap()
+  protected val options = Options()
+
+  abstract fun getViewBounds(rect: Rect)
+
+  /***/
+  fun addOption(option: String) {
+    options.addOption(option)
+  }
+
+  /***/
+  fun replaceOption(at: Int, newOption: String) {
+    options.replaceOption(at, newOption)
+  }
+
+  /***/
+  fun addOptions(newOptions: List<String>) {
+    options.addOptions(newOptions)
+  }
+
+  /***/
+  fun getOptions() = options.getOptions()
+
+  /***/
+  fun clearOptions() {
+    options.clear()
+  }
+
+  override fun receiveAttributes(attributes: ViewAttributes) {}
+
+  override fun draw(canvas: Canvas) {}
+
+  override fun touch(event: MotionEvent) {}
+
+  override fun measure(measuredResults: Float) {}
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt
new file mode 100644
index 0000000..61d7f61
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt
@@ -0,0 +1,20 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
+
+import android.graphics.Canvas
+import android.view.MotionEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
+
+
+interface StrategyAgreement {
+  /***/
+  fun receiveAttributes(attributes: ViewAttributes)
+
+  /***/
+  fun draw(canvas: Canvas)
+
+  /***/
+  fun touch(event: MotionEvent)
+
+  /***/
+  fun measure(measuredResults: Float)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
index 9a6f811..b1855c0 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
@@ -2,13 +2,13 @@ package yaroslav.ovdiienko.idivision.rangepickerview.util
 
 
 interface Dimension {
-    fun toDp(dp: Float): Float
-    fun dpToPx(px: Float): Float
-    fun toSp(sp: Float): Float
-    fun spToPx(px: Float): Float
+  fun toDp(dp: Float): Float
+  fun dpToPx(px: Float): Float
+  fun toSp(sp: Float): Float
+  fun spToPx(px: Float): Float
 
-    fun getMinWidthValue(): Int
-    fun getMaxWidthValue(): Int
-    fun getScreenHeight(): Int
-    fun getScreenWidth(): Int
+  fun getMinWidthValue(): Int
+  fun getMaxWidthValue(): Int
+  fun getScreenHeight(): Int
+  fun getScreenWidth(): Int
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
index 17374d0..e9f6a85 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
@@ -7,51 +7,51 @@ import kotlin.math.min
 
 
 class DisplayUtils(private val windowManager: WindowManager) : Dimension {
-    private val displayMetrics: DisplayMetrics = DisplayMetrics()
+  private val displayMetrics: DisplayMetrics = DisplayMetrics()
 
-    init {
-        windowManager.defaultDisplay.getMetrics(displayMetrics)
-    }
+  init {
+    windowManager.defaultDisplay.getMetrics(displayMetrics)
+  }
 
-    override fun toDp(dp: Float) = multiply(displayMetrics.density, dp)
+  override fun toDp(dp: Float) = multiply(displayMetrics.density, dp)
 
-    override fun dpToPx(px: Float) = divide(displayMetrics.density, px)
+  override fun dpToPx(px: Float) = divide(displayMetrics.density, px)
 
-    override fun toSp(sp: Float) = multiply(displayMetrics.scaledDensity, sp)
+  override fun toSp(sp: Float) = multiply(displayMetrics.scaledDensity, sp)
 
-    override fun spToPx(px: Float) = divide(displayMetrics.scaledDensity, px)
+  override fun spToPx(px: Float) = divide(displayMetrics.scaledDensity, px)
 
-    private fun divide(metrics: Float, value: Float) = (value / metrics + 0.5f)
+  private fun divide(metrics: Float, value: Float) = (value / metrics + 0.5f)
 
-    private fun multiply(metrics: Float, value: Float) = (value * metrics + 0.5f)
+  private fun multiply(metrics: Float, value: Float) = (value * metrics + 0.5f)
 
-    override fun getMinWidthValue(): Int {
-        val display = windowManager.defaultDisplay
-        val metrics = DisplayMetrics()
-        display.getMetrics(metrics)
-        val heightPixels = metrics.heightPixels
-        val widthPixels = metrics.widthPixels
-        return min(heightPixels, widthPixels)
-    }
+  override fun getMinWidthValue(): Int {
+    val display = windowManager.defaultDisplay
+    val metrics = DisplayMetrics()
+    display.getMetrics(metrics)
+    val heightPixels = metrics.heightPixels
+    val widthPixels = metrics.widthPixels
+    return min(heightPixels, widthPixels)
+  }
 
-    override fun getMaxWidthValue(): Int {
-        val display = windowManager.defaultDisplay
-        val metrics = DisplayMetrics()
-        display.getMetrics(metrics)
-        return max(metrics.heightPixels, metrics.widthPixels)
-    }
+  override fun getMaxWidthValue(): Int {
+    val display = windowManager.defaultDisplay
+    val metrics = DisplayMetrics()
+    display.getMetrics(metrics)
+    return max(metrics.heightPixels, metrics.widthPixels)
+  }
 
-    override fun getScreenHeight(): Int {
-        val display = windowManager.defaultDisplay
-        val metrics = DisplayMetrics()
-        display.getMetrics(metrics)
-        return metrics.heightPixels
-    }
+  override fun getScreenHeight(): Int {
+    val display = windowManager.defaultDisplay
+    val metrics = DisplayMetrics()
+    display.getMetrics(metrics)
+    return metrics.heightPixels
+  }
 
-    override fun getScreenWidth(): Int {
-        val display = windowManager.defaultDisplay
-        val metrics = DisplayMetrics()
-        display.getMetrics(metrics)
-        return metrics.widthPixels
-    }
+  override fun getScreenWidth(): Int {
+    val display = windowManager.defaultDisplay
+    val metrics = DisplayMetrics()
+    display.getMetrics(metrics)
+    return metrics.widthPixels
+  }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
index 78a0b7d..a77677f 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
@@ -2,5 +2,5 @@ package yaroslav.ovdiienko.idivision.rangepickerview.util
 
 
 class TouchAssistant {
-    // TODO: add touch handling
+  // TODO: add touch handling
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
index 6c667ac..4f2830e 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
@@ -14,40 +14,40 @@ import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView.
 internal fun buildVersionGE(version: Int): Boolean = Build.VERSION.SDK_INT >= version
 
 internal val Float.dp: Float
-    get() = TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_DIP,
-        this,
-        Resources.getSystem().displayMetrics
-    )
+  get() = TypedValue.applyDimension(
+    TypedValue.COMPLEX_UNIT_DIP,
+    this,
+    Resources.getSystem().displayMetrics
+  )
 
 internal val Float.sp: Float
-    get() = TypedValue.applyDimension(
-        TypedValue.COMPLEX_UNIT_SP,
-        this,
-        Resources.getSystem().displayMetrics
-    )
+  get() = TypedValue.applyDimension(
+    TypedValue.COMPLEX_UNIT_SP,
+    this,
+    Resources.getSystem().displayMetrics
+  )
 
 internal fun Context.getFont(fontResId: Int): Typeface? {
-    return try {
-        if (buildVersionGE(Build.VERSION_CODES.O)) {
-            resources.getFont(fontResId)
-        } else {
-            ResourcesCompat.getFont(this, fontResId)
-        }
-    } catch (e: Exception) {
-        val font = Typeface.createFromAsset(assets, "display_regular.otf")
-        when (e) {
-            is Resources.NotFoundException,
-            is NullPointerException -> font
-            else -> font
-        }
+  return try {
+    if (buildVersionGE(Build.VERSION_CODES.O)) {
+      resources.getFont(fontResId)
+    } else {
+      ResourcesCompat.getFont(this, fontResId)
     }
+  } catch (e: Exception) {
+    val font = Typeface.createFromAsset(assets, "display_regular.otf")
+    when (e) {
+      is Resources.NotFoundException,
+      is NullPointerException -> font
+      else -> font
+    }
+  }
 }
 
-internal fun ScopePickerView.log(tag: String = "SPV/Default", msg: () -> String) {
-    if (DEBUG) Log.d(tag, msg.invoke())
+internal fun Any.log(tag: String = "SPV/Default", msg: () -> String) {
+  if (DEBUG) Log.d(tag, msg.invoke())
 }
 
-internal fun ScopePickerView.debugAction(action: () -> Unit) {
-    if (DEBUG) action.invoke()
+internal fun Any.debugAction(action: () -> Unit) {
+  if (DEBUG) action.invoke()
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/NativeExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/NativeExtensions.kt
index 4d0ca78..c3fc4c8 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/NativeExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/NativeExtensions.kt
@@ -5,30 +5,21 @@ import android.animation.AnimatorSet
 
 
 fun AnimatorSet.addAnimationEndListener(block: () -> Unit) {
-    this.addListener(object : Animator.AnimatorListener {
-        override fun onAnimationRepeat(animation: Animator?) {
+  this.addListener(object : Animator.AnimatorListener {
+    override fun onAnimationRepeat(animation: Animator?) {
 
-        }
+    }
 
-        override fun onAnimationEnd(animation: Animator?, isReverse: Boolean) {
-            super.onAnimationEnd(animation, isReverse)
+    override fun onAnimationEnd(animation: Animator?) {
+      block.invoke()
+    }
 
-        }
+    override fun onAnimationCancel(animation: Animator?) {
 
-        override fun onAnimationEnd(animation: Animator?) {
-            block.invoke()
-        }
+    }
 
-        override fun onAnimationCancel(animation: Animator?) {
+    override fun onAnimationStart(animation: Animator?) {
 
-        }
-
-        override fun onAnimationStart(animation: Animator?, isReverse: Boolean) {
-            super.onAnimationStart(animation, isReverse)
-        }
-
-        override fun onAnimationStart(animation: Animator?) {
-
-        }
-    })
+    }
+  })
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
index ab9f4b9..9f83d8a 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
@@ -5,32 +5,32 @@ import android.graphics.Paint
 
 
 fun Paint.applySelectedTextSettings() {
-    this.apply {
-        isAntiAlias = true
-        style = Paint.Style.FILL
-        color = Color.parseColor("#ff000000")
-    }
+  this.apply {
+    isAntiAlias = true
+    style = Paint.Style.FILL
+    color = Color.parseColor("#ff000000")
+  }
 }
 
 fun Paint.applyTextSettings() {
-    this.apply {
-        isAntiAlias = true
-        style = Paint.Style.FILL
-        color = Color.parseColor("#ff000000")
-    }
+  this.apply {
+    isAntiAlias = true
+    style = Paint.Style.FILL
+    color = Color.parseColor("#ff000000")
+  }
 }
 
 fun Paint.applyStripSettings() {
-    this.apply {
-        isAntiAlias = true
-        style = Paint.Style.FILL
-    }
+  this.apply {
+    isAntiAlias = true
+    style = Paint.Style.FILL
+  }
 }
 
 fun Paint.applySelectedBoxSettings() {
-    this.apply {
-        isAntiAlias = true
-        style = Paint.Style.FILL
-        color = Color.BLUE
-    }
+  this.apply {
+    isAntiAlias = true
+    style = Paint.Style.FILL
+    color = Color.BLUE
+  }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
index 23c978d..f366b38 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
@@ -4,13 +4,13 @@ import android.graphics.RectF
 
 
 internal fun RectF.update(
-    left: Float = this.left,
-    top: Float = this.top,
-    right: Float = this.right,
-    bottom: Float = this.bottom
+  left: Float = this.left,
+  top: Float = this.top,
+  right: Float = this.right,
+  bottom: Float = this.bottom
 ) {
-    this.left = left
-    this.top = top
-    this.right = right
-    this.bottom = bottom
+  this.left = left
+  this.top = top
+  this.right = right
+  this.bottom = bottom
 }
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
index a6d8133..4199e5e 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
@@ -4,13 +4,6 @@ package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
 import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
 
 
-internal fun ScopePickerView.drawOnce(drawBlock: () -> Unit) {
-    if (isFirstDraw) {
-        drawBlock.invoke()
-        isFirstDraw = false
-    }
-}
-
 internal fun ScopePickerView.requestDisallowInterceptTouchEvent() {
-    parent.requestDisallowInterceptTouchEvent(true)
+  parent.requestDisallowInterceptTouchEvent(true)
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt
index 42f5ba3..9db6bdc 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/AttributeSetParser.kt
@@ -13,121 +13,121 @@ import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.RangePickerView.
 
 @Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 class AttributeSetParser(private val context: Context, attributeSet: AttributeSet?) {
-    private val displayMetrics = context.resources.displayMetrics
-
-    private val attributes: TypedArray? = attributeSet?.let {
-        context.obtainStyledAttributes(it, R.styleable.RangePickerView)
-    }
-
-    private val defaultBackgroundSelectedTint: Int by lazy {
-        ContextCompat.getColor(context, R.color.colorBlueSelectedPicker)
-    }
-    private val defaultTextColorOnSurface: Int by lazy {
-        ContextCompat.getColor(context, R.color.colorTextBlack)
-    }
-    private val defaultTextColorOnSelected: Int by lazy {
-        ContextCompat.getColor(context, R.color.colorTextWhite)
-    }
-
-    private val defaultBackgroundStripTint: Int by lazy {
-        ContextCompat.getColor(context, R.color.colorGreyBgPiker)
-    }
-
-    private val defaultStrokeWidth: Float by lazy {
-        TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            RangePickerView.DEFAULT_STROKE_WIDTH.toFloat(),
-            displayMetrics
-        )
-    }
-
-    private val defaultCornerRadius: Float by lazy {
-        TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            RangePickerView.DEFAULT_CORNER_RADIUS.toFloat(),
-            displayMetrics
-        )
-    }
-
-    private val defaultExtraPadding: Float by lazy {
-        TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            RangePickerView.DEFAULT_EXTRA_PADDING.toFloat(),
-            displayMetrics
-        )
-    }
-
-    private val defaultTextSize: Float by lazy {
-        TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_SP,
-            DEFAULT_TEXT_SIZE.toFloat(),
-            displayMetrics
-        )
+  private val displayMetrics = context.resources.displayMetrics
+
+  private val attributes: TypedArray? = attributeSet?.let {
+    context.obtainStyledAttributes(it, R.styleable.RangePickerView)
+  }
+
+  private val defaultBackgroundSelectedTint: Int by lazy {
+    ContextCompat.getColor(context, R.color.colorBlueSelectedPicker)
+  }
+  private val defaultTextColorOnSurface: Int by lazy {
+    ContextCompat.getColor(context, R.color.colorTextBlack)
+  }
+  private val defaultTextColorOnSelected: Int by lazy {
+    ContextCompat.getColor(context, R.color.colorTextWhite)
+  }
+
+  private val defaultBackgroundStripTint: Int by lazy {
+    ContextCompat.getColor(context, R.color.colorGreyBgPiker)
+  }
+
+  private val defaultStrokeWidth: Float by lazy {
+    TypedValue.applyDimension(
+      TypedValue.COMPLEX_UNIT_DIP,
+      RangePickerView.DEFAULT_STROKE_WIDTH.toFloat(),
+      displayMetrics
+    )
+  }
+
+  private val defaultCornerRadius: Float by lazy {
+    TypedValue.applyDimension(
+      TypedValue.COMPLEX_UNIT_DIP,
+      RangePickerView.DEFAULT_CORNER_RADIUS.toFloat(),
+      displayMetrics
+    )
+  }
+
+  private val defaultExtraPadding: Float by lazy {
+    TypedValue.applyDimension(
+      TypedValue.COMPLEX_UNIT_DIP,
+      RangePickerView.DEFAULT_EXTRA_PADDING.toFloat(),
+      displayMetrics
+    )
+  }
+
+  private val defaultTextSize: Float by lazy {
+    TypedValue.applyDimension(
+      TypedValue.COMPLEX_UNIT_SP,
+      DEFAULT_TEXT_SIZE.toFloat(),
+      displayMetrics
+    )
+  }
+
+  private val defaultTextFont: Int by lazy {
+    R.font.display_regular
+  }
+
+  fun getBackgroundSelectedTint(): Int {
+    return parseColorRes(
+      R.styleable.RangePickerView_backgroundSelectedTint,
+      defaultBackgroundSelectedTint
+    )
+  }
+
+  fun getBackgroundStripTint(): Int {
+    return parseColorRes(
+      R.styleable.RangePickerView_backgroundStripTint,
+      defaultBackgroundStripTint
+    )
+  }
+
+  fun getTextColorOnSurface(): Int {
+    return parseColorRes(
+      R.styleable.RangePickerView_textColorOnSurface,
+      defaultTextColorOnSurface
+    )
+  }
+
+  fun getTextColorOnSelected(): Int {
+    return parseColorRes(
+      R.styleable.RangePickerView_textColorOnSelected,
+      defaultTextColorOnSelected
+    )
+  }
+
+  fun getStripThickness() =
+    parseDimensionRes(R.styleable.RangePickerView_stripThickness, defaultStrokeWidth)
+
+  fun getTextSize() =
+    parseDimensionRes(R.styleable.RangePickerView_android_textSize, defaultTextSize)
+
+  fun getCornerRadius() =
+    parseDimensionRes(R.styleable.RangePickerView_cornerRadius, defaultCornerRadius)
+
+  fun getExtraPadding() =
+    parseDimensionRes(R.styleable.RangePickerView_extraPadding, defaultExtraPadding)
+
+  fun getFontRes(): Typeface? {
+    attributes?.let {
+      val fontResId = it.getResourceId(
+        R.styleable.RangePickerView_android_fontFamily,
+        defaultTextFont
+      )
+      return parseFontRes(fontResId)
     }
 
-    private val defaultTextFont: Int by lazy {
-        R.font.display_regular
-    }
-
-    fun getBackgroundSelectedTint(): Int {
-        return parseColorRes(
-            R.styleable.RangePickerView_backgroundSelectedTint,
-            defaultBackgroundSelectedTint
-        )
-    }
-
-    fun getBackgroundStripTint(): Int {
-        return parseColorRes(
-            R.styleable.RangePickerView_backgroundStripTint,
-            defaultBackgroundStripTint
-        )
-    }
-
-    fun getTextColorOnSurface(): Int {
-        return parseColorRes(
-            R.styleable.RangePickerView_textColorOnSurface,
-            defaultTextColorOnSurface
-        )
-    }
-
-    fun getTextColorOnSelected(): Int {
-        return parseColorRes(
-            R.styleable.RangePickerView_textColorOnSelected,
-            defaultTextColorOnSelected
-        )
-    }
-
-    fun getStripThickness() =
-        parseDimensionRes(R.styleable.RangePickerView_stripThickness, defaultStrokeWidth)
-
-    fun getTextSize() =
-        parseDimensionRes(R.styleable.RangePickerView_android_textSize, defaultTextSize)
-
-    fun getCornerRadius() =
-        parseDimensionRes(R.styleable.RangePickerView_cornerRadius, defaultCornerRadius)
-
-    fun getExtraPadding() =
-        parseDimensionRes(R.styleable.RangePickerView_extraPadding, defaultExtraPadding)
-
-    fun getFontRes(): Typeface? {
-        attributes?.let {
-            val fontResId = it.getResourceId(
-                R.styleable.RangePickerView_android_fontFamily,
-                defaultTextFont
-            )
-            return parseFontRes(fontResId)
-        }
-
-        return parseFontRes(defaultTextFont)
-    }
+    return parseFontRes(defaultTextFont)
+  }
 
-    private fun parseColorRes(styleableResId: Int, defaultDimension: Int) =
-        attributes?.getColor(styleableResId, defaultDimension) ?: defaultDimension
+  private fun parseColorRes(styleableResId: Int, defaultDimension: Int) =
+    attributes?.getColor(styleableResId, defaultDimension) ?: defaultDimension
 
-    private fun parseDimensionRes(styleableResId: Int, defaultDimension: Float) =
-        attributes?.getDimension(styleableResId, defaultDimension) ?: defaultDimension
+  private fun parseDimensionRes(styleableResId: Int, defaultDimension: Float) =
+    attributes?.getDimension(styleableResId, defaultDimension) ?: defaultDimension
 
-    private fun parseFontRes(fontResId: Int) = ResourcesCompat.getFont(context, fontResId)
+  private fun parseFontRes(fontResId: Int) = ResourcesCompat.getFont(context, fontResId)
 
-    fun recycle() = attributes?.recycle()
+  fun recycle() = attributes?.recycle()
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt
index 19de3c9..8b99ce7 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/IndexContainer.kt
@@ -4,13 +4,13 @@ import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.Opti
 
 @Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 class IndexContainer {
-    var firstPreviousIndex: Int = -1
-    var secondPreviousIndex: Int = -1
+  var firstPreviousIndex: Int = -1
+  var secondPreviousIndex: Int = -1
 
-    var firstNewIndex: Int = -1
-    var secondNewIndex: Int = -1
+  var firstNewIndex: Int = -1
+  var secondNewIndex: Int = -1
 
-    var firstDefaultIndex: Int = -1
-    var secondDefaultIndex: Int = -1
-    var defaultOptionsState: OptionsState = OptionsState.NONE
+  var firstDefaultIndex: Int = -1
+  var secondDefaultIndex: Int = -1
+  var defaultOptionsState: OptionsState = OptionsState.NONE
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
index 19eef2d..6335c02 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
@@ -6,154 +6,156 @@ import android.graphics.Typeface
 import android.util.AttributeSet
 import androidx.core.content.ContextCompat
 import yaroslav.ovdiienko.idivision.rangepickerview.R
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums.Mode
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.DuoPickStrategy
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.SinglePickStrategy
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.Strategy
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.dp
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.getFont
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.sp
 
 
 class ViewAttributes {
-    var pointerBackgroundColor: Int = 0
-        private set
+  var pointerBackgroundColor: Int = 0
+    private set
 
-    var stripBackgroundColor: Int = 0
-        private set
+  var stripBackgroundColor: Int = 0
+    private set
 
-    var textColorOnPoint: Int = 0
-        private set
+  var textColorOnPoint: Int = 0
+    private set
 
-    var textColorOnSurface: Int = 0
-        private set
+  var textColorOnSurface: Int = 0
+    private set
 
-    var pointerCornerRadius: Float = 0f
-        private set
+  var pointerCornerRadius: Float = 0f
+    private set
 
-    var stripThickness: Float = 0f
-        private set
+  var stripThickness: Float = 0f
+    private set
 
-    var textSize: Float = 0f
-        private set
+  var textSize: Float = 0f
+    private set
 
-    var fontFamily: Typeface? = null
-        private set
+  var fontFamily: Typeface? = null
+    private set
 
-    var mode: Mode = Mode.Duo
+  var strategy: Strategy = DuoPickStrategy()
 
-    fun applyValues(newValues: Parser) {
-        newValues.parse(this)
+  fun applyValues(newValues: Parser) {
+    newValues.parse(this)
+  }
+
+  class Parser(private val context: Context, private val attrs: AttributeSet?) {
+    private val typedAttributes: TypedArray? =
+      context.obtainStyledAttributes(attrs, R.styleable.ScopePickerView)
+
+    private val defaultPointerBackgroundColor: Int by lazy {
+      ContextCompat.getColor(context, R.color.colorBlueSelectedPicker)
+    }
+    private val defaultTextColorOnSurface: Int by lazy {
+      ContextCompat.getColor(context, R.color.colorTextBlack)
+    }
+    private val defaultTextColorOnPoint: Int by lazy {
+      ContextCompat.getColor(context, R.color.colorTextWhite)
+    }
+
+    private val defaultStripBackgroundColor: Int by lazy {
+      ContextCompat.getColor(context, R.color.colorGreyBgPiker)
+    }
+
+    private val defaultStripThickness: Float by lazy { DEFAULT_STROKE_WIDTH.dp }
+
+    private val defaultPointerCornerRadius: Float by lazy { DEFAULT_CORNER_RADIUS.dp }
+
+    private val defaultTextSize: Float by lazy { DEFAULT_TEXT_SIZE.sp }
+
+    private val defaultTextFont: Int by lazy { R.font.display_regular }
+
+    internal fun parse(viewAttributes: ViewAttributes) {
+      viewAttributes.apply {
+        pointerBackgroundColor = getPointerBackgroundColor()
+        stripBackgroundColor = getStripBackgroundColor()
+        textColorOnPoint = getTextColorOnPoint()
+        textColorOnSurface = getTextColorOnSurface()
+        pointerCornerRadius = getPointerCornerRadius()
+        stripThickness = getStripThickness()
+        textSize = getTextSize()
+        fontFamily = getFontRes()
+        strategy = getStrategy()
+      }
+
+      typedAttributes?.recycle()
+    }
+
+    private fun getStrategy(): Strategy {
+      return with(typedAttributes?.getInt(R.styleable.ScopePickerView_mode, 2)) {
+        if (this == 1) SinglePickStrategy() else DuoPickStrategy()
+      }
     }
 
-    class Parser(private val context: Context, private val attrs: AttributeSet?) {
-        private val typedAttributes: TypedArray? =
-            context.obtainStyledAttributes(attrs, R.styleable.ScopePickerView)
-
-        private val defaultPointerBackgroundColor: Int by lazy {
-            ContextCompat.getColor(context, R.color.colorBlueSelectedPicker)
-        }
-        private val defaultTextColorOnSurface: Int by lazy {
-            ContextCompat.getColor(context, R.color.colorTextBlack)
-        }
-        private val defaultTextColorOnPoint: Int by lazy {
-            ContextCompat.getColor(context, R.color.colorTextWhite)
-        }
-
-        private val defaultStripBackgroundColor: Int by lazy {
-            ContextCompat.getColor(context, R.color.colorGreyBgPiker)
-        }
-
-        private val defaultStripThickness: Float by lazy { DEFAULT_STROKE_WIDTH.dp }
-
-        private val defaultPointerCornerRadius: Float by lazy { DEFAULT_CORNER_RADIUS.dp }
-
-        private val defaultTextSize: Float by lazy { DEFAULT_TEXT_SIZE.sp }
-
-        private val defaultTextFont: Int by lazy { R.font.display_regular }
-
-        internal fun parse(viewAttributes: ViewAttributes) {
-            viewAttributes.apply {
-                pointerBackgroundColor = getPointerBackgroundColor()
-                stripBackgroundColor = getStripBackgroundColor()
-                textColorOnPoint = getTextColorOnPoint()
-                textColorOnSurface = getTextColorOnSurface()
-                pointerCornerRadius = getPointerCornerRadius()
-                stripThickness = getStripThickness()
-                textSize = getTextSize()
-                fontFamily = getFontRes()
-                mode = getModes()
-            }
-
-            typedAttributes?.recycle()
-        }
-
-        private fun getModes(): Mode {
-            return with(typedAttributes?.getInt(R.styleable.ScopePickerView_mode, 2)) {
-                if (this == 1) Mode.Single else Mode.Duo
-            }
-        }
-
-        private fun getPointerBackgroundColor(): Int {
-            return parseColorRes(
-                R.styleable.ScopePickerView_pointerBackgroundColor,
-                defaultPointerBackgroundColor
-            )
-        }
-
-        private fun getStripBackgroundColor(): Int {
-            return parseColorRes(
-                R.styleable.ScopePickerView_stripBackgroundColor,
-                defaultStripBackgroundColor
-            )
-        }
-
-        private fun getTextColorOnPoint(): Int {
-            return parseColorRes(
-                R.styleable.ScopePickerView_textColorOnPoint,
-                defaultTextColorOnPoint
-            )
-        }
-
-        private fun getTextColorOnSurface(): Int {
-            return parseColorRes(
-                R.styleable.ScopePickerView_textColorOnSurface,
-                defaultTextColorOnSurface
-            )
-        }
-
-        private fun getPointerCornerRadius() =
-            parseDimensionRes(
-                R.styleable.ScopePickerView_pointerCornerRadius,
-                defaultPointerCornerRadius
-            )
-
-        private fun getStripThickness() =
-            parseDimensionRes(R.styleable.ScopePickerView_stripThickness, defaultStripThickness)
-
-        private fun getTextSize() =
-            parseDimensionRes(R.styleable.RangePickerView_android_textSize, defaultTextSize)
-
-        private fun getFontRes(): Typeface? {
-            typedAttributes?.let {
-                val fontResId = it.getResourceId(
-                    R.styleable.RangePickerView_android_fontFamily,
-                    defaultTextFont
-                )
-                return context.getFont(fontResId)
-            }
-
-            return context.getFont(defaultTextFont)
-        }
-
-        private fun parseColorRes(styleableResId: Int, defaultDimension: Int) =
-            typedAttributes?.getColor(styleableResId, defaultDimension) ?: defaultDimension
-
-        private fun parseDimensionRes(styleableResId: Int, defaultDimension: Float) =
-            typedAttributes?.getDimension(styleableResId, defaultDimension) ?: defaultDimension
-
-        companion object {
-            const val DEFAULT_MIN_HEIGHT = 58f
-            const val DEFAULT_CORNER_RADIUS = 74f
-            const val DEFAULT_STROKE_WIDTH = 32f
-            const val DEFAULT_TEXT_SIZE = 14f
-        }
+    private fun getPointerBackgroundColor(): Int {
+      return parseColorRes(
+        R.styleable.ScopePickerView_pointerBackgroundColor,
+        defaultPointerBackgroundColor
+      )
+    }
+
+    private fun getStripBackgroundColor(): Int {
+      return parseColorRes(
+        R.styleable.ScopePickerView_stripBackgroundColor,
+        defaultStripBackgroundColor
+      )
+    }
+
+    private fun getTextColorOnPoint(): Int {
+      return parseColorRes(
+        R.styleable.ScopePickerView_textColorOnPoint,
+        defaultTextColorOnPoint
+      )
+    }
+
+    private fun getTextColorOnSurface(): Int {
+      return parseColorRes(
+        R.styleable.ScopePickerView_textColorOnSurface,
+        defaultTextColorOnSurface
+      )
+    }
+
+    private fun getPointerCornerRadius() =
+      parseDimensionRes(
+        R.styleable.ScopePickerView_pointerCornerRadius,
+        defaultPointerCornerRadius
+      )
+
+    private fun getStripThickness() =
+      parseDimensionRes(R.styleable.ScopePickerView_stripThickness, defaultStripThickness)
+
+    private fun getTextSize() =
+      parseDimensionRes(R.styleable.RangePickerView_android_textSize, defaultTextSize)
+
+    private fun getFontRes(): Typeface? {
+      typedAttributes?.let {
+        val fontResId = it.getResourceId(
+          R.styleable.RangePickerView_android_fontFamily,
+          defaultTextFont
+        )
+        return context.getFont(fontResId)
+      }
+
+      return context.getFont(defaultTextFont)
+    }
+
+    private fun parseColorRes(styleableResId: Int, defaultDimension: Int) =
+      typedAttributes?.getColor(styleableResId, defaultDimension) ?: defaultDimension
+
+    private fun parseDimensionRes(styleableResId: Int, defaultDimension: Float) =
+      typedAttributes?.getDimension(styleableResId, defaultDimension) ?: defaultDimension
+
+    companion object {
+      const val DEFAULT_MIN_HEIGHT = 58f
+      const val DEFAULT_CORNER_RADIUS = 74f
+      const val DEFAULT_STROKE_WIDTH = 32f
+      const val DEFAULT_TEXT_SIZE = 14f
     }
+  }
 }
\ No newline at end of file

From c755a068aab10601b3e1b0140ec0662647b8878b Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Sat, 25 Apr 2020 22:51:00 +0300
Subject: [PATCH 18/28] View updates and improvements - remove ScopePickerView
 - add DuoOptionView - remove useless code - devide functionality by its role
 - refactor code and packages

---
 .../idivision/rangepicker/MainActivity.kt     |  63 ++++-----
 app/src/main/res/layout/activity_main.xml     |   4 +-
 .../rangepickerview/pickers/DuoOptionView.kt  | 126 ++++++++++++++++++
 .../pickers/SingleOptionView.kt               |   5 +
 .../pickers/core/BaseOptionsView.kt           |  57 ++++++++
 .../pickers/core/DuoAgreementExtension.kt     |  13 ++
 .../pickers/core/OptionsAgreement.kt          |  15 +++
 .../pickers/core/UiModificationsAgreement.kt  |  21 +++
 .../rangepicker/RangePickerView.kt            |  10 +-
 .../rangepickerview/scopepicker/BaseView.kt   |  22 ---
 .../scopepicker/PickerAgreement.kt            |  48 -------
 .../scopepicker/ScopePickerView.kt            | 114 ----------------
 .../scopepicker/model/AnimationRect.kt        |  34 -----
 .../scopepicker/model/Options.kt              |   5 +-
 .../scopepicker/model/RectA.kt                |  36 +++++
 .../scopepicker/model/enums/AnimateRect.kt    |   6 -
 .../scopepicker/strategy/DuoPickStrategy.kt   |  65 ---------
 .../strategy/SinglePickStrategy.kt            |  35 -----
 .../scopepicker/strategy/Strategy.kt          |  47 -------
 .../scopepicker/strategy/StrategyAgreement.kt |  20 ---
 .../rangepickerview/util/TouchAssistant.kt    |   1 +
 .../MaxOptionCharactersSizeException.kt       |   2 +-
 .../exceptions/MaxOptionsSizeException.kt     |   2 +-
 .../util/extension/AndroidExtensions.kt       |  22 +--
 .../util/extension/ViewExtensions.kt          |   4 +-
 .../util/view/ViewAttributes.kt               |  33 +++--
 rangepickerview/src/main/res/values/attrs.xml |   4 -
 .../src/main/res/values/styles.xml            |   4 +
 28 files changed, 341 insertions(+), 477 deletions(-)
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/DuoAgreementExtension.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/RectA.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{scopepicker/model => util}/exceptions/MaxOptionCharactersSizeException.kt (65%)
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{scopepicker/model => util}/exceptions/MaxOptionsSizeException.kt (64%)
 create mode 100644 rangepickerview/src/main/res/values/styles.xml

diff --git a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
index b72e10f..e43331b 100644
--- a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
+++ b/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt
@@ -7,46 +7,47 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_main.*
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.Option
 
+
 class MainActivity : AppCompatActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_main)
 
 //        oldView()
-        newView()
+    newView()
+  }
+
+  private fun oldView() {
+    picker.apply {
+      visibility = View.VISIBLE
+      setOptions(getOptions())
+      setDefaultSelectedPositions(0 to 4)
+      setOnRangeSelectedListener { view, leftPoint, rightPoint ->
+        Toast.makeText(
+          this@MainActivity,
+          view.getSelectedIndexes().toString(),
+          Toast.LENGTH_SHORT
+        ).show()
+      }
     }
 
-    private fun oldView() {
-        picker.apply {
-            visibility = View.VISIBLE
-            setOptions(getOptions())
-            setDefaultSelectedPositions(0 to 4)
-            setOnRangeSelectedListener { view, leftPoint, rightPoint ->
-                Toast.makeText(
-                    this@MainActivity,
-                    view.getSelectedIndexes().toString(),
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-        }
-
-        btn_get_values.visibility = View.VISIBLE
-        btn_get_values.setOnClickListener {
-            Toast.makeText(this, "${picker.getSelectedItems()}", Toast.LENGTH_SHORT).show()
-            picker.resetToDefaultState()
-        }
+    btn_get_values.visibility = View.VISIBLE
+    btn_get_values.setOnClickListener {
+      Toast.makeText(this, "${picker.getSelectedItems()}", Toast.LENGTH_SHORT).show()
+      picker.resetToDefaultState()
     }
+  }
 
-    private fun newView() {
-        spv.apply {
-            addOptions(getOptionsStrings())
-        }
+  private fun newView() {
+    dov.apply {
+      addOptions(getOptionsStrings())
     }
+  }
 
-    private fun getOptions(): List<Option> {
-        return getOptionsStrings().map { Option(it) }
-    }
+  private fun getOptions(): List<Option> {
+    return getOptionsStrings().map { Option(it) }
+  }
 
-    private fun getOptionsStrings() = listOf("Single", "2", "3", "4", "5+")
+  private fun getOptionsStrings() = listOf("Single", "2", "3", "4", "5+")
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b43b641..be2e68f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,8 +29,8 @@
         app:backgroundSelectedTint="@color/colorPrimary"
         app:cornerRadius="5dp" />
 
-    <yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
-        android:id="@+id/spv"
+    <yaroslav.ovdiienko.idivision.rangepickerview.pickers.DuoOptionView
+        android:id="@+id/dov"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         android:layout_marginLeft="16dp"
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
new file mode 100644
index 0000000..60d97ff
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
@@ -0,0 +1,126 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.PointF
+import android.graphics.RectF
+import android.util.AttributeSet
+import android.view.MotionEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.BaseOptionsView
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.DuoAgreementExtension
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.RectA
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.update
+
+
+/***/
+class DuoOptionView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyleAttr: Int = 0
+) : BaseOptionsView(context, attrs, defStyleAttr), DuoAgreementExtension {
+
+  /* TODO: handle default style */
+
+  private val leftChip = RectA()
+  private val rightChip = RectA()
+  private var chipToMove = RectA()
+
+  private val chipBackgroundPaint: Paint = getPaint()
+  private val stripBackgroundPaint: Paint = getPaint()
+  private val textPaint: Paint = getPaint()
+
+  private val downPoint: PointF = PointF(EMPTY_POINT, EMPTY_POINT)
+
+  init {
+    chipBackgroundPaint.color = viewAttributes.pointerBackgroundColor
+    /* TODO: set other Paints */
+  }
+
+  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    /* TODO: measure and calculate draw points and sizes */
+  }
+
+  override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+    super.onLayout(changed, left, top, right, bottom)
+    viewBounds.set(left, top, right, bottom)
+
+    /* |V| code below for touch testing only |V| */
+
+    val padding = viewBounds.height() / 8f
+    leftChip.update(
+      10f,
+      padding,
+      140f,
+      viewBounds.height() - padding
+    )
+  }
+
+  override fun onDraw(canvas: Canvas) {
+    super.onDraw(canvas)
+
+    drawChip(canvas, leftChip)
+    drawChip(canvas, rightChip)
+  }
+
+  private fun drawChip(canvas: Canvas, rectF: RectF) {
+    val radius = viewAttributes.pointerCornerRadius
+    canvas.drawRoundRect(rectF, radius, radius, chipBackgroundPaint)
+  }
+
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    when (event.actionMasked) {
+      MotionEvent.ACTION_DOWN -> handleActionDown(event)
+      MotionEvent.ACTION_MOVE -> handleActionMove(event)
+      MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> performClick()
+      else -> return super.onTouchEvent(event)
+    }
+    return true
+  }
+
+  private fun handleActionDown(event: MotionEvent) {
+    downPoint.set(event.rawX, event.rawY)
+
+    when {
+      leftChip.contains(event.x, event.y) -> chipToMove = leftChip
+      rightChip.contains(event.x, event.y) -> chipToMove = rightChip
+    }
+  }
+
+  private fun handleActionMove(event: MotionEvent) {
+    requestDisallowInterceptTouchEvent()
+
+    val delta = downPoint.x - event.rawX
+    moveRect(delta)
+
+    downPoint.x = event.rawX
+    invalidate()
+  }
+
+  override fun performClick(): Boolean {
+    return super.performClick().also {
+      resetDownPoints()
+    }
+  }
+
+  override fun reset(withAnimation: Boolean) {
+    resetDownPoints()
+    /* TODO: reset leftChip and rightChip to calculated initial positions */
+  }
+
+  private fun moveRect(offset: Float) {
+    val newLeft = chipToMove.left - offset
+    val newRight = chipToMove.right - offset
+
+    if (newLeft > 0 && newRight < viewBounds.width()) {
+      chipToMove.left = newLeft
+      chipToMove.right = newRight
+    }
+  }
+
+  private fun resetDownPoints() {
+    downPoint.set(EMPTY_POINT, EMPTY_POINT)
+  }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt
new file mode 100644
index 0000000..135e33a
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt
@@ -0,0 +1,5 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers
+
+
+/* planned in 2.0.0 */
+class SingleOptionView
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
new file mode 100644
index 0000000..0d28ac1
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
@@ -0,0 +1,57 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
+
+import android.content.Context
+import android.graphics.Paint
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.View
+import android.view.WindowManager
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.Options
+import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
+import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
+import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
+
+
+/***/
+abstract class BaseOptionsView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr), OptionsAgreement, UiModificationsAgreement {
+
+  protected val viewAttributes: ViewAttributes = ViewAttributes()
+  protected val dimension: Dimension =
+    DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
+  protected val viewBounds = Rect()
+
+  protected val options: Options = Options()
+
+  init {
+    val parser = ViewAttributes.Parser(context, dimension, attrs)
+    viewAttributes.applyValues(parser)
+  }
+
+  override fun addOption(option: String) {
+    options.addOption(option)
+  }
+
+  override fun addOptions(newOptions: List<String>) {
+    options.addOptions(newOptions)
+  }
+
+  override fun replaceOption(at: Int, newOption: String) {
+    options.replaceOption(at, newOption)
+  }
+
+  override fun getOptions() = options.getOptions()
+
+  override fun clearOptions() {
+    options.clear()
+  }
+
+  protected fun getPaint() = Paint(Paint.ANTI_ALIAS_FLAG)
+
+  companion object {
+    const val EMPTY_POINT = -1f
+  }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/DuoAgreementExtension.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/DuoAgreementExtension.kt
new file mode 100644
index 0000000..fd70213
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/DuoAgreementExtension.kt
@@ -0,0 +1,13 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
+
+
+/* planned in 1.1.0 */
+interface DuoAgreementExtension {
+  // Planned:
+  // fun getSelectedItems(): Pair<Int, Int>
+  // fun setSelectedItems(items: Pair<Int, Int>)
+  // fun addOnScopeSelectedListener(...)
+  // fun removeOnScopeSelectedListener(...)
+  // fun addOnScopeChangeListener(...)
+  // fun removeOnScopeChangeListener(...)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt
new file mode 100644
index 0000000..ad8de81
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt
@@ -0,0 +1,15 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
+
+
+interface OptionsAgreement {
+
+  fun addOption(option: String)
+
+  fun addOptions(newOptions: List<String>)
+
+  fun replaceOption(at: Int, newOption: String)
+
+  fun getOptions(): List<String>
+
+  fun clearOptions()
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt
new file mode 100644
index 0000000..ea8a9bd
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt
@@ -0,0 +1,21 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
+
+
+/* planned in 1.2.0 */
+interface UiModificationsAgreement {
+  fun reset(withAnimation: Boolean = true)
+
+  // Planned:
+  // ShapeDrawable support?
+  // fun setStripColor(color: Int)
+  // fun setSelectedBoxColor(color: Int)
+  // fun setSelectedTextColor(color: Int)
+  // fun setUnselectedTextColor(color: Int)
+  // [?] fun setVibrationPattern(...)
+  // [?] fun enableVibration(...)
+  // [?] fun disableVibration(...)
+  // fun setCornerRadius(radius: Int)
+  // fun setFont(font: Int)
+  // fun setTextSize(size: Int)
+  // fun setStripThickness(thickness: Int)
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
index 3fe040a..09c20e1 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
@@ -18,7 +18,7 @@ import android.view.View
 import android.view.ViewConfiguration
 import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
+import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.RectA
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.Option
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.RectShape
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.AnimatedRectProperties
@@ -39,10 +39,8 @@ class RangePickerView : View {
     private val rectangleBackgroundPaint: Paint = Paint()
     private val lineBackgroundPaint: Paint = Paint()
     private val textPaint: Paint = Paint()
-    private val firstSelectedRect =
-        AnimationRect()
-    private val secondSelectedRect =
-        AnimationRect()
+    private val firstSelectedRect = RectA()
+    private val secondSelectedRect = RectA()
     private val viewBounds = Rect()
 
     private var backgroundSelectedTint: Int = 0
@@ -673,7 +671,7 @@ class RangePickerView : View {
 
     private fun getObjectAnimation(
         property: AnimatedRectProperties,
-        oldRect: AnimationRect,
+        oldRect: RectA,
         rect: RectF,
         duration: Long,
         listener: ValueAnimator.AnimatorUpdateListener? = null
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
deleted file mode 100644
index fe68a83..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/BaseView.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
-
-import android.annotation.TargetApi
-import android.content.Context
-import android.os.Build
-import android.util.AttributeSet
-import android.view.View
-
-
-open class BaseView : View {
-  constructor(context: Context) : super(context)
-  constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
-    context,
-    attrs,
-    defStyleAttr
-  )
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int)
-      : super(context, attrs, defStyleAttr, defStyleRes)
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
deleted file mode 100644
index 12563fe..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/PickerAgreement.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
-
-// TODO: provide documentation
-interface PickerAgreement {
-
-  /***/
-  fun addOption(option: String)
-
-  /***/
-  fun replaceOption(at: Int, newOption: String)
-
-  /***/
-  fun addOptions(newOptions: List<String>)
-
-  /***/
-  fun getOptions(): List<String>
-
-  /***/
-  fun clearOptions()
-
-  /***/
-  fun toSingleChoiceStrategy()
-
-  /***/
-  fun toDuoChoiceStrategy()
-
-  // Planned:
-  // fun getSelectedItems(): Pair<Int, Int>
-  // fun setSelectedItems(items: Pair<Int, Int>)
-  // fun addOnScopeSelectedListener(...)
-  // fun removeOnScopeSelectedListener(...)
-  // fun addOnScopeChangeListener(...)
-  // fun removeOnScopeChangeListener(...)
-  // fun resetToDefaultState(withAnimation: Boolean = true)
-
-  // Nice to have:
-  // fun setStripColor(color: Int)
-  // fun setSelectedBoxColor(color: Int)
-  // fun setSelectedTextColor(color: Int)
-  // fun setUnselectedTextColor(color: Int)
-  // [?] fun setVibrationPattern(...)
-  // [?] fun enableVibration(...)
-  // [?] fun disableVibration(...)
-  // fun setCornerRadius(radius: Int)
-  // fun setFont(font: Int)
-  // fun setTextSize(size: Int)
-  // fun setStripThickness(thickness: Int)
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
deleted file mode 100644
index 12d4597..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/ScopePickerView.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker
-
-import android.content.Context
-import android.content.res.Configuration
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.view.WindowManager
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.DuoPickStrategy
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.SinglePickStrategy
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.Strategy
-import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
-import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.debugAction
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.log
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
-import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
-
-
-class ScopePickerView @JvmOverloads constructor(
-  context: Context,
-  attrs: AttributeSet? = null,
-  defStyleAttr: Int = 0
-) : BaseView(context, attrs, defStyleAttr), PickerAgreement {
-
-  private val dimension: Dimension =
-    DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
-  private val viewAttributes = ViewAttributes()
-  private val viewBounds = Rect()
-
-  private var strategy: Strategy = DuoPickStrategy()
-
-  init {
-    val parser = ViewAttributes.Parser(context, attrs)
-    viewAttributes.applyValues(parser)
-    strategy.receiveAttributes(viewAttributes)
-  }
-
-  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-    strategy.measure(0f)
-  }
-
-  override fun onDraw(canvas: Canvas) {
-    super.onDraw(canvas)
-
-    debugAction {
-      strategy.draw(canvas)
-    }
-  }
-
-  override fun onTouchEvent(event: MotionEvent): Boolean {
-    strategy.touch(event)
-
-    when (event.actionMasked) {
-      MotionEvent.ACTION_DOWN -> {
-      }
-      MotionEvent.ACTION_MOVE -> {
-        requestDisallowInterceptTouchEvent()
-        invalidate()
-      }
-      MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> performClick()
-      else -> return super.onTouchEvent(event)
-    }
-    return true
-  }
-
-  override fun addOption(option: String) {
-    strategy.addOption(option)
-  }
-
-  override fun replaceOption(at: Int, newOption: String) {
-    strategy.replaceOption(at, newOption)
-  }
-
-  override fun addOptions(newOptions: List<String>) {
-    strategy.addOptions(newOptions)
-  }
-
-  override fun getOptions() = strategy.getOptions()
-
-  override fun clearOptions() {
-    strategy.clearOptions()
-  }
-
-  override fun toSingleChoiceStrategy() {
-    log { "view mode changed to single strategy" }
-    strategy = SinglePickStrategy()
-      .apply { receiveAttributes(viewAttributes) }
-    requestLayout()
-  }
-
-  override fun toDuoChoiceStrategy() {
-    log { "view mode changed to duo strategy" }
-    strategy = DuoPickStrategy()
-      .apply { receiveAttributes(viewAttributes) }
-    requestLayout()
-  }
-
-  private fun reset() {
-    log { "view reset triggered" }
-    // TODO: reset rest of the values
-  }
-
-  override fun onConfigurationChanged(newConfig: Configuration?) {
-    super.onConfigurationChanged(newConfig)
-    reset()
-  }
-
-  companion object {
-    internal const val DEBUG = true
-  }
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
deleted file mode 100644
index 04aa151..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/AnimationRect.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
-
-import android.graphics.Rect
-import android.graphics.RectF
-
-
-class AnimationRect : RectF {
-  constructor() : super()
-  constructor(left: Float, top: Float, right: Float, bottom: Float) : super(
-    left,
-    top,
-    right,
-    bottom
-  )
-
-  constructor(r: RectF) : super(r)
-  constructor(r: Rect) : super(r)
-
-  fun setTop(top: Float) {
-    this.top = top
-  }
-
-  fun setBottom(bottom: Float) {
-    this.bottom = bottom
-  }
-
-  fun setRight(right: Float) {
-    this.right = right
-  }
-
-  fun setLeft(left: Float) {
-    this.left = left
-  }
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
index 3149b3b..322c34f 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
@@ -1,10 +1,11 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
 
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxOptionCharactersSizeException
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions.MaxOptionsSizeException
+import yaroslav.ovdiienko.idivision.rangepickerview.util.exceptions.MaxOptionCharactersSizeException
+import yaroslav.ovdiienko.idivision.rangepickerview.util.exceptions.MaxOptionsSizeException
 
 
 data class Options(private val list: MutableList<String> = mutableListOf()) {
+
   fun addOption(option: String) {
     check(option)
     list.add(option)
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/RectA.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/RectA.kt
new file mode 100644
index 0000000..8216aef
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/RectA.kt
@@ -0,0 +1,36 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+
+import android.graphics.Rect
+import android.graphics.RectF
+
+
+class RectA : RectF {
+
+  constructor() : super()
+  constructor(r: RectF) : super(r)
+  constructor(r: Rect) : super(r)
+  constructor(
+    left: Float, top: Float, right: Float, bottom: Float
+  ) : super(left, top, right, bottom)
+
+  fun setTop(value: Float) {
+    this.top = value
+  }
+
+  fun setBottom(value: Float) {
+    this.bottom = value
+  }
+
+  fun setRight(value: Float) {
+    this.right = value
+  }
+
+  fun setLeft(value: Float) {
+    this.left = value
+  }
+
+  companion object {
+    const val LEFT = "left"
+    const val RIGHT = "right"
+  }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
deleted file mode 100644
index 8950138..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/enums/AnimateRect.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.enums
-
-sealed class AnimateRect(val property: String) {
-  object Left : AnimateRect("left")
-  object Right : AnimateRect("right")
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
deleted file mode 100644
index ba6fcfa..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/DuoPickStrategy.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
-
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.Rect
-import android.view.MotionEvent
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
-import yaroslav.ovdiienko.idivision.rangepickerview.util.TouchAssistant
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.debugAction
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.log
-import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
-
-
-class DuoPickStrategy : Strategy() {
-  private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-    style = Paint.Style.FILL
-    color = Color.GREEN
-    strokeWidth = 100f
-  }
-  private val leftBox = AnimationRect()
-  private val rightBox = AnimationRect()
-
-  private val touchAssistant = TouchAssistant()
-
-  override fun getViewBounds(rect: Rect) {
-
-  }
-
-  override fun measure(measuredResults: Float) {
-
-  }
-
-  override fun draw(canvas: Canvas) {
-    debugAction {
-      drawClickRectangles()
-    }
-
-    drawBackgroundBetweenOptions(canvas)
-    // TODO: the same behaviour as in Range Picker View
-  }
-
-  private fun drawClickRectangles() {
-    log { "click rectangles drawn" }
-    // only for drawing clickable rectangles.
-  }
-
-  override fun touch(event: MotionEvent) {
-
-  }
-
-  private fun drawBackgroundBetweenOptions(canvas: Canvas) {
-    canvas.drawLine(
-      leftBox.centerX(),
-      leftBox.centerY(),
-      rightBox.centerX(),
-      rightBox.centerY(),
-      paint
-    )
-  }
-
-  override fun receiveAttributes(attributes: ViewAttributes) {
-
-  }
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
deleted file mode 100644
index d8697b9..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/SinglePickStrategy.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
-
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import android.view.MotionEvent
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.AnimationRect
-import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
-
-
-// Planned in 1.1.0
-class SinglePickStrategy : Strategy() {
-  private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
-  private val box = AnimationRect()
-
-  override fun draw(canvas: Canvas) {
-    // TODO: only one point to draw and set/get options
-  }
-
-  override fun receiveAttributes(attributes: ViewAttributes) {
-    // TODO: parse attributes
-  }
-
-  override fun touch(event: MotionEvent) {
-    // TODO: handle touches
-  }
-
-  override fun measure(measuredResults: Float) {
-    // TODO: handle measure of text and `Rect`s
-  }
-
-  override fun getViewBounds(rect: Rect) {
-    // TODO: work with bounds
-  }
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
deleted file mode 100644
index 86ee7d8..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/Strategy.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
-
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.view.MotionEvent
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.Options
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.State
-import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
-
-
-abstract class Strategy : StrategyAgreement {
-  protected val data: LinkedHashMap<Int, State> = LinkedHashMap()
-  protected val options = Options()
-
-  abstract fun getViewBounds(rect: Rect)
-
-  /***/
-  fun addOption(option: String) {
-    options.addOption(option)
-  }
-
-  /***/
-  fun replaceOption(at: Int, newOption: String) {
-    options.replaceOption(at, newOption)
-  }
-
-  /***/
-  fun addOptions(newOptions: List<String>) {
-    options.addOptions(newOptions)
-  }
-
-  /***/
-  fun getOptions() = options.getOptions()
-
-  /***/
-  fun clearOptions() {
-    options.clear()
-  }
-
-  override fun receiveAttributes(attributes: ViewAttributes) {}
-
-  override fun draw(canvas: Canvas) {}
-
-  override fun touch(event: MotionEvent) {}
-
-  override fun measure(measuredResults: Float) {}
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt
deleted file mode 100644
index 61d7f61..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/strategy/StrategyAgreement.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy
-
-import android.graphics.Canvas
-import android.view.MotionEvent
-import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
-
-
-interface StrategyAgreement {
-  /***/
-  fun receiveAttributes(attributes: ViewAttributes)
-
-  /***/
-  fun draw(canvas: Canvas)
-
-  /***/
-  fun touch(event: MotionEvent)
-
-  /***/
-  fun measure(measuredResults: Float)
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
index a77677f..8257825 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/TouchAssistant.kt
@@ -1,6 +1,7 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.util
 
 
+@Deprecated("Replaced by touch provider")
 class TouchAssistant {
   // TODO: add touch handling
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionCharactersSizeException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/exceptions/MaxOptionCharactersSizeException.kt
similarity index 65%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionCharactersSizeException.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/exceptions/MaxOptionCharactersSizeException.kt
index 800f631..bd3fd58 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionCharactersSizeException.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/exceptions/MaxOptionCharactersSizeException.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
+package yaroslav.ovdiienko.idivision.rangepickerview.util.exceptions
 
 
 class MaxOptionCharactersSizeException : RuntimeException {
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionsSizeException.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/exceptions/MaxOptionsSizeException.kt
similarity index 64%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionsSizeException.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/exceptions/MaxOptionsSizeException.kt
index 668a2e6..b391dd2 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/exceptions/MaxOptionsSizeException.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/exceptions/MaxOptionsSizeException.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.exceptions
+package yaroslav.ovdiienko.idivision.rangepickerview.util.exceptions
 
 
 class MaxOptionsSizeException : RuntimeException {
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
index 4f2830e..675db99 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
@@ -5,28 +5,12 @@ import android.content.res.Resources
 import android.graphics.Typeface
 import android.os.Build
 import android.util.Log
-import android.util.TypedValue
 import androidx.core.content.res.ResourcesCompat
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView.Companion.DEBUG
+import yaroslav.ovdiienko.idivision.rangepickerview.BuildConfig
 
 
 internal fun buildVersionGE(version: Int): Boolean = Build.VERSION.SDK_INT >= version
 
-internal val Float.dp: Float
-  get() = TypedValue.applyDimension(
-    TypedValue.COMPLEX_UNIT_DIP,
-    this,
-    Resources.getSystem().displayMetrics
-  )
-
-internal val Float.sp: Float
-  get() = TypedValue.applyDimension(
-    TypedValue.COMPLEX_UNIT_SP,
-    this,
-    Resources.getSystem().displayMetrics
-  )
-
 internal fun Context.getFont(fontResId: Int): Typeface? {
   return try {
     if (buildVersionGE(Build.VERSION_CODES.O)) {
@@ -45,9 +29,9 @@ internal fun Context.getFont(fontResId: Int): Typeface? {
 }
 
 internal fun Any.log(tag: String = "SPV/Default", msg: () -> String) {
-  if (DEBUG) Log.d(tag, msg.invoke())
+  if (BuildConfig.DEBUG) Log.d(tag, msg.invoke())
 }
 
 internal fun Any.debugAction(action: () -> Unit) {
-  if (DEBUG) action.invoke()
+  if (BuildConfig.DEBUG) action.invoke()
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
index 4199e5e..01d8a6f 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/ViewExtensions.kt
@@ -1,9 +1,9 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
 
 
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.ScopePickerView
+import android.view.View
 
 
-internal fun ScopePickerView.requestDisallowInterceptTouchEvent() {
+internal fun View.requestDisallowInterceptTouchEvent() {
   parent.requestDisallowInterceptTouchEvent(true)
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
index 6335c02..7ad29ef 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
@@ -6,12 +6,8 @@ import android.graphics.Typeface
 import android.util.AttributeSet
 import androidx.core.content.ContextCompat
 import yaroslav.ovdiienko.idivision.rangepickerview.R
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.DuoPickStrategy
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.SinglePickStrategy
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.strategy.Strategy
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.dp
+import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.getFont
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.sp
 
 
 class ViewAttributes {
@@ -39,13 +35,15 @@ class ViewAttributes {
   var fontFamily: Typeface? = null
     private set
 
-  var strategy: Strategy = DuoPickStrategy()
-
   fun applyValues(newValues: Parser) {
     newValues.parse(this)
   }
 
-  class Parser(private val context: Context, private val attrs: AttributeSet?) {
+  class Parser(
+    private val context: Context,
+    private val dimension: Dimension,
+    private val attrs: AttributeSet?
+  ) {
     private val typedAttributes: TypedArray? =
       context.obtainStyledAttributes(attrs, R.styleable.ScopePickerView)
 
@@ -63,11 +61,11 @@ class ViewAttributes {
       ContextCompat.getColor(context, R.color.colorGreyBgPiker)
     }
 
-    private val defaultStripThickness: Float by lazy { DEFAULT_STROKE_WIDTH.dp }
+    private val defaultStripThickness: Float by lazy { dimension.dpToPx(DEFAULT_STROKE_WIDTH) }
 
-    private val defaultPointerCornerRadius: Float by lazy { DEFAULT_CORNER_RADIUS.dp }
+    private val defaultPointerCornerRadius: Float by lazy { dimension.dpToPx(DEFAULT_CORNER_RADIUS) }
 
-    private val defaultTextSize: Float by lazy { DEFAULT_TEXT_SIZE.sp }
+    private val defaultTextSize: Float by lazy { dimension.spToPx(DEFAULT_TEXT_SIZE) }
 
     private val defaultTextFont: Int by lazy { R.font.display_regular }
 
@@ -81,18 +79,11 @@ class ViewAttributes {
         stripThickness = getStripThickness()
         textSize = getTextSize()
         fontFamily = getFontRes()
-        strategy = getStrategy()
       }
 
       typedAttributes?.recycle()
     }
 
-    private fun getStrategy(): Strategy {
-      return with(typedAttributes?.getInt(R.styleable.ScopePickerView_mode, 2)) {
-        if (this == 1) SinglePickStrategy() else DuoPickStrategy()
-      }
-    }
-
     private fun getPointerBackgroundColor(): Int {
       return parseColorRes(
         R.styleable.ScopePickerView_pointerBackgroundColor,
@@ -158,4 +149,10 @@ class ViewAttributes {
       const val DEFAULT_TEXT_SIZE = 14f
     }
   }
+
+  /* planned in 1.1.0 */
+  class AttributesBuilder(
+    private val context: Context,
+    private val dimension: Dimension
+  ) {}
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/res/values/attrs.xml b/rangepickerview/src/main/res/values/attrs.xml
index 7eea09c..7680401 100644
--- a/rangepickerview/src/main/res/values/attrs.xml
+++ b/rangepickerview/src/main/res/values/attrs.xml
@@ -21,10 +21,6 @@
         <attr name="textColorOnPoint" format="color" />
         <attr name="textColorOnSurface" />
         <attr name="pointerCornerRadius" format="dimension" />
-        <attr name="mode" format="enum">
-            <enum name="single" value="1" />
-            <enum name="dual" value="2" />
-        </attr>
         <attr name="stripThickness" />
         <attr name="android:textSize" />
         <attr name="android:fontFamily" />
diff --git a/rangepickerview/src/main/res/values/styles.xml b/rangepickerview/src/main/res/values/styles.xml
new file mode 100644
index 0000000..0323fbb
--- /dev/null
+++ b/rangepickerview/src/main/res/values/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- TODO: add default style -->
+</resources>
\ No newline at end of file

From 39924576ecaf06ab7cfe685f1601e1d64ca1ca11 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Sat, 25 Apr 2020 22:55:04 +0300
Subject: [PATCH 19/28] - remove scopepicker package

---
 .../rangepickerview/pickers/DuoOptionView.kt          | 11 +++++++----
 .../rangepickerview/pickers/core/BaseOptionsView.kt   |  5 +++--
 .../{scopepicker/model => pickers/core}/RectA.kt      |  2 +-
 .../{scopepicker/model => pickers/models}/Options.kt  |  2 +-
 .../{scopepicker/model => pickers/models}/State.kt    |  2 +-
 .../rangepickerview/rangepicker/RangePickerView.kt    |  8 +++++---
 .../rangepickerview/scopepicker/model/Coordinates.kt  |  9 ---------
 .../{scopepicker/model => util}/CalculationsHelper.kt |  2 +-
 8 files changed, 19 insertions(+), 22 deletions(-)
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{scopepicker/model => pickers/core}/RectA.kt (89%)
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{scopepicker/model => pickers/models}/Options.kt (94%)
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{scopepicker/model => pickers/models}/State.kt (75%)
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/{scopepicker/model => util}/CalculationsHelper.kt (90%)

diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
index 60d97ff..2d3b606 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
@@ -9,7 +9,7 @@ import android.util.AttributeSet
 import android.view.MotionEvent
 import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.BaseOptionsView
 import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.DuoAgreementExtension
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.RectA
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.RectA
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.update
 
@@ -23,9 +23,12 @@ class DuoOptionView @JvmOverloads constructor(
 
   /* TODO: handle default style */
 
-  private val leftChip = RectA()
-  private val rightChip = RectA()
-  private var chipToMove = RectA()
+  private val leftChip =
+    RectA()
+  private val rightChip =
+    RectA()
+  private var chipToMove =
+    RectA()
 
   private val chipBackgroundPaint: Paint = getPaint()
   private val stripBackgroundPaint: Paint = getPaint()
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
index 0d28ac1..415e1cb 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
@@ -6,7 +6,7 @@ import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.View
 import android.view.WindowManager
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.Options
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.models.Options
 import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
 import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
 import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
@@ -24,7 +24,8 @@ abstract class BaseOptionsView @JvmOverloads constructor(
     DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
   protected val viewBounds = Rect()
 
-  protected val options: Options = Options()
+  protected val options: Options =
+    Options()
 
   init {
     val parser = ViewAttributes.Parser(context, dimension, attrs)
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/RectA.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/RectA.kt
similarity index 89%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/RectA.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/RectA.kt
index 8216aef..81ea7e8 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/RectA.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/RectA.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
 
 import android.graphics.Rect
 import android.graphics.RectF
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/Options.kt
similarity index 94%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/Options.kt
index 322c34f..ab9f0d8 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Options.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/Options.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.models
 
 import yaroslav.ovdiienko.idivision.rangepickerview.util.exceptions.MaxOptionCharactersSizeException
 import yaroslav.ovdiienko.idivision.rangepickerview.util.exceptions.MaxOptionsSizeException
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/State.kt
similarity index 75%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/State.kt
index 18899d9..2510a65 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/State.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/State.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.models
 
 import android.graphics.Rect
 import android.graphics.RectF
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
index 09c20e1..d4870df 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
@@ -18,7 +18,7 @@ import android.view.View
 import android.view.ViewConfiguration
 import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
-import yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model.RectA
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.RectA
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.Option
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.RectShape
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.AnimatedRectProperties
@@ -39,8 +39,10 @@ class RangePickerView : View {
     private val rectangleBackgroundPaint: Paint = Paint()
     private val lineBackgroundPaint: Paint = Paint()
     private val textPaint: Paint = Paint()
-    private val firstSelectedRect = RectA()
-    private val secondSelectedRect = RectA()
+    private val firstSelectedRect =
+        RectA()
+    private val secondSelectedRect =
+        RectA()
     private val viewBounds = Rect()
 
     private var backgroundSelectedTint: Int = 0
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt
deleted file mode 100644
index b9f47fd..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/Coordinates.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
-
-
-data class Coordinates(
-  val left: Float,
-  val top: Float,
-  val right: Float,
-  val bottom: Float
-)
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/CalculationsHelper.kt
similarity index 90%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/CalculationsHelper.kt
index 10485b3..d7212a8 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/scopepicker/model/CalculationsHelper.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/CalculationsHelper.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.scopepicker.model
+package yaroslav.ovdiienko.idivision.rangepickerview.util
 
 
 import kotlin.math.abs

From 26967349750491c367bfa046c8683e0932d4eb9a Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <uptechandroidteam@Yaroslavs-MacBook-Pro.local>
Date: Sat, 25 Apr 2020 22:57:25 +0300
Subject: [PATCH 20/28] - add comments to RangePickerView

---
 .../idivision/rangepickerview/rangepicker/RangePickerView.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
index d4870df..a03375e 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
@@ -34,7 +34,8 @@ import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 
-@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
+/* Will be dropped in 2.0.0 */
+@Deprecated("RangePickerView is no more valid. Please replace it with another picker.")
 class RangePickerView : View {
     private val rectangleBackgroundPaint: Paint = Paint()
     private val lineBackgroundPaint: Paint = Paint()

From fb5289610748c79e2f3664e0937bd293c2e6a24e Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP.local>
Date: Fri, 9 Apr 2021 10:34:32 +0300
Subject: [PATCH 21/28] DuoOptionView improvements: - add black to white text
 transition for selected rectangles - move drawing code to the base class -
 fix view on layout calculations - add debug drawings - add debug menu - add
 mesure calculations

---
 .gitignore                                    |   3 +
 app/build.gradle                              |  37 +--
 app/src/main/res/layout/activity_main.xml     |   4 +-
 build.gradle                                  |   8 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 rangepickerview/build.gradle                  |  40 +++-
 rangepickerview/src/main/AndroidManifest.xml  |   4 +
 .../rangepickerview/pickers/DuoOptionView.kt  | 147 +++++++-----
 .../pickers/SingleOptionView.kt               |  11 +-
 .../pickers/core/BaseOptionsView.kt           | 210 +++++++++++++++++-
 .../pickers/core/OptionsAgreement.kt          |   5 -
 .../pickers/core/UiModificationsAgreement.kt  |   1 -
 .../pickers/core/{ => model}/RectA.kt         |   4 +-
 .../pickers/models/Intersection.kt            |   8 +
 .../rangepickerview/pickers/models/State.kt   |   8 +-
 .../rangepicker/RangePickerView.kt            |   2 +-
 .../model/enums/AnimatedRectProperties.kt     |   1 +
 .../rangepickerview/util/Dimension.kt         |   2 -
 .../rangepickerview/util/DisplayUtils.kt      |  13 +-
 .../rangepickerview/util/debug/DebugFlags.kt  |   8 +
 .../rangepickerview/util/debug/DebugModule.kt |  20 ++
 .../rangepickerview/util/debug/DebugPlugin.kt |  11 +
 .../util/debug/DebugToolsScreen.kt            |  23 ++
 .../util/extension/AndroidExtensions.kt       |   9 +-
 .../util/extension/PaintExtensions.kt         |  36 ---
 .../util/extension/RectExtensions.kt          |  13 ++
 .../util/view/ViewAttributes.kt               |  26 +--
 .../src/main/res/layout/debug_activity.xml    |  17 ++
 .../src/main/res/layout/debug_plugin_item.xml |  46 ++++
 rangepickerview/src/main/res/values/attrs.xml |  14 +-
 30 files changed, 545 insertions(+), 190 deletions(-)
 rename rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/{ => model}/RectA.kt (88%)
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/Intersection.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt
 create mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
 create mode 100644 rangepickerview/src/main/res/layout/debug_activity.xml
 create mode 100644 rangepickerview/src/main/res/layout/debug_plugin_item.xml

diff --git a/.gitignore b/.gitignore
index 8abd061..4176dd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,9 @@ captures/
 .idea/markdown-navigator.xml
 .idea/codeStyles
 .idea/codeStyles/Project.xml
+.idea/compiler.xml
+.idea/jarRepositories.xml
+
 ≈codeStyles
 
 # Android Studio 3 in .gitignore file.
diff --git a/app/build.gradle b/app/build.gradle
index cd79f1a..f90a36a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
     testOptions {
@@ -47,38 +47,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Android libs
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.1.0'
-
-    // Hyperion
-    def hyperionVersion = '0.9.27'
-    debugImplementation ("com.willowtreeapps.hyperion:hyperion-core:$hyperionVersion") {
-        exclude module: 'support-annotations'
-        exclude module: 'support-v4'
-        exclude module: 'support-v13'
-        exclude module: 'recyclerview-v7'
-        exclude module: 'appcompat-v7'
-        exclude module: 'design'
-    }
-    debugImplementation ("com.willowtreeapps.hyperion:hyperion-attr:$hyperionVersion") {
-        exclude module: 'support-annotations'
-        exclude module: 'support-v4'
-        exclude module: 'support-v13'
-        exclude module: 'recyclerview-v7'
-        exclude module: 'appcompat-v7'
-        exclude module: 'design'
-    }
-    debugImplementation ("com.willowtreeapps.hyperion:hyperion-measurement:$hyperionVersion") {
-        exclude module: 'support-annotations'
-        exclude module: 'support-v4'
-        exclude module: 'support-v13'
-        exclude module: 'recyclerview-v7'
-        exclude module: 'appcompat-v7'
-        exclude module: 'design'
-    }
-
-    kapt 'com.google.auto.service:auto-service:1.0-rc6'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'com.google.android.material:material:1.2.1'
 
     // Tests
     testImplementation 'junit:junit:4.12'
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index be2e68f..1cb0d14 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -33,7 +33,7 @@
         android:id="@+id/dov"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp" />
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp" />
 </LinearLayout>
 
diff --git a/build.gradle b/build.gradle
index 8f36277..f0aaf21 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.50'
+    ext.kotlin_version = '1.4.10'
+
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8516ef7..02345ca 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Mar 29 02:48:18 EET 2020
+#Tue Sep 15 18:39:25 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/rangepickerview/build.gradle b/rangepickerview/build.gradle
index 2f7a3f0..af416e8 100644
--- a/rangepickerview/build.gradle
+++ b/rangepickerview/build.gradle
@@ -1,15 +1,16 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.yaroslav-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
 
         versionCode 3
         versionName "1.0.8-beta02"
@@ -19,13 +20,13 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
     testOptions {
@@ -41,7 +42,36 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Android libs
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+
+    // Hyperion
+    def hyperionVersion = '0.9.27'
+    debugImplementation("com.willowtreeapps.hyperion:hyperion-core:$hyperionVersion") {
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+        exclude module: 'design'
+    }
+    debugImplementation("com.willowtreeapps.hyperion:hyperion-attr:$hyperionVersion") {
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+        exclude module: 'design'
+    }
+    debugImplementation("com.willowtreeapps.hyperion:hyperion-measurement:$hyperionVersion") {
+        exclude module: 'support-annotations'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'appcompat-v7'
+        exclude module: 'design'
+    }
+
+    kapt 'com.google.auto.service:auto-service:1.0-rc6'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'
diff --git a/rangepickerview/src/main/AndroidManifest.xml b/rangepickerview/src/main/AndroidManifest.xml
index c7b42c6..d877b72 100644
--- a/rangepickerview/src/main/AndroidManifest.xml
+++ b/rangepickerview/src/main/AndroidManifest.xml
@@ -2,4 +2,8 @@
     package="yaroslav.ovdiienko.idivision.rangepickerview">
 
     <uses-permission android:name="android.permission.VIBRATE" />
+
+    <application android:label="@string/app_name">
+        <activity android:name=".util.debug.DebugToolsScreen" />
+    </application>
 </manifest>
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
index 2d3b606..f73292a 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
@@ -3,15 +3,14 @@ package yaroslav.ovdiienko.idivision.rangepickerview.pickers
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
-import android.graphics.PointF
-import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.MotionEvent
 import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.BaseOptionsView
 import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.DuoAgreementExtension
-import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.RectA
-import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.model.RectA
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.debugDraw
 import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.update
+import kotlin.math.abs
 
 
 /***/
@@ -23,68 +22,112 @@ class DuoOptionView @JvmOverloads constructor(
 
   /* TODO: handle default style */
 
-  private val leftChip =
-    RectA()
-  private val rightChip =
-    RectA()
-  private var chipToMove =
-    RectA()
+  private val leftChip: RectA = RectA()
+  private val rightChip: RectA = RectA()
 
   private val chipBackgroundPaint: Paint = getPaint()
   private val stripBackgroundPaint: Paint = getPaint()
   private val textPaint: Paint = getPaint()
-
-  private val downPoint: PointF = PointF(EMPTY_POINT, EMPTY_POINT)
+  private val debugPointPaint: Paint by lazy { getDebugPaint() }
 
   init {
     chipBackgroundPaint.color = viewAttributes.pointerBackgroundColor
+
+    textPaint.apply {
+      textSize = viewAttributes.textSize
+      typeface = viewAttributes.fontFamily
+      textAlign = Paint.Align.CENTER
+    }
+
+    stripBackgroundPaint.apply {
+      color = viewAttributes.stripBackgroundColor
+      strokeWidth = viewAttributes.stripThickness
+    }
+
     /* TODO: set other Paints */
   }
 
-  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-    /* TODO: measure and calculate draw points and sizes */
+  override fun calculateTextWidthSum() {
+    textWidthSum = 0
+
+    options.getOptions().forEachIndexed { index, option ->
+      states[index].position = index
+      textPaint.getTextBounds(option, 0, option.length, states[index].textBounds)
+      textWidthSum += states[index].textBounds.width()
+    }
   }
 
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
-    viewBounds.set(left, top, right, bottom)
 
-    /* |V| code below for touch testing only |V| */
+    cellWidth = (viewBounds.width().toFloat() - textWidthSum) / options.getOptions().size
+    spaceBetweenCells = cellWidth / options.getOptions().size
+
+    /* TODO: [2.0.0] add ability to change default selected items */
+    val lastElementIndex = options.getOptions().size - 1
+    var previousRight = spaceBetweenCells
+
+    options.getOptions().forEachIndexed { index, option ->
+
+      val coordinates = states[index].textCoordinates
+      val widthOfText = textPaint.measureText(option)
+      val topMargin = viewBounds.height() / 30f
+
+      states[index].textCoordinates
+        .update(
+          top = topMargin,
+          left = if (index == 0) previousRight else previousRight + spaceBetweenCells - (spaceBetweenCells / options.getOptions().size),
+          right = previousRight + cellWidth + (widthOfText / lastElementIndex) + (spaceBetweenCells / options.getOptions().size),
+          bottom = viewBounds.height() - topMargin
+        )
+
+      previousRight = coordinates.right
+    }
+
+    val adjustment = ((viewBounds.width().toFloat() - textWidthSum) - (previousRight)) / options.getOptions().size
 
-    val padding = viewBounds.height() / 8f
-    leftChip.update(
-      10f,
-      padding,
-      140f,
-      viewBounds.height() - padding
-    )
+    states.forEach { state ->
+      state.textCoordinates.update(
+        left = state.textCoordinates.left + abs(adjustment),
+        right = state.textCoordinates.right + abs(adjustment)
+      )
+
+      // FIXME: restore left/right chips selected state.
+      if (state.position == 0) {
+        leftChip.set(state.textCoordinates)
+      } else if (state.position == lastElementIndex) {
+        rightChip.set(state.textCoordinates)
+      }
+    }
   }
 
   override fun onDraw(canvas: Canvas) {
     super.onDraw(canvas)
 
-    drawChip(canvas, leftChip)
-    drawChip(canvas, rightChip)
-  }
+    states.forEach {
+      drawClickableChip(canvas, it.textCoordinates, chipBackgroundPaint)
+    }
 
-  private fun drawChip(canvas: Canvas, rectF: RectF) {
-    val radius = viewAttributes.pointerCornerRadius
-    canvas.drawRoundRect(rectF, radius, radius, chipBackgroundPaint)
-  }
+    drawStrip(canvas, leftChip, rightChip, stripBackgroundPaint)
+    drawChip(canvas, leftChip, chipBackgroundPaint)
+    drawChip(canvas, rightChip, chipBackgroundPaint)
+    drawTexts(canvas, textPaint, isMask = false)
 
-  override fun onTouchEvent(event: MotionEvent): Boolean {
-    when (event.actionMasked) {
-      MotionEvent.ACTION_DOWN -> handleActionDown(event)
-      MotionEvent.ACTION_MOVE -> handleActionMove(event)
-      MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> performClick()
-      else -> return super.onTouchEvent(event)
-    }
-    return true
+    canvas.save()
+    canvas.clipRect(leftChip)
+    drawTexts(canvas, textPaint, isMask = true)
+    canvas.restore()
+
+    canvas.save()
+    canvas.clipRect(rightChip)
+    drawTexts(canvas, textPaint, isMask = true)
+    canvas.restore()
+
+    debugDraw { drawHelpingRectangles(canvas, chipToMove, debugPointPaint) }
   }
 
-  private fun handleActionDown(event: MotionEvent) {
-    downPoint.set(event.rawX, event.rawY)
+  override fun handleActionDown(event: MotionEvent) {
+    super.handleActionDown(event)
 
     when {
       leftChip.contains(event.x, event.y) -> chipToMove = leftChip
@@ -92,8 +135,8 @@ class DuoOptionView @JvmOverloads constructor(
     }
   }
 
-  private fun handleActionMove(event: MotionEvent) {
-    requestDisallowInterceptTouchEvent()
+  override fun handleActionMove(event: MotionEvent) {
+    super.handleActionMove(event)
 
     val delta = downPoint.x - event.rawX
     moveRect(delta)
@@ -103,27 +146,11 @@ class DuoOptionView @JvmOverloads constructor(
   }
 
   override fun performClick(): Boolean {
-    return super.performClick().also {
-      resetDownPoints()
-    }
+    return super.performClick().also { resetDownPoints() }
   }
 
   override fun reset(withAnimation: Boolean) {
     resetDownPoints()
     /* TODO: reset leftChip and rightChip to calculated initial positions */
   }
-
-  private fun moveRect(offset: Float) {
-    val newLeft = chipToMove.left - offset
-    val newRight = chipToMove.right - offset
-
-    if (newLeft > 0 && newRight < viewBounds.width()) {
-      chipToMove.left = newLeft
-      chipToMove.right = newRight
-    }
-  }
-
-  private fun resetDownPoints() {
-    downPoint.set(EMPTY_POINT, EMPTY_POINT)
-  }
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt
index 135e33a..9e141f2 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/SingleOptionView.kt
@@ -1,5 +1,14 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.pickers
 
+import android.content.Context
+import android.util.AttributeSet
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.BaseOptionsView
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.DuoAgreementExtension
+
 
 /* planned in 2.0.0 */
-class SingleOptionView
\ No newline at end of file
+abstract class SingleOptionView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyleAttr: Int = 0
+) : BaseOptionsView(context, attrs, defStyleAttr), DuoAgreementExtension
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
index 415e1cb..cf20ea0 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
@@ -1,15 +1,23 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
 
 import android.content.Context
-import android.graphics.Paint
-import android.graphics.Rect
+import android.graphics.*
 import android.util.AttributeSet
+import android.view.MotionEvent
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.model.RectA
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.models.Intersection
 import yaroslav.ovdiienko.idivision.rangepickerview.pickers.models.Options
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.models.State
 import yaroslav.ovdiienko.idivision.rangepickerview.util.Dimension
 import yaroslav.ovdiienko.idivision.rangepickerview.util.DisplayUtils
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.log
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.requestDisallowInterceptTouchEvent
+import yaroslav.ovdiienko.idivision.rangepickerview.util.extension.update
 import yaroslav.ovdiienko.idivision.rangepickerview.util.view.ViewAttributes
+import kotlin.math.min
 
 
 /***/
@@ -22,36 +30,228 @@ abstract class BaseOptionsView @JvmOverloads constructor(
   protected val viewAttributes: ViewAttributes = ViewAttributes()
   protected val dimension: Dimension =
     DisplayUtils(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager)
-  protected val viewBounds = Rect()
 
-  protected val options: Options =
-    Options()
+  protected val viewBounds: Rect = Rect()
+  protected val leftBound: RectF = RectF()
+  protected val rightBound: RectF = RectF()
+  protected var chipToMove: RectA? = null
+
+  protected val downPoint: PointF = PointF(EMPTY_POINT, EMPTY_POINT)
+
+  protected val options: Options = Options()
+  protected val states: MutableList<State> = mutableListOf()
+  protected var textWidthSum: Int = 0
+  protected var cellWidth: Float = 0f
+  protected var spaceBetweenCells: Float = 0f
 
   init {
     val parser = ViewAttributes.Parser(context, dimension, attrs)
     viewAttributes.applyValues(parser)
   }
 
+  abstract fun calculateTextWidthSum()
+
+  override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+
+    val parameters = layoutParams as ViewGroup.MarginLayoutParams
+
+    /* TODO: [2.0.0] add min height control */
+    minimumHeight = dimension.toDp(ViewAttributes.Parser.DEFAULT_MIN_HEIGHT).toInt()
+
+    val desiredWidth =
+      suggestedMinimumWidth + paddingLeft + paddingRight + parameters.marginStart + parameters.marginEnd
+    val desiredHeight =
+      suggestedMinimumHeight + paddingTop + paddingBottom + parameters.topMargin + parameters.bottomMargin
+
+    setMeasuredDimension(
+      measureDimension(desiredWidth, widthMeasureSpec),
+      measureDimension(desiredHeight, heightMeasureSpec)
+    )
+  }
+
+  private fun measureDimension(desiredSize: Int, measureSpec: Int): Int {
+    val specMode = MeasureSpec.getMode(measureSpec)
+    val specSize = MeasureSpec.getSize(measureSpec)
+
+    var result: Int
+    if (specMode == MeasureSpec.EXACTLY) {
+      result = specSize
+    } else {
+      result = desiredSize
+      if (specMode == MeasureSpec.AT_MOST) {
+        result = min(result, specSize)
+      }
+    }
+
+    if (result < desiredSize) {
+      log(isDebug = false) { "The view is too small, the content might get cut" }
+    }
+
+    return result
+  }
+
+  override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+    super.onLayout(changed, left, top, right, bottom)
+    getLocalVisibleRect(viewBounds)
+
+    leftBound.set(viewBounds)
+    rightBound.set(viewBounds)
+
+    leftBound.update(right = viewBounds.left + 10f)
+    rightBound.update(left = viewBounds.right - 10f)
+  }
+
+  protected fun drawHelpingRectangles(canvas: Canvas, rect: RectF?, paint: Paint) {
+    val y = (rect?.height() ?: 0f) / 2
+
+    canvas.drawPoint(rect?.left ?: 0f, y, paint)
+    canvas.drawPoint(rect?.right ?: 0f, y, paint)
+
+    canvas.drawRect(leftBound, paint)
+    canvas.drawRect(rightBound, paint)
+  }
+
+  protected fun drawStrip(canvas: Canvas, startRect: RectF, endRect: RectF, paint: Paint) {
+    canvas.drawLine(
+      startRect.centerX(),
+      startRect.centerY(),
+      endRect.centerX(),
+      endRect.centerY(),
+      paint
+    )
+  }
+
+  protected fun drawChip(canvas: Canvas, rect: RectF, paint: Paint) {
+    paint.color = viewAttributes.pointerBackgroundColor
+
+    val radius = viewAttributes.pointerCornerRadius
+    canvas.drawRoundRect(rect, radius, radius, paint)
+  }
+
+  protected fun drawClickableChip(canvas: Canvas, rect: RectF, paint: Paint) {
+    paint.color = Color.TRANSPARENT
+
+    val radius = viewAttributes.pointerCornerRadius
+    canvas.drawRoundRect(rect, radius, radius, paint)
+  }
+
+  protected fun drawTexts(canvas: Canvas, paint: Paint, isMask: Boolean) {
+    paint.apply {
+      color = when {
+        isMask -> {
+          viewAttributes.textColorOnPoint
+        }
+        else -> viewAttributes.textColorOnSurface
+      }
+    }
+
+    states.forEach { state ->
+      canvas.drawText(
+        options.getOption(state.position),
+        state.textCoordinates.centerX(),
+        state.textCoordinates.centerY() + state.textBounds.height() / 3.5f,
+        paint
+      )
+    }
+  }
+
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    when (event.action and MotionEvent.ACTION_MASK) {
+      MotionEvent.ACTION_DOWN -> handleActionDown(event)
+      MotionEvent.ACTION_MOVE -> handleActionMove(event)
+      MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> performClick()
+      else -> return super.onTouchEvent(event)
+    }
+    return true
+  }
+
+  open fun handleActionDown(event: MotionEvent) {
+    downPoint.set(event.rawX, event.rawY)
+  }
+
+  open fun handleActionMove(event: MotionEvent) {
+    requestDisallowInterceptTouchEvent()
+  }
+
+  protected fun moveRect(offset: Float) {
+    chipToMove?.run {
+      val direction = when {
+        intersects(leftBound) -> Intersection.Left
+        intersects(rightBound) -> Intersection.Right
+        else -> Intersection.Undefined
+      }
+
+      moveRectOutOfBounds(direction, this)
+      if (direction !is Intersection.Undefined) return
+
+      val newLeft = left - offset
+      val newRight = right - offset
+
+      left = newLeft
+      right = newRight
+    }
+  }
+
+  private fun moveRectOutOfBounds(intersection: Intersection, r: RectA) {
+    with(r) {
+      when (intersection) {
+        is Intersection.Left -> {
+          left += 1
+          right += 1
+        }
+        is Intersection.Right -> {
+          left -= 1
+          right -= 1
+        }
+        Intersection.Undefined -> {
+          // Ignore.
+        }
+      }
+    }
+  }
+
+  protected fun resetDownPoints() {
+    downPoint.set(EMPTY_POINT, EMPTY_POINT)
+    chipToMove = null
+  }
+
   override fun addOption(option: String) {
     options.addOption(option)
+    states.add(State())
+    calculateTextWidthSum()
+    requestLayout()
   }
 
   override fun addOptions(newOptions: List<String>) {
     options.addOptions(newOptions)
+    states.addAll(MutableList(newOptions.size) { State() })
+    calculateTextWidthSum()
+    requestLayout()
   }
 
   override fun replaceOption(at: Int, newOption: String) {
     options.replaceOption(at, newOption)
+    states[at] = State()
+    calculateTextWidthSum()
+    requestLayout()
   }
 
   override fun getOptions() = options.getOptions()
 
   override fun clearOptions() {
     options.clear()
+    textWidthSum = 0
   }
 
   protected fun getPaint() = Paint(Paint.ANTI_ALIAS_FLAG)
 
+  protected fun getDebugPaint() = Paint(Paint.ANTI_ALIAS_FLAG)
+    .apply {
+      color = Color.BLACK
+      strokeWidth = 10f
+    }
+
   companion object {
     const val EMPTY_POINT = -1f
   }
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt
index ad8de81..52e4e1e 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/OptionsAgreement.kt
@@ -2,14 +2,9 @@ package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
 
 
 interface OptionsAgreement {
-
   fun addOption(option: String)
-
   fun addOptions(newOptions: List<String>)
-
   fun replaceOption(at: Int, newOption: String)
-
   fun getOptions(): List<String>
-
   fun clearOptions()
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt
index ea8a9bd..baa1a19 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/UiModificationsAgreement.kt
@@ -6,7 +6,6 @@ interface UiModificationsAgreement {
   fun reset(withAnimation: Boolean = true)
 
   // Planned:
-  // ShapeDrawable support?
   // fun setStripColor(color: Int)
   // fun setSelectedBoxColor(color: Int)
   // fun setSelectedTextColor(color: Int)
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/RectA.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/model/RectA.kt
similarity index 88%
rename from rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/RectA.kt
rename to rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/model/RectA.kt
index 81ea7e8..86774cb 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/RectA.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/model/RectA.kt
@@ -1,4 +1,4 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.model
 
 import android.graphics.Rect
 import android.graphics.RectF
@@ -29,6 +29,8 @@ class RectA : RectF {
     this.left = value
   }
 
+  fun intersects(r: RectF) = intersects(r.left, r.top, r.right, r.bottom)
+
   companion object {
     const val LEFT = "left"
     const val RIGHT = "right"
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/Intersection.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/Intersection.kt
new file mode 100644
index 0000000..40b09ff
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/Intersection.kt
@@ -0,0 +1,8 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.pickers.models
+
+
+sealed class Intersection {
+  object Left : Intersection()
+  object Right : Intersection()
+  object Undefined : Intersection()
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/State.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/State.kt
index 2510a65..6936818 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/State.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/models/State.kt
@@ -6,7 +6,11 @@ import android.graphics.RectF
 
 data class State(
   var textCoordinates: RectF = RectF(),
-  var textPosition: Int = -1,
   var textBounds: Rect = Rect(),
+  var position: Int = UNDEFINED,
   var isSelected: Boolean = false
-)
\ No newline at end of file
+) {
+  companion object {
+    const val UNDEFINED = -1
+  }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
index a03375e..1068d26 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/RangePickerView.kt
@@ -18,7 +18,7 @@ import android.view.View
 import android.view.ViewConfiguration
 import android.view.WindowManager
 import android.view.animation.AccelerateDecelerateInterpolator
-import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.RectA
+import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.model.RectA
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.Option
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.RectShape
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums.AnimatedRectProperties
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/AnimatedRectProperties.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/AnimatedRectProperties.kt
index 0e0052d..398b727 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/AnimatedRectProperties.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/rangepicker/model/enums/AnimatedRectProperties.kt
@@ -1,6 +1,7 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.enums
 
 
+@Deprecated("RangePickerView is no more valid. Please replace it with ScopePikerView.")
 enum class AnimatedRectProperties(val property: String) {
     LEFT("left"),
     RIGHT("right"),
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
index b1855c0..22a17da 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/Dimension.kt
@@ -3,9 +3,7 @@ package yaroslav.ovdiienko.idivision.rangepickerview.util
 
 interface Dimension {
   fun toDp(dp: Float): Float
-  fun dpToPx(px: Float): Float
   fun toSp(sp: Float): Float
-  fun spToPx(px: Float): Float
 
   fun getMinWidthValue(): Int
   fun getMaxWidthValue(): Int
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
index e9f6a85..9dd4590 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/DisplayUtils.kt
@@ -1,6 +1,7 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.util
 
 import android.util.DisplayMetrics
+import android.util.TypedValue
 import android.view.WindowManager
 import kotlin.math.max
 import kotlin.math.min
@@ -13,17 +14,9 @@ class DisplayUtils(private val windowManager: WindowManager) : Dimension {
     windowManager.defaultDisplay.getMetrics(displayMetrics)
   }
 
-  override fun toDp(dp: Float) = multiply(displayMetrics.density, dp)
+  override fun toDp(dp: Float) = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics)
 
-  override fun dpToPx(px: Float) = divide(displayMetrics.density, px)
-
-  override fun toSp(sp: Float) = multiply(displayMetrics.scaledDensity, sp)
-
-  override fun spToPx(px: Float) = divide(displayMetrics.scaledDensity, px)
-
-  private fun divide(metrics: Float, value: Float) = (value / metrics + 0.5f)
-
-  private fun multiply(metrics: Float, value: Float) = (value * metrics + 0.5f)
+  override fun toSp(sp: Float) = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp, displayMetrics)
 
   override fun getMinWidthValue(): Int {
     val display = windowManager.defaultDisplay
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt
new file mode 100644
index 0000000..6b39783
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt
@@ -0,0 +1,8 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
+
+import yaroslav.ovdiienko.idivision.rangepickerview.BuildConfig
+
+
+internal object DebugFlags {
+  var shouldShowHelperDrawings: Boolean = BuildConfig.DEBUG
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt
new file mode 100644
index 0000000..f082877
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt
@@ -0,0 +1,20 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
+
+import android.content.Intent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.willowtreeapps.hyperion.plugin.v1.PluginModule
+import yaroslav.ovdiienko.idivision.rangepickerview.R
+
+class DebugModule : PluginModule() {
+  override fun createPluginView(layoutInflater: LayoutInflater, parent: ViewGroup): View? {
+    return layoutInflater.inflate(R.layout.debug_plugin_item, parent, false)
+      .apply {
+        setOnClickListener {
+          val intent = Intent(it.context, DebugToolsScreen::class.java)
+          it.context.startActivity(intent)
+        }
+      }
+  }
+}
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt
new file mode 100644
index 0000000..01c1f2d
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt
@@ -0,0 +1,11 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
+
+import com.google.auto.service.AutoService
+import com.willowtreeapps.hyperion.plugin.v1.Plugin
+import com.willowtreeapps.hyperion.plugin.v1.PluginModule
+
+
+@AutoService(Plugin::class)
+class DebugPlugin : Plugin() {
+  override fun createPluginModule(): PluginModule = DebugModule()
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt
new file mode 100644
index 0000000..4f81b1a
--- /dev/null
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt
@@ -0,0 +1,23 @@
+package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import kotlinx.android.synthetic.main.debug_activity.*
+import yaroslav.ovdiienko.idivision.rangepickerview.R
+
+
+class DebugToolsScreen : AppCompatActivity(R.layout.debug_activity) {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    invalidateTexts()
+
+    mbDebugDrawings.setOnClickListener {
+      DebugFlags.shouldShowHelperDrawings = !DebugFlags.shouldShowHelperDrawings
+      invalidateTexts()
+    }
+  }
+
+  private fun invalidateTexts() {
+    mbDebugDrawings.text = "${if (DebugFlags.shouldShowHelperDrawings) {"Disable"} else {"Enable"}} debug drawings"
+  }
+}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
index 675db99..7074e73 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.util.Log
 import androidx.core.content.res.ResourcesCompat
 import yaroslav.ovdiienko.idivision.rangepickerview.BuildConfig
+import yaroslav.ovdiienko.idivision.rangepickerview.util.debug.DebugFlags
 
 
 internal fun buildVersionGE(version: Int): Boolean = Build.VERSION.SDK_INT >= version
@@ -28,10 +29,14 @@ internal fun Context.getFont(fontResId: Int): Typeface? {
   }
 }
 
-internal fun Any.log(tag: String = "SPV/Default", msg: () -> String) {
-  if (BuildConfig.DEBUG) Log.d(tag, msg.invoke())
+internal fun Any.log(isDebug: Boolean = true, tag: String = "SPV/Log", msg: () -> String) {
+  if (BuildConfig.DEBUG) Log.d(tag, msg.invoke()) else if (isDebug) Log.i(tag, msg.invoke())
 }
 
 internal fun Any.debugAction(action: () -> Unit) {
   if (BuildConfig.DEBUG) action.invoke()
+}
+
+internal fun Any.debugDraw(action: () -> Unit) {
+  if (DebugFlags.shouldShowHelperDrawings) action.invoke()
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
deleted file mode 100644
index 9f83d8a..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/PaintExtensions.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
-
-import android.graphics.Color
-import android.graphics.Paint
-
-
-fun Paint.applySelectedTextSettings() {
-  this.apply {
-    isAntiAlias = true
-    style = Paint.Style.FILL
-    color = Color.parseColor("#ff000000")
-  }
-}
-
-fun Paint.applyTextSettings() {
-  this.apply {
-    isAntiAlias = true
-    style = Paint.Style.FILL
-    color = Color.parseColor("#ff000000")
-  }
-}
-
-fun Paint.applyStripSettings() {
-  this.apply {
-    isAntiAlias = true
-    style = Paint.Style.FILL
-  }
-}
-
-fun Paint.applySelectedBoxSettings() {
-  this.apply {
-    isAntiAlias = true
-    style = Paint.Style.FILL
-    color = Color.BLUE
-  }
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
index f366b38..8731d8a 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/RectExtensions.kt
@@ -1,5 +1,6 @@
 package yaroslav.ovdiienko.idivision.rangepickerview.util.extension
 
+import android.graphics.Rect
 import android.graphics.RectF
 
 
@@ -14,3 +15,15 @@ internal fun RectF.update(
   this.right = right
   this.bottom = bottom
 }
+
+internal fun Rect.update(
+  left: Int = this.left,
+  top: Int = this.top,
+  right: Int = this.right,
+  bottom: Int = this.bottom
+) {
+  this.left = left
+  this.top = top
+  this.right = right
+  this.bottom = bottom
+}
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
index 7ad29ef..979da18 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/view/ViewAttributes.kt
@@ -45,7 +45,7 @@ class ViewAttributes {
     private val attrs: AttributeSet?
   ) {
     private val typedAttributes: TypedArray? =
-      context.obtainStyledAttributes(attrs, R.styleable.ScopePickerView)
+      context.obtainStyledAttributes(attrs, R.styleable.DuoOptionView)
 
     private val defaultPointerBackgroundColor: Int by lazy {
       ContextCompat.getColor(context, R.color.colorBlueSelectedPicker)
@@ -61,11 +61,11 @@ class ViewAttributes {
       ContextCompat.getColor(context, R.color.colorGreyBgPiker)
     }
 
-    private val defaultStripThickness: Float by lazy { dimension.dpToPx(DEFAULT_STROKE_WIDTH) }
+    private val defaultStripThickness: Float by lazy { dimension.toDp(DEFAULT_STROKE_WIDTH) }
 
-    private val defaultPointerCornerRadius: Float by lazy { dimension.dpToPx(DEFAULT_CORNER_RADIUS) }
+    private val defaultPointerCornerRadius: Float by lazy { dimension.toDp(DEFAULT_CORNER_RADIUS) }
 
-    private val defaultTextSize: Float by lazy { dimension.spToPx(DEFAULT_TEXT_SIZE) }
+    private val defaultTextSize: Float by lazy { dimension.toSp(DEFAULT_TEXT_SIZE) }
 
     private val defaultTextFont: Int by lazy { R.font.display_regular }
 
@@ -86,40 +86,40 @@ class ViewAttributes {
 
     private fun getPointerBackgroundColor(): Int {
       return parseColorRes(
-        R.styleable.ScopePickerView_pointerBackgroundColor,
+        R.styleable.DuoOptionView_pointerBackgroundColor,
         defaultPointerBackgroundColor
       )
     }
 
     private fun getStripBackgroundColor(): Int {
       return parseColorRes(
-        R.styleable.ScopePickerView_stripBackgroundColor,
+        R.styleable.DuoOptionView_stripBackgroundColor,
         defaultStripBackgroundColor
       )
     }
 
     private fun getTextColorOnPoint(): Int {
       return parseColorRes(
-        R.styleable.ScopePickerView_textColorOnPoint,
+        R.styleable.DuoOptionView_textColorOnPoint,
         defaultTextColorOnPoint
       )
     }
 
     private fun getTextColorOnSurface(): Int {
       return parseColorRes(
-        R.styleable.ScopePickerView_textColorOnSurface,
+        R.styleable.DuoOptionView_textColorOnSurface,
         defaultTextColorOnSurface
       )
     }
 
     private fun getPointerCornerRadius() =
       parseDimensionRes(
-        R.styleable.ScopePickerView_pointerCornerRadius,
+        R.styleable.DuoOptionView_pointerCornerRadius,
         defaultPointerCornerRadius
       )
 
     private fun getStripThickness() =
-      parseDimensionRes(R.styleable.ScopePickerView_stripThickness, defaultStripThickness)
+      parseDimensionRes(R.styleable.DuoOptionView_stripThickness, defaultStripThickness)
 
     private fun getTextSize() =
       parseDimensionRes(R.styleable.RangePickerView_android_textSize, defaultTextSize)
@@ -143,10 +143,10 @@ class ViewAttributes {
       typedAttributes?.getDimension(styleableResId, defaultDimension) ?: defaultDimension
 
     companion object {
-      const val DEFAULT_MIN_HEIGHT = 58f
-      const val DEFAULT_CORNER_RADIUS = 74f
+      const val DEFAULT_MIN_HEIGHT = 46f
+      const val DEFAULT_CORNER_RADIUS = 8f
       const val DEFAULT_STROKE_WIDTH = 32f
-      const val DEFAULT_TEXT_SIZE = 14f
+      const val DEFAULT_TEXT_SIZE = 12f
     }
   }
 
diff --git a/rangepickerview/src/main/res/layout/debug_activity.xml b/rangepickerview/src/main/res/layout/debug_activity.xml
new file mode 100644
index 0000000..842bac0
--- /dev/null
+++ b/rangepickerview/src/main/res/layout/debug_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/mbDebugDrawings"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:textAllCaps="false"
+        tools:text="Disable debug drawings" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/rangepickerview/src/main/res/layout/debug_plugin_item.xml b/rangepickerview/src/main/res/layout/debug_plugin_item.xml
new file mode 100644
index 0000000..4f8b832
--- /dev/null
+++ b/rangepickerview/src/main/res/layout/debug_plugin_item.xml
@@ -0,0 +1,46 @@
+<?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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="131dp"
+    android:orientation="horizontal"
+    android:padding="12dp">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="28dp"
+        android:layout_marginRight="28dp"
+        android:duplicateParentState="true"
+        android:src="@android:drawable/ic_lock_power_off"
+        app:tint="@color/colorTextBlack" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:duplicateParentState="true"
+            android:text="Dev Tools"
+            android:textColor="@color/colorTextBlack"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="16dp"
+            android:duplicateParentState="true"
+            android:text="ScopePicker application controlls"
+            android:textColor="@color/colorTextBlack" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/rangepickerview/src/main/res/values/attrs.xml b/rangepickerview/src/main/res/values/attrs.xml
index 7680401..d26559f 100644
--- a/rangepickerview/src/main/res/values/attrs.xml
+++ b/rangepickerview/src/main/res/values/attrs.xml
@@ -2,6 +2,10 @@
 <resources>
     <attr name="textColorOnSurface" format="color" />
     <attr name="stripThickness" format="dimension" />
+    <attr name="pointerBackgroundColor" format="color" />
+    <attr name="stripBackgroundColor" format="color" />
+    <attr name="textColorOnPoint" format="color" />
+    <attr name="pointerCornerRadius" format="dimension" />
 
     <declare-styleable name="RangePickerView">
         <attr name="backgroundSelectedTint" format="color" />
@@ -15,12 +19,12 @@
         <attr name="android:fontFamily" />
     </declare-styleable>
 
-    <declare-styleable name="ScopePickerView">
-        <attr name="pointerBackgroundColor" format="color" />
-        <attr name="stripBackgroundColor" format="color" />
-        <attr name="textColorOnPoint" format="color" />
+    <declare-styleable name="DuoOptionView">
+        <attr name="pointerBackgroundColor" />
+        <attr name="stripBackgroundColor" />
+        <attr name="textColorOnPoint" />
         <attr name="textColorOnSurface" />
-        <attr name="pointerCornerRadius" format="dimension" />
+        <attr name="pointerCornerRadius" />
         <attr name="stripThickness" />
         <attr name="android:textSize" />
         <attr name="android:fontFamily" />

From 299945bb78eca3b0daf64dfcd260e2b9ecc4fabb Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP.local>
Date: Fri, 9 Apr 2021 10:35:30 +0300
Subject: [PATCH 22/28] - move drawStrip method from base view to duo option
 view

---
 .../rangepickerview/pickers/DuoOptionView.kt          | 11 +++++++++++
 .../rangepickerview/pickers/core/BaseOptionsView.kt   | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
index f73292a..9348a44 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/DuoOptionView.kt
@@ -3,6 +3,7 @@ package yaroslav.ovdiienko.idivision.rangepickerview.pickers
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
+import android.graphics.RectF
 import android.util.AttributeSet
 import android.view.MotionEvent
 import yaroslav.ovdiienko.idivision.rangepickerview.pickers.core.BaseOptionsView
@@ -126,6 +127,16 @@ class DuoOptionView @JvmOverloads constructor(
     debugDraw { drawHelpingRectangles(canvas, chipToMove, debugPointPaint) }
   }
 
+  private fun drawStrip(canvas: Canvas, startRect: RectF, endRect: RectF, paint: Paint) {
+    canvas.drawLine(
+      startRect.centerX(),
+      startRect.centerY(),
+      endRect.centerX(),
+      endRect.centerY(),
+      paint
+    )
+  }
+
   override fun handleActionDown(event: MotionEvent) {
     super.handleActionDown(event)
 
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
index cf20ea0..82b46d2 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/pickers/core/BaseOptionsView.kt
@@ -112,16 +112,6 @@ abstract class BaseOptionsView @JvmOverloads constructor(
     canvas.drawRect(rightBound, paint)
   }
 
-  protected fun drawStrip(canvas: Canvas, startRect: RectF, endRect: RectF, paint: Paint) {
-    canvas.drawLine(
-      startRect.centerX(),
-      startRect.centerY(),
-      endRect.centerX(),
-      endRect.centerY(),
-      paint
-    )
-  }
-
   protected fun drawChip(canvas: Canvas, rect: RectF, paint: Paint) {
     paint.color = viewAttributes.pointerBackgroundColor
 

From 0e85091360e8b7916191ffd4e2a14746cf92c531 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP.local>
Date: Fri, 9 Apr 2021 10:57:31 +0300
Subject: [PATCH 23/28] - fix release compile issues

---
 rangepickerview/build.gradle                           | 9 +++++++--
 rangepickerview/src/main/res/layout/debug_activity.xml | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rangepickerview/build.gradle b/rangepickerview/build.gradle
index af416e8..4409ee6 100644
--- a/rangepickerview/build.gradle
+++ b/rangepickerview/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.yaroslav-android'
@@ -23,6 +23,11 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            minifyEnabled false
+            testCoverageEnabled false
+            debuggable true
+        }
     }
 
     kotlinOptions {
@@ -45,7 +50,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
 
     // Hyperion
-    def hyperionVersion = '0.9.27'
+    def hyperionVersion = '0.9.29'
     debugImplementation("com.willowtreeapps.hyperion:hyperion-core:$hyperionVersion") {
         exclude module: 'support-annotations'
         exclude module: 'support-v4'
diff --git a/rangepickerview/src/main/res/layout/debug_activity.xml b/rangepickerview/src/main/res/layout/debug_activity.xml
index 842bac0..4e196c2 100644
--- a/rangepickerview/src/main/res/layout/debug_activity.xml
+++ b/rangepickerview/src/main/res/layout/debug_activity.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.button.MaterialButton
+    <Button
         android:id="@+id/mbDebugDrawings"
         android:layout_width="match_parent"
         android:layout_height="56dp"

From d55c7d45663483027445c1d88822c0aca28614c9 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP.local>
Date: Fri, 9 Apr 2021 11:07:53 +0300
Subject: [PATCH 24/28] - fix kapt failure

---
 app/build.gradle             | 2 +-
 rangepickerview/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f90a36a..8bb4602 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     // Android libs
     implementation 'androidx.appcompat:appcompat:1.2.0'
diff --git a/rangepickerview/build.gradle b/rangepickerview/build.gradle
index 4409ee6..e579d17 100644
--- a/rangepickerview/build.gradle
+++ b/rangepickerview/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     // Android libs
     implementation 'androidx.appcompat:appcompat:1.2.0'

From 586e1300f353ac0c3c08fe27b0ba7a14285cebd2 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP.local>
Date: Fri, 9 Apr 2021 11:38:38 +0300
Subject: [PATCH 25/28] - remove hyperion from lib

---
 rangepickerview/build.gradle                  | 30 +-----------
 .../rangepickerview/util/debug/DebugFlags.kt  |  8 ----
 .../rangepickerview/util/debug/DebugModule.kt | 20 --------
 .../rangepickerview/util/debug/DebugPlugin.kt | 11 -----
 .../util/debug/DebugToolsScreen.kt            | 23 ----------
 .../util/extension/AndroidExtensions.kt       |  3 +-
 .../src/main/res/layout/debug_activity.xml    | 17 -------
 .../src/main/res/layout/debug_plugin_item.xml | 46 -------------------
 8 files changed, 2 insertions(+), 156 deletions(-)
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt
 delete mode 100644 rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt
 delete mode 100644 rangepickerview/src/main/res/layout/debug_activity.xml
 delete mode 100644 rangepickerview/src/main/res/layout/debug_plugin_item.xml

diff --git a/rangepickerview/build.gradle b/rangepickerview/build.gradle
index e579d17..2d59a63 100644
--- a/rangepickerview/build.gradle
+++ b/rangepickerview/build.gradle
@@ -46,38 +46,10 @@ dependencies {
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
+    // Android libs
     // Android libs
     implementation 'androidx.appcompat:appcompat:1.2.0'
 
-    // Hyperion
-    def hyperionVersion = '0.9.29'
-    debugImplementation("com.willowtreeapps.hyperion:hyperion-core:$hyperionVersion") {
-        exclude module: 'support-annotations'
-        exclude module: 'support-v4'
-        exclude module: 'support-v13'
-        exclude module: 'recyclerview-v7'
-        exclude module: 'appcompat-v7'
-        exclude module: 'design'
-    }
-    debugImplementation("com.willowtreeapps.hyperion:hyperion-attr:$hyperionVersion") {
-        exclude module: 'support-annotations'
-        exclude module: 'support-v4'
-        exclude module: 'support-v13'
-        exclude module: 'recyclerview-v7'
-        exclude module: 'appcompat-v7'
-        exclude module: 'design'
-    }
-    debugImplementation("com.willowtreeapps.hyperion:hyperion-measurement:$hyperionVersion") {
-        exclude module: 'support-annotations'
-        exclude module: 'support-v4'
-        exclude module: 'support-v13'
-        exclude module: 'recyclerview-v7'
-        exclude module: 'appcompat-v7'
-        exclude module: 'design'
-    }
-
-    kapt 'com.google.auto.service:auto-service:1.0-rc6'
-
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'org.mockito:mockito-core:2.23.0'
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt
deleted file mode 100644
index 6b39783..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugFlags.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
-
-import yaroslav.ovdiienko.idivision.rangepickerview.BuildConfig
-
-
-internal object DebugFlags {
-  var shouldShowHelperDrawings: Boolean = BuildConfig.DEBUG
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt
deleted file mode 100644
index f082877..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugModule.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
-
-import android.content.Intent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.willowtreeapps.hyperion.plugin.v1.PluginModule
-import yaroslav.ovdiienko.idivision.rangepickerview.R
-
-class DebugModule : PluginModule() {
-  override fun createPluginView(layoutInflater: LayoutInflater, parent: ViewGroup): View? {
-    return layoutInflater.inflate(R.layout.debug_plugin_item, parent, false)
-      .apply {
-        setOnClickListener {
-          val intent = Intent(it.context, DebugToolsScreen::class.java)
-          it.context.startActivity(intent)
-        }
-      }
-  }
-}
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt
deleted file mode 100644
index 01c1f2d..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugPlugin.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
-
-import com.google.auto.service.AutoService
-import com.willowtreeapps.hyperion.plugin.v1.Plugin
-import com.willowtreeapps.hyperion.plugin.v1.PluginModule
-
-
-@AutoService(Plugin::class)
-class DebugPlugin : Plugin() {
-  override fun createPluginModule(): PluginModule = DebugModule()
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt
deleted file mode 100644
index 4f81b1a..0000000
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/debug/DebugToolsScreen.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package yaroslav.ovdiienko.idivision.rangepickerview.util.debug
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.debug_activity.*
-import yaroslav.ovdiienko.idivision.rangepickerview.R
-
-
-class DebugToolsScreen : AppCompatActivity(R.layout.debug_activity) {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    invalidateTexts()
-
-    mbDebugDrawings.setOnClickListener {
-      DebugFlags.shouldShowHelperDrawings = !DebugFlags.shouldShowHelperDrawings
-      invalidateTexts()
-    }
-  }
-
-  private fun invalidateTexts() {
-    mbDebugDrawings.text = "${if (DebugFlags.shouldShowHelperDrawings) {"Disable"} else {"Enable"}} debug drawings"
-  }
-}
\ No newline at end of file
diff --git a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
index 7074e73..525905c 100644
--- a/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
+++ b/rangepickerview/src/main/java/yaroslav/ovdiienko/idivision/rangepickerview/util/extension/AndroidExtensions.kt
@@ -7,7 +7,6 @@ import android.os.Build
 import android.util.Log
 import androidx.core.content.res.ResourcesCompat
 import yaroslav.ovdiienko.idivision.rangepickerview.BuildConfig
-import yaroslav.ovdiienko.idivision.rangepickerview.util.debug.DebugFlags
 
 
 internal fun buildVersionGE(version: Int): Boolean = Build.VERSION.SDK_INT >= version
@@ -38,5 +37,5 @@ internal fun Any.debugAction(action: () -> Unit) {
 }
 
 internal fun Any.debugDraw(action: () -> Unit) {
-  if (DebugFlags.shouldShowHelperDrawings) action.invoke()
+  if (BuildConfig.DEBUG) action.invoke()
 }
\ No newline at end of file
diff --git a/rangepickerview/src/main/res/layout/debug_activity.xml b/rangepickerview/src/main/res/layout/debug_activity.xml
deleted file mode 100644
index 4e196c2..0000000
--- a/rangepickerview/src/main/res/layout/debug_activity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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:orientation="vertical">
-
-    <Button
-        android:id="@+id/mbDebugDrawings"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:textAllCaps="false"
-        tools:text="Disable debug drawings" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/rangepickerview/src/main/res/layout/debug_plugin_item.xml b/rangepickerview/src/main/res/layout/debug_plugin_item.xml
deleted file mode 100644
index 4f8b832..0000000
--- a/rangepickerview/src/main/res/layout/debug_plugin_item.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:minHeight="131dp"
-    android:orientation="horizontal"
-    android:padding="12dp">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginEnd="28dp"
-        android:layout_marginRight="28dp"
-        android:duplicateParentState="true"
-        android:src="@android:drawable/ic_lock_power_off"
-        app:tint="@color/colorTextBlack" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:duplicateParentState="true"
-            android:text="Dev Tools"
-            android:textColor="@color/colorTextBlack"
-            android:textSize="16sp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="16dp"
-            android:duplicateParentState="true"
-            android:text="ScopePicker application controlls"
-            android:textColor="@color/colorTextBlack" />
-
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file

From 3f9153b6ac22b463fbb24526907a61850efab8d3 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <Yaroslav.Ovdiienko@Yaroslavs-MBP.local>
Date: Fri, 9 Apr 2021 12:13:55 +0300
Subject: [PATCH 26/28] - remove activity from manifest

---
 rangepickerview/src/main/AndroidManifest.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rangepickerview/src/main/AndroidManifest.xml b/rangepickerview/src/main/AndroidManifest.xml
index d877b72..27cef02 100644
--- a/rangepickerview/src/main/AndroidManifest.xml
+++ b/rangepickerview/src/main/AndroidManifest.xml
@@ -3,7 +3,4 @@
 
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <application android:label="@string/app_name">
-        <activity android:name=".util.debug.DebugToolsScreen" />
-    </application>
 </manifest>

From 04095d1a9d6fa55b7604488e6c143fb6ffb120af Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <46504259+yaroslav-android@users.noreply.github.com>
Date: Wed, 12 May 2021 19:59:05 +0300
Subject: [PATCH 27/28] Delete markdown-navigator.xml

---
 .idea/markdown-navigator.xml | 55 ------------------------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 .idea/markdown-navigator.xml

diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
deleted file mode 100644
index 4463382..0000000
--- a/.idea/markdown-navigator.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="FlexmarkProjectSettings">
-    <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
-      <flexmarkSectionLanguages>
-        <option name="1" value="Markdown" />
-        <option name="2" value="HTML" />
-        <option name="3" value="flexmark-ast:1" />
-      </flexmarkSectionLanguages>
-    </FlexmarkHtmlSettings>
-  </component>
-  <component name="MarkdownProjectSettings">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" synchronizePreviewPosition="true" highlightPreviewType="LINE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true" lastLayoutSetsDefault="false">
-      <PanelProvider>
-        <provider providerId="com.vladsch.md.nav.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false" correctedInvalidSettings="false" emojiShortcuts="1" emojiImages="0">
-      <PegdownExtensions>
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="INTELLIJ_DUMMY_IDENTIFIER" value="true" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="COMMONMARK_LISTS" value="true" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="PRODUCTION_SPEC_PARSER" value="true" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.md.nav.editor.text.html.generator" providerName="Unmodified HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.md.nav.editor.text.html.css" providerName="No Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-      <cssUriHistory />
-    </CssSettings>
-  </component>
-</project>
\ No newline at end of file

From 302ca59efc2830903a4d341ea94205f132ca2cf1 Mon Sep 17 00:00:00 2001
From: Yaroslav Ovdiienko <46504259+yaroslav-android@users.noreply.github.com>
Date: Wed, 12 May 2021 19:59:21 +0300
Subject: [PATCH 28/28] Delete markdown-navigator-enh.xml

---
 .idea/markdown-navigator-enh.xml | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 .idea/markdown-navigator-enh.xml

diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml
deleted file mode 100644
index 12fb99d..0000000
--- a/.idea/markdown-navigator-enh.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownEnhProjectSettings">
-    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
-    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imagePathType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-  <component name="MarkdownNavigatorHistory">
-    <PasteImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
-      <highlightList />
-      <directories />
-      <filenames />
-    </PasteImageHistory>
-    <CopyImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
-      <highlightList />
-      <directories />
-      <filenames />
-    </CopyImageHistory>
-    <PasteLinkHistory onPasteImageTargetRef="3" onPasteTargetRef="1" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteWikiElement="2" onPasteReferenceElement="2" hideInapplicableOperations="false" preserveLinkFormat="false" useHeadingForLinkText="false" linkFormat="0" saveAsDefaultOnOK="false" />
-    <TableToJsonHistory>
-      <entries />
-    </TableToJsonHistory>
-    <TableSortHistory>
-      <entries />
-    </TableSortHistory>
-  </component>
-</project>
\ No newline at end of file