Skip to content

Commit c90c7e9

Browse files
author
Thuy Trinh
authored
Remove dependency on activity-animations library (#12)
* Upgrade Kotlin version * Remove dependency on activity-animations library
1 parent 707310a commit c90c7e9

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext.androidPluginVersion = '2.2.3'
3-
ext.kotlinVersion = '1.0.5-3'
3+
ext.kotlinVersion = '1.0.6'
44
ext.supportLibraryVersion = '25.1.0'
55

66
repositories {
@@ -19,7 +19,6 @@ apply plugin: 'kotlin-android'
1919

2020
repositories {
2121
jcenter()
22-
maven { url "https://jitpack.io" }
2322
}
2423

2524
android {
@@ -52,13 +51,12 @@ dependencies {
5251
testCompile 'org.robolectric:robolectric:3.1.4'
5352
testCompile 'com.nhaarman:mockito-kotlin:1.0.1'
5453

55-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
54+
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
5655
exclude group: 'com.android.support', module: 'support-annotations'
57-
})
56+
}
5857

5958
compile 'io.reactivex:rxjava:1.2.0'
6059
compile 'net.danlew:android.joda:2.9.3.1'
61-
compile 'com.github.skedgo:activity-animations:v1.0'
6260
compile 'com.squareup:android-times-square:1.6.5@aar'
6361
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
6462
compile "com.android.support:design:$supportLibraryVersion"

src/main/java/skedgo/datetimerangepicker/DateTimeRangePickerActivity.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ import android.content.Context
66
import android.content.Intent
77
import android.databinding.DataBindingUtil
88
import android.os.Bundle
9-
import android.support.v4.util.Pair
9+
import android.support.v7.app.AppCompatActivity
1010
import android.text.format.DateFormat
1111
import com.squareup.timessquare.CalendarPickerView
1212
import org.joda.time.DateTime
13-
import skedgo.anim.AnimatedTransitionActivity
1413
import skedgo.datetimerangepicker.databinding.DateTimeRangePickerBinding
1514
import java.util.*
1615

17-
class DateTimeRangePickerActivity : AnimatedTransitionActivity() {
16+
class DateTimeRangePickerActivity : AppCompatActivity() {
1817
companion object {
1918
fun newIntent(
2019
context: Context?,
@@ -40,8 +39,6 @@ class DateTimeRangePickerActivity : AnimatedTransitionActivity() {
4039
}
4140

4241
override fun onCreate(savedInstanceState: Bundle?) {
43-
setEnteringAnimation(Pair(R.anim.entering_slide_up, R.anim.exiting_fade_out))
44-
setExitingAnimation(Pair(R.anim.entering_fade_in, R.anim.exiting_slide_down))
4542
super.onCreate(savedInstanceState)
4643

4744
viewModel.handleArgs(intent.extras)

0 commit comments

Comments
 (0)