Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
pa.gulko committed Jul 19, 2017
2 parents 4ff8c98 + fc43ada commit d216f07
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 16 deletions.
9 changes: 5 additions & 4 deletions CHANGELOG.md
@@ -1,6 +1,7 @@
# 2.2.7 (13.07.2017)
- Added definition info for [AboutLibrary](https://github.com/mikepenz/AboutLibraries) (© MikePenz)
# 2.2.6 (13.07.2017)
## v2.2.7 (13.07.2017)
- Added definition info for [AboutLibraries](https://github.com/mikepenz/AboutLibraries) (© MikePenz)

## v2.2.6 (13.07.2017)
- Fixed problems with clicks onto `view` with `SlideUp`-effect
- `SlideUp.Builder` was moved into separated class and renamed to `SlideUpBuilder`
#### SlideUp
Expand All @@ -13,4 +14,4 @@
#### SlideUpBuilder
- Method `withTouchebleArea(float touchableArea)` was split to two methods:
- `withTouchebleAreaDp(float touchableArea)`
- `withTouchebleAreaPx(float touchableArea)`
- `withTouchebleAreaPx(float touchableArea)`
18 changes: 9 additions & 9 deletions MIGRATION.md
@@ -1,13 +1,13 @@
# v2.2.6 → ...
- `SlideUp.Builder` was moved into separated class and renamed to `SlideUpBuilder`
#### SlideUp
- method `setTouchebleArea(float touchableArea)` was split to two methods:
- `setTouchebleAreaDp(float touchableArea)`
- `setTouchebleAreaPx(float touchableArea)`
- method `getTouchebleArea()` was split to two methods:
- `getTouchebleAreaDp()`
- `getTouchebleAreaPx()`
- method `void : setTouchebleArea(float touchableArea)` was split to two methods:
- `void : setTouchebleAreaDp(float touchableArea)`
- `void : setTouchebleAreaPx(float touchableArea)`
- method `float : getTouchebleArea()` was split to two methods:
- `float : getTouchebleAreaDp()`
- `float : getTouchebleAreaPx()`
#### SlideUpBuilder
- method `withTouchebleArea(float touchableArea)` was split to two methods:
- `withTouchebleAreaDp(float touchableArea)`
- `withTouchebleAreaPx(float touchableArea)`
- method `SlideUpBuilder : withTouchebleArea(float touchableArea)` was split to two methods:
- `SlideUpBuilder : withTouchebleAreaDp(float touchableArea)`
- `SlideUpBuilder : withTouchebleAreaPx(float touchableArea)`
28 changes: 25 additions & 3 deletions README.md
Expand Up @@ -23,8 +23,8 @@ Add the dependency
```groovy
dependencies {
compile 'com.github.mancj:SlideUp-Android:2.2.7'
compile 'ru.ztrap:RxSlideUp2:2.0.0' //for reactive listeners based on RxJava-2
compile 'ru.ztrap:RxSlideUp:1.0.0' //for reactive listeners based on RxJava
compile 'ru.ztrap:RxSlideUp2:2.0.0' //optional, for reactive listeners based on RxJava-2
compile 'ru.ztrap:RxSlideUp:1.0.0' //optional, for reactive listeners based on RxJava
}
```

Expand Down Expand Up @@ -52,6 +52,16 @@ Create a SlideUp object and pass in your view
slideUp = new SlideUpBuilder(slideView)
.withStartState(SlideUp.State.HIDDEN)
.withStartGravity(Gravity.BOTTOM)

//.withGesturesEnabled()
//.withHideSoftInputWhenDisplayed()
//.withInterpolator()
//.withAutoSlideDuration()
//.withLoggingEnabled()
//.withTouchableAreaPx()
//.withTouchableAreaDp()
//.withListeners()
//.withSavedState()
.build();
```
### Enjoy!
Expand All @@ -60,7 +70,7 @@ slideUp = new SlideUpBuilder(slideView)

- [RxSlideUp](https://github.com/zTrap/RxSlideUp) - Listening events in reactive style

# More complicated example
# Advanced example
[SlideUpViewActivity.java](https://github.com/mancj/SlideUp-Android/blob/master/app/src/main/java/com/example/slideup/SlideUpViewActivity.java)
```java
slideView = findViewById(R.id.slideView);
Expand Down Expand Up @@ -96,6 +106,18 @@ fab.setOnClickListener(new View.OnClickListener() {
});
```
The player is designed by [Jauzee](https://github.com/Jauzee)

# Migration

- See [MIGRATION.md](https://github.com/mancj/SlideUp-Android/blob/master/MIGRATION.md)

# Documentation

- See [javadocs](https://jitpack.io/com/github/mancj/SlideUp-Android/2.2.7/javadoc/)

# Changelog

- See [CHANGELOG.md](https://github.com/mancj/SlideUp-Android/blob/master/CHANGELOG.md)

# Contract

Expand Down

0 comments on commit d216f07

Please sign in to comment.