[Feature] lib major update

.gitignore

@@ -47,7 +47,14 @@ captures/
 .idea/runConfigurations.xml
 .idea/misc.xml
 .idea/inspectionProfiles
+.idea/markdown-navigator-enh.xml
+.idea/markdown-navigator.xml
 .idea/codeStyles
+.idea/codeStyles/Project.xml
+.idea/compiler.xml
+.idea/jarRepositories.xml
+
+≈codeStyles
 
 # Android Studio 3 in .gitignore file.
 .idea/caches

app/build.gradle

@@ -1,34 +1,39 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 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"
 
         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
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+
     testOptions {
         unitTests.includeAndroidResources = true
     }
@@ -39,13 +44,14 @@ 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.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.2.0-alpha01'
+    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'
     testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'org.mockito:mockito-core:2.23.0'

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>();
+}

app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt

@@ -1,42 +1,53 @@
 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.*
 import yaroslav.ovdiienko.idivision.rangepickerview.rangepicker.model.Option
 
+
 class MainActivity : AppCompatActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-
-        picker.apply {
-            setOptions(getOptions())
-            setDefaultSelectedPositions(0 to 4)
-            setOnRangeSelectedListener { view, leftPoint, rightPoint ->
-                Toast.makeText(
-                    this@MainActivity,
-                    view.getSelectedIndexes().toString(),
-                    Toast.LENGTH_SHORT
-                ).show()
-            }
-        }
-
-        btn_get_values.setOnClickListener {
-            Toast.makeText(this, "${picker.getSelectedItems()}", Toast.LENGTH_SHORT).show()
-            picker.resetToDefaultState()
-        }
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_main)
+
+//        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
+        ).show()
+      }
     }
 
-    private fun getOptions(): List<Option> {
-        return listOf(
-            Option("Single"),
-            Option("2"),
-            Option("3"),
-            Option("4"),
-            Option("5+")
-        )
+    btn_get_values.visibility = View.VISIBLE
+    btn_get_values.setOnClickListener {
+      Toast.makeText(this, "${picker.getSelectedItems()}", Toast.LENGTH_SHORT).show()
+      picker.resetToDefaultState()
     }
-}
+  }
+
+  private fun newView() {
+    dov.apply {
+      addOptions(getOptionsStrings())
+    }
+  }
+
+  private fun getOptions(): List<Option> {
+    return getOptionsStrings().map { Option(it) }
+  }
+
+  private fun getOptionsStrings() = listOf("Single", "2", "3", "4", "5+")
+}

app/src/main/res/layout/activity_main.xml

@@ -8,23 +8,32 @@
     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"
         android:layout_height="wrap_content"
         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.pickers.DuoOptionView
+        android:id="@+id/dov"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp" />
 </LinearLayout>
 

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.31'
+    ext.kotlin_version = '1.4.10'
+
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.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"
     }

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Oct 22 19:08:07 EEST 2019
+#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.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

rangepickerview/build.gradle

@@ -1,15 +1,16 @@
 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'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
 
         versionCode 3
         versionName "1.0.8-beta02"
@@ -19,13 +20,18 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            minifyEnabled false
+            testCoverageEnabled false
+            debuggable true
+        }
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
     testOptions {
@@ -38,10 +44,11 @@ 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.1.0'
+    // Android libs
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'androidx.test:core:1.2.0'

rangepickerview/src/main/AndroidManifest.xml

@@ -2,4 +2,5 @@
     package="yaroslav.ovdiienko.idivision.rangepickerview">
 
     <uses-permission android:name="android.permission.VIBRATE" />
+
 </manifest>