From 8179e50208192e2b18b4df3bfc100d9cf779891a Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 27 Jun 2017 11:37:45 -0700 Subject: Exclude stdlib in rxbinding --- library/build.gradle | 12 +++++++----- .../src/main/kotlin/ca/allanwang/kau/views/TextSlider.kt | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index c6a4904..abb7bc1 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -63,14 +63,16 @@ dependencies { compile "com.jakewharton.timber:timber:${TIMBER}" - compile ("org.jetbrains.anko:anko-commons:${ANKO}") { - exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib' - } + compile "org.jetbrains.anko:anko-commons:${ANKO}" compile "io.reactivex.rxjava2:rxkotlin:${RX_JAVA}" compile "io.reactivex.rxjava2:rxandroid:${RX_ANDROID}" - compile "com.jakewharton.rxbinding2:rxbinding-kotlin:${RX_BINDING}" - compile "com.jakewharton.rxbinding2:rxbinding-appcompat-v7-kotlin:${RX_BINDING}" + compile ("com.jakewharton.rxbinding2:rxbinding-kotlin:${RX_BINDING}") { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib' + } + compile ("com.jakewharton.rxbinding2:rxbinding-appcompat-v7-kotlin:${RX_BINDING}") { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib' + } compile("com.mikepenz:aboutlibraries:${ABOUT_LIBRARIES}@aar") { transitive = true diff --git a/library/src/main/kotlin/ca/allanwang/kau/views/TextSlider.kt b/library/src/main/kotlin/ca/allanwang/kau/views/TextSlider.kt index 50b1848..b8735bb 100644 --- a/library/src/main/kotlin/ca/allanwang/kau/views/TextSlider.kt +++ b/library/src/main/kotlin/ca/allanwang/kau/views/TextSlider.kt @@ -2,6 +2,7 @@ package ca.allanwang.kau.views import android.content.Context import android.graphics.Color +import android.support.annotation.AnimRes import android.support.v4.widget.TextViewCompat import android.text.TextUtils import android.util.AttributeSet @@ -24,6 +25,20 @@ class TextSlider @JvmOverloads constructor(context: Context, attrs: AttributeSet val titleStack: Stack = Stack() + inner class Animations( + private @param: AnimRes val nextIn: Int, + private @param: AnimRes val nextOut: Int, + private @param: AnimRes val prevIn: Int, + private @param: AnimRes val prevOut: Int + ) { + + val NEXT_IN: Animation by lazy { AnimationUtils.loadAnimation(context, R.anim.kau_slide_in_left) } + val NEXT_OUT: Animation by lazy { AnimationUtils.loadAnimation(context, R.anim.kau_slide_in_right) } + val PREV_IN: Animation by lazy { AnimationUtils.loadAnimation(context, R.anim.kau_slide_in_top) } + val PREV_OUT: Animation by lazy { AnimationUtils.loadAnimation(context, R.anim.kau_slide_in_bottom) } + + } + private val SLIDE_IN_LEFT: Animation by lazy { AnimationUtils.loadAnimation(context, R.anim.kau_slide_in_left) } private val SLIDE_IN_RIGHT: Animation by lazy { AnimationUtils.loadAnimation(context, R.anim.kau_slide_in_right) } private val SLIDE_IN_TOP: Animation by lazy { AnimationUtils.loadAnimation(context, R.anim.kau_slide_in_top) } -- cgit v1.2.3