diff options
Diffstat (limited to 'core-ui')
6 files changed, 9 insertions, 46 deletions
diff --git a/core-ui/build.gradle b/core-ui/build.gradle index 996918f..99f4567 100644 --- a/core-ui/build.gradle +++ b/core-ui/build.gradle @@ -1,45 +1,7 @@ -plugins { - id 'com.gladed.androidgitversion' version '0.3.4' -} - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'com.github.dcendents.android-maven' - -group = project.APP_GROUP +apply from: '../android.gradle' android { - compileSdkVersion Integer.parseInt(project.TARGET_SDK) - buildToolsVersion project.BUILD_TOOLS - - androidGitVersion { - codeFormat = 'MMNNPPBB' - prefix 'v' - } - - defaultConfig { - minSdkVersion Integer.parseInt(project.MIN_SDK) - targetSdkVersion Integer.parseInt(project.TARGET_SDK) - versionCode androidGitVersion.code() - versionName androidGitVersion.name() - consumerProguardFiles 'progress-proguard.txt' - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - lintOptions { - abortOnError false - checkReleaseBuilds false - } resourcePrefix "kau_" - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - test.java.srcDirs += 'src/test/kotlin' - } } dependencies { @@ -51,8 +13,8 @@ dependencies { compile project(':core') compile project(':adapter') - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib:${KOTLIN}" + testCompile "org.jetbrains.kotlin:kotlin-test-junit:${KOTLIN}" compile "io.reactivex.rxjava2:rxkotlin:${RX_KOTLIN}" compile "io.reactivex.rxjava2:rxandroid:${RX_ANDROID}" diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/BoundedCardView.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/BoundedCardView.kt index 554f71f..db002b9 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/BoundedCardView.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/BoundedCardView.kt @@ -3,7 +3,8 @@ package ca.allanwang.kau.ui.views import android.content.Context import android.support.v7.widget.CardView import android.util.AttributeSet -import ca.allanwang.kau.R +import ca.allanwang.kau.ui.R +import ca.allanwang.kau.utils.parentVisibleHeight /** diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/CutoutView.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/CutoutView.kt index abd96ed..42f19b9 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/CutoutView.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/views/CutoutView.kt @@ -24,7 +24,7 @@ import android.util.AttributeSet import android.util.DisplayMetrics import android.util.TypedValue import android.view.View -import ca.allanwang.kau.R +import ca.allanwang.kau.ui.R import ca.allanwang.kau.utils.dimenPixelSize import ca.allanwang.kau.utils.getFont import ca.allanwang.kau.utils.parentVisibleHeight diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt index 452fd56..c208210 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/ElasticDragDismissFrameLayout.kt @@ -22,7 +22,7 @@ import android.graphics.Color import android.util.AttributeSet import android.view.View import android.widget.FrameLayout -import ca.allanwang.kau.R +import ca.allanwang.kau.ui.R import ca.allanwang.kau.utils.* /** diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java index cc90cb2..cad6997 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/InkPageIndicator.java @@ -36,7 +36,7 @@ import android.view.animation.Interpolator; import java.util.Arrays; -import ca.allanwang.kau.R; +import ca.allanwang.kau.ui.R; import ca.allanwang.kau.utils.AnimHolder; import ca.allanwang.kau.utils.ColorUtilsKt; diff --git a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt index f38a0b7..bcd930f 100644 --- a/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt +++ b/core-ui/src/main/kotlin/ca/allanwang/kau/ui/widgets/TextSlider.kt @@ -10,7 +10,7 @@ import android.view.animation.Animation import android.view.animation.AnimationUtils import android.widget.TextSwitcher import android.widget.TextView -import ca.allanwang.kau.R +import ca.allanwang.kau.ui.R import java.util.* /** |