diff --git a/build.gradle b/build.gradle index 0ee582c..3f29abb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.androidPluginVersion = '2.2.3' - ext.kotlinVersion = '1.0.5-3' + ext.kotlinVersion = '1.0.6' ext.supportLibraryVersion = '25.1.0' repositories { @@ -19,7 +19,6 @@ apply plugin: 'kotlin-android' repositories { jcenter() - maven { url "https://jitpack.io" } } android { @@ -52,13 +51,12 @@ dependencies { testCompile 'org.robolectric:robolectric:3.1.4' testCompile 'com.nhaarman:mockito-kotlin:1.0.1' - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' - }) + } compile 'io.reactivex:rxjava:1.2.0' compile 'net.danlew:android.joda:2.9.3.1' - compile 'com.github.skedgo:activity-animations:v1.0' compile 'com.squareup:android-times-square:1.6.5@aar' compile "com.android.support:appcompat-v7:$supportLibraryVersion" compile "com.android.support:design:$supportLibraryVersion" diff --git a/src/main/java/skedgo/datetimerangepicker/DateTimeRangePickerActivity.kt b/src/main/java/skedgo/datetimerangepicker/DateTimeRangePickerActivity.kt index c54bbc8..1148ef8 100644 --- a/src/main/java/skedgo/datetimerangepicker/DateTimeRangePickerActivity.kt +++ b/src/main/java/skedgo/datetimerangepicker/DateTimeRangePickerActivity.kt @@ -6,15 +6,14 @@ import android.content.Context import android.content.Intent import android.databinding.DataBindingUtil import android.os.Bundle -import android.support.v4.util.Pair +import android.support.v7.app.AppCompatActivity import android.text.format.DateFormat import com.squareup.timessquare.CalendarPickerView import org.joda.time.DateTime -import skedgo.anim.AnimatedTransitionActivity import skedgo.datetimerangepicker.databinding.DateTimeRangePickerBinding import java.util.* -class DateTimeRangePickerActivity : AnimatedTransitionActivity() { +class DateTimeRangePickerActivity : AppCompatActivity() { companion object { fun newIntent( context: Context?, @@ -40,8 +39,6 @@ class DateTimeRangePickerActivity : AnimatedTransitionActivity() { } override fun onCreate(savedInstanceState: Bundle?) { - setEnteringAnimation(Pair(R.anim.entering_slide_up, R.anim.exiting_fade_out)) - setExitingAnimation(Pair(R.anim.entering_fade_in, R.anim.exiting_slide_down)) super.onCreate(savedInstanceState) viewModel.handleArgs(intent.extras)