aboutsummaryrefslogtreecommitdiff
path: root/imagepicker
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-09 00:24:40 -0700
committerAllan Wang <me@allanwang.ca>2017-07-09 00:24:40 -0700
commit40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6 (patch)
tree523f72bd0c53817815fd0ab1aa7c3124a3264745 /imagepicker
parentbcc7dd36752829b650b583fd6ee6168de3e6f95a (diff)
downloadkau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.gz
kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.tar.bz2
kau-40d6788abfa46ac99f46b32fd4aeb78e67c3b6f6.zip
Clean up gradle and test build
Diffstat (limited to 'imagepicker')
-rw-r--r--imagepicker/build.gradle40
-rw-r--r--imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt4
-rw-r--r--imagepicker/src/main/res/values/styles.xml4
3 files changed, 5 insertions, 43 deletions
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index b2b9b7d..b98b736 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/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 {
diff --git a/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt b/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt
index a236e64..47d57c2 100644
--- a/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt
+++ b/imagepicker/src/main/kotlin/ca/allanwang/kau/imagepicker/ImagePickerActivityBase.kt
@@ -39,8 +39,8 @@ abstract class ImagePickerActivityBase : AppCompatActivity(), LoaderManager.Load
draggableFrame.addListener(object : ElasticDragDismissFrameLayout.SystemChromeFader(this) {
override fun onDragDismissed() {
if (draggableFrame.translationY < 0) {
- window.returnTransition = TransitionInflater.from(this@ImagePickerActivityBase)
- .inflateTransition(R.transition.kau_about_return_upwards)
+// window.returnTransition = TransitionInflater.from(this@ImagePickerActivityBase)
+// .inflateTransition(R.transition.kau_about_return_upwards)
}
finishAfterTransition()
}
diff --git a/imagepicker/src/main/res/values/styles.xml b/imagepicker/src/main/res/values/styles.xml
index 1dc5149..e2d7280 100644
--- a/imagepicker/src/main/res/values/styles.xml
+++ b/imagepicker/src/main/res/values/styles.xml
@@ -1,8 +1,8 @@
<resources>
<style name="Kau.Translucent.ImagePicker">
- <item name="android:windowEnterTransition">@transition/kau_enter_slide_bottom</item>
- <item name="android:windowReturnTransition">@transition/kau_about_return_downward</item>
+ <!--<item name="android:windowEnterTransition">@transition/kau_enter_slide_bottom</item>-->
+ <!--<item name="android:windowReturnTransition">@transition/kau_about_return_downward</item>-->
</style>
</resources>