File tree Expand file tree Collapse file tree 2 files changed +5
-10
lines changed
src/main/java/skedgo/datetimerangepicker Expand file tree Collapse file tree 2 files changed +5
-10
lines changed Original file line number Diff line number Diff line change 1
1
buildscript {
2
2
ext. androidPluginVersion = ' 2.2.3'
3
- ext. kotlinVersion = ' 1.0.5-3 '
3
+ ext. kotlinVersion = ' 1.0.6 '
4
4
ext. supportLibraryVersion = ' 25.1.0'
5
5
6
6
repositories {
@@ -19,7 +19,6 @@ apply plugin: 'kotlin-android'
19
19
20
20
repositories {
21
21
jcenter()
22
- maven { url " https://jitpack.io" }
23
22
}
24
23
25
24
android {
@@ -52,13 +51,12 @@ dependencies {
52
51
testCompile ' org.robolectric:robolectric:3.1.4'
53
52
testCompile ' com.nhaarman:mockito-kotlin:1.0.1'
54
53
55
- androidTestCompile( ' com.android.support.test.espresso:espresso-core:2.2.2' , {
54
+ androidTestCompile ' com.android.support.test.espresso:espresso-core:2.2.2' , {
56
55
exclude group : ' com.android.support' , module : ' support-annotations'
57
- })
56
+ }
58
57
59
58
compile ' io.reactivex:rxjava:1.2.0'
60
59
compile ' net.danlew:android.joda:2.9.3.1'
61
- compile ' com.github.skedgo:activity-animations:v1.0'
62
60
compile ' com.squareup:android-times-square:1.6.5@aar'
63
61
compile " com.android.support:appcompat-v7:$supportLibraryVersion "
64
62
compile " com.android.support:design:$supportLibraryVersion "
Original file line number Diff line number Diff line change @@ -6,15 +6,14 @@ import android.content.Context
6
6
import android.content.Intent
7
7
import android.databinding.DataBindingUtil
8
8
import android.os.Bundle
9
- import android.support.v4.util.Pair
9
+ import android.support.v7.app.AppCompatActivity
10
10
import android.text.format.DateFormat
11
11
import com.squareup.timessquare.CalendarPickerView
12
12
import org.joda.time.DateTime
13
- import skedgo.anim.AnimatedTransitionActivity
14
13
import skedgo.datetimerangepicker.databinding.DateTimeRangePickerBinding
15
14
import java.util.*
16
15
17
- class DateTimeRangePickerActivity : AnimatedTransitionActivity () {
16
+ class DateTimeRangePickerActivity : AppCompatActivity () {
18
17
companion object {
19
18
fun newIntent (
20
19
context : Context ? ,
@@ -40,8 +39,6 @@ class DateTimeRangePickerActivity : AnimatedTransitionActivity() {
40
39
}
41
40
42
41
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))
45
42
super .onCreate(savedInstanceState)
46
43
47
44
viewModel.handleArgs(intent.extras)
You can’t perform that action at this time.
0 commit comments