diff --git a/.gitignore b/.gitignore index 46b5510..4176dd1 100644 --- a/.gitignore +++ b/.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 diff --git a/app/build.gradle b/app/build.gradle index 46608aa..8bb4602 100644 --- a/app/build.gradle +++ b/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' 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$* { + ; ; +} + +-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 { + (); +} \ 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 9ff342a..e43331b 100644 --- a/app/src/main/java/yaroslav/ovdiienko/idivision/rangepicker/MainActivity.kt +++ b/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