Skip to content

Commit 6ffb605

Browse files
authored
Merge pull request #27 from zTrap/patch-3
Update build.gradle
2 parents cce747e + 9e51fec commit 6ffb605

File tree

10 files changed

+21
-43
lines changed

10 files changed

+21
-43
lines changed

.idea/misc.xml

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ SlideUp is a small library that allows you to add sweet slide effect to any view
44
[![Release](https://jitpack.io/v/mancj/SlideUp-Android.svg)](https://jitpack.io/#mancj/SlideUp-Android)
55
---
66

7-
<img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art1.gif" width="300">
8-
<img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art2.gif" width="300">
9-
10-
---
7+
<img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art1.gif" width="300"> <img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art2.gif" width="302">
8+
-----
119
# Usage
1210
**Get SlideUp library**
1311

@@ -24,7 +22,7 @@ allprojects {
2422
Add the dependency
2523
```groovy
2624
dependencies {
27-
compile 'com.github.mancj:SlideUp-Android:2.2.4'
25+
compile 'com.github.mancj:SlideUp-Android:2.2.5'
2826
}
2927
```
3028

@@ -55,7 +53,6 @@ slideUp = new SlideUp.Builder(slideView)
5553
.build();
5654
```
5755
## Enjoy!
58-
---
5956
# More complicated example
6057

6158
```java

app/build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
5-
compileOptions {
6-
sourceCompatibility JavaVersion.VERSION_1_8
7-
targetCompatibility JavaVersion.VERSION_1_8
8-
}
9-
104
compileSdkVersion 25
11-
buildToolsVersion "25.0.3"
5+
buildToolsVersion '25.0.3'
126
defaultConfig {
137
applicationId "com.example.slideup"
148
minSdkVersion 12
@@ -24,6 +18,9 @@ android {
2418
}
2519
}
2620

21+
lintOptions {
22+
abortOnError false
23+
}
2724
}
2825

2926
dependencies {

app/src/main/java/com/example/slideup/SlideDownViewActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
3030
fab = (FloatingActionButton) findViewById(R.id.fab);
3131

3232
slideUp = new SlideUp.Builder(sliderView)
33-
.withListeners(new SlideUp.Listener() {
33+
.withListeners(new SlideUp.Listener.Events() {
3434
@Override
3535
public void onSlide(float percent) {
3636
dim.setAlpha(1 - (percent / 100));

app/src/main/java/com/example/slideup/SlideEndViewActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
3030
fab = (FloatingActionButton) findViewById(R.id.fab);
3131

3232
slideUp = new SlideUp.Builder(sliderView)
33-
.withListeners(new SlideUp.Listener() {
33+
.withListeners(new SlideUp.Listener.Events() {
3434
@Override
3535
public void onSlide(float percent) {
3636
dim.setAlpha(1 - (percent / 100));

app/src/main/java/com/example/slideup/SlideStartViewActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
3030
fab = (FloatingActionButton) findViewById(R.id.fab);
3131

3232
slideUp = new SlideUp.Builder(sliderView)
33-
.withListeners(new SlideUp.Listener() {
33+
.withListeners(new SlideUp.Listener.Events() {
3434
@Override
3535
public void onSlide(float percent) {
3636
dim.setAlpha(1 - (percent / 100));

app/src/main/java/com/example/slideup/SlideUpViewActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
3030
fab = (FloatingActionButton) findViewById(R.id.fab);
3131

3232
slideUp = new SlideUp.Builder(sliderView)
33-
.withListeners(new SlideUp.Listener() {
33+
.withListeners(new SlideUp.Listener.Events() {
3434
@Override
3535
public void onSlide(float percent) {
3636
dim.setAlpha(1 - (percent / 100));

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
jcenter()
1313
}
1414
dependencies {
15-
classpath 'com.android.tools.build:gradle:3.0.0-alpha2'
15+
classpath 'com.android.tools.build:gradle:2.3.2'
1616
}
1717
}
1818

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue May 30 11:03:09 MSK 2017
1+
#Tue May 30 17:07:46 MSK 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

library/build.gradle

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
5-
compileOptions {
6-
sourceCompatibility JavaVersion.VERSION_1_8
7-
targetCompatibility JavaVersion.VERSION_1_8
8-
}
9-
104
compileSdkVersion 25
11-
buildToolsVersion "25.0.3"
5+
buildToolsVersion '25.0.3'
126

137
defaultConfig {
148
minSdkVersion 12
159
targetSdkVersion 25
16-
versionCode 6
17-
versionName "2.2.4"
10+
versionCode 7
11+
versionName "2.2.5"
1812
}
1913
buildTypes {
2014
release {
2115
minifyEnabled false
2216
}
2317
}
18+
2419
lintOptions {
2520
abortOnError false
2621
}
22+
2723
tasks.withType(Javadoc) {
2824
options.addStringOption('Xdoclint:none', '-quiet')
2925
options.addStringOption('encoding', 'UTF-8')
@@ -34,6 +30,7 @@ dependencies {
3430
compile "com.android.support:support-annotations:${versions.support}"
3531
compile "com.android.support:appcompat-v7:${versions.support}"
3632
}
33+
3734
task androidJavadocs(type: Javadoc) {
3835
source = android.sourceSets.main.java.srcDirs
3936
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))

0 commit comments

Comments
 (0)