From 9e73365cf6404d15b819392dabc67eb85fdf26fd Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 30 May 2017 16:00:55 +0300 Subject: [PATCH 1/5] Update build.gradle --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2b47969..d7a7581 100644 --- a/build.gradle +++ b/build.gradle @@ -12,11 +12,13 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha2' + classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'me.tatarka:gradle-retrolambda:3.4.0' } } allprojects { + apply plugin: 'me.tatarka.retrolambda' repositories { jcenter() } From 21b90505dd283c11271ff1864b8d4d6a99613102 Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 30 May 2017 16:07:36 +0300 Subject: [PATCH 2/5] Update build.gradle --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index d7a7581..f682a78 100644 --- a/build.gradle +++ b/build.gradle @@ -13,12 +13,10 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.3.1' - classpath 'me.tatarka:gradle-retrolambda:3.4.0' } } allprojects { - apply plugin: 'me.tatarka.retrolambda' repositories { jcenter() } From 670234bd659d22d6f97075eadc2fe334d81a82a3 Mon Sep 17 00:00:00 2001 From: zTrap Date: Tue, 30 May 2017 17:21:37 +0300 Subject: [PATCH 3/5] removed usage tools for android studio 3.0 canary preview --- README.md | 5 ++--- app/build.gradle | 11 ++++------- .../example/slideup/SlideDownViewActivity.java | 2 +- .../com/example/slideup/SlideEndViewActivity.java | 2 +- .../example/slideup/SlideStartViewActivity.java | 2 +- .../com/example/slideup/SlideUpViewActivity.java | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 15 ++++++--------- 9 files changed, 19 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 3c2ca2a..16c0653 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,7 @@ SlideUp is a small library that allows you to add sweet slide effect to any view [![Release](https://jitpack.io/v/mancj/SlideUp-Android.svg)](https://jitpack.io/#mancj/SlideUp-Android) --- - - + --- # Usage @@ -24,7 +23,7 @@ allprojects { Add the dependency ```groovy dependencies { - compile 'com.github.mancj:SlideUp-Android:2.2.4' + compile 'com.github.mancj:SlideUp-Android:2.2.5' } ``` diff --git a/app/build.gradle b/app/build.gradle index 8231d41..284c71f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,8 @@ apply plugin: 'com.android.application' android { - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - compileSdkVersion 25 - buildToolsVersion "25.0.3" + buildToolsVersion '25.0.3' defaultConfig { applicationId "com.example.slideup" minSdkVersion 12 @@ -24,6 +18,9 @@ android { } } + lintOptions { + abortOnError false + } } dependencies { diff --git a/app/src/main/java/com/example/slideup/SlideDownViewActivity.java b/app/src/main/java/com/example/slideup/SlideDownViewActivity.java index fd0a08c..c21f0f0 100644 --- a/app/src/main/java/com/example/slideup/SlideDownViewActivity.java +++ b/app/src/main/java/com/example/slideup/SlideDownViewActivity.java @@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { fab = (FloatingActionButton) findViewById(R.id.fab); slideUp = new SlideUp.Builder(sliderView) - .withListeners(new SlideUp.Listener() { + .withListeners(new SlideUp.Listener.Events() { @Override public void onSlide(float percent) { dim.setAlpha(1 - (percent / 100)); diff --git a/app/src/main/java/com/example/slideup/SlideEndViewActivity.java b/app/src/main/java/com/example/slideup/SlideEndViewActivity.java index 1d19249..2556729 100644 --- a/app/src/main/java/com/example/slideup/SlideEndViewActivity.java +++ b/app/src/main/java/com/example/slideup/SlideEndViewActivity.java @@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { fab = (FloatingActionButton) findViewById(R.id.fab); slideUp = new SlideUp.Builder(sliderView) - .withListeners(new SlideUp.Listener() { + .withListeners(new SlideUp.Listener.Events() { @Override public void onSlide(float percent) { dim.setAlpha(1 - (percent / 100)); diff --git a/app/src/main/java/com/example/slideup/SlideStartViewActivity.java b/app/src/main/java/com/example/slideup/SlideStartViewActivity.java index 32851ab..abed750 100644 --- a/app/src/main/java/com/example/slideup/SlideStartViewActivity.java +++ b/app/src/main/java/com/example/slideup/SlideStartViewActivity.java @@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { fab = (FloatingActionButton) findViewById(R.id.fab); slideUp = new SlideUp.Builder(sliderView) - .withListeners(new SlideUp.Listener() { + .withListeners(new SlideUp.Listener.Events() { @Override public void onSlide(float percent) { dim.setAlpha(1 - (percent / 100)); diff --git a/app/src/main/java/com/example/slideup/SlideUpViewActivity.java b/app/src/main/java/com/example/slideup/SlideUpViewActivity.java index e2244fb..1ae8491 100644 --- a/app/src/main/java/com/example/slideup/SlideUpViewActivity.java +++ b/app/src/main/java/com/example/slideup/SlideUpViewActivity.java @@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) { fab = (FloatingActionButton) findViewById(R.id.fab); slideUp = new SlideUp.Builder(sliderView) - .withListeners(new SlideUp.Listener() { + .withListeners(new SlideUp.Listener.Events() { @Override public void onSlide(float percent) { dim.setAlpha(1 - (percent / 100)); diff --git a/build.gradle b/build.gradle index 2b47969..cf1b904 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha2' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 766604a..673e008 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 30 11:03:09 MSK 2017 +#Tue May 30 17:07:46 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/library/build.gradle b/library/build.gradle index 9f1dbc1..c11de7f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,29 +1,25 @@ apply plugin: 'com.android.library' android { - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - compileSdkVersion 25 - buildToolsVersion "25.0.3" + buildToolsVersion '25.0.3' defaultConfig { minSdkVersion 12 targetSdkVersion 25 - versionCode 6 - versionName "2.2.4" + versionCode 7 + versionName "2.2.5" } buildTypes { release { minifyEnabled false } } + lintOptions { abortOnError false } + tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') options.addStringOption('encoding', 'UTF-8') @@ -34,6 +30,7 @@ dependencies { compile "com.android.support:support-annotations:${versions.support}" compile "com.android.support:appcompat-v7:${versions.support}" } + task androidJavadocs(type: Javadoc) { source = android.sourceSets.main.java.srcDirs classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) From 81210e958806e7bd6f26463fdc8090c567ae2653 Mon Sep 17 00:00:00 2001 From: zTrap Date: Tue, 30 May 2017 17:30:50 +0300 Subject: [PATCH 4/5] removed usage tools for android studio 3.0 canary preview --- .idea/misc.xml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981..ba7052b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + From 9e51fecd565c3036a6afe07d879afa50a8c60de0 Mon Sep 17 00:00:00 2001 From: Peter Date: Tue, 30 May 2017 17:38:09 +0300 Subject: [PATCH 5/5] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 16c0653..8f213cd 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,8 @@ SlideUp is a small library that allows you to add sweet slide effect to any view [![Release](https://jitpack.io/v/mancj/SlideUp-Android.svg)](https://jitpack.io/#mancj/SlideUp-Android) --- - - ---- + +----- # Usage **Get SlideUp library** @@ -54,7 +53,6 @@ slideUp = new SlideUp.Builder(slideView) .build(); ``` ## Enjoy! ---- # More complicated example ```java