diff --git a/.gitignore b/.gitignore
index 9aa974a..be01bed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ captures/
local.properties
.idea/
*/*.iml
+/SlideUp-Android.iml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c498522..801b627 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v2.2.8 (03.01.2018)
+ - Add capability to trigger SlideUp (up/down/start/end) from another View **thanks [@toteto](https://github.com/toteto)**
+ - Dropped support Android < 14 api level
+
## v2.2.7.1 (25.07.2017)
- Fixed wrong identifiers for [AboutLibraries](https://github.com/mikepenz/AboutLibraries) (© MikePenz)
diff --git a/LICENSE b/LICENSE
index 199cf62..20739d0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2017 Mansur
+Copyright (c) 2018 Mansur
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 477567f..5dc9bd0 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,6 @@ allprojects {
repositories {
...
maven { url 'https://jitpack.io' }
- maven { url "https://maven.google.com" } // or google() in AS 3.0
}
}
```
@@ -86,7 +85,7 @@ slideUp = new SlideUpBuilder(slideView)
@Override
public void onSlide(float percent) {
dim.setAlpha(1 - (percent / 100));
- if (percent < 100) {
+ if (percent < 100 && fab.isShown()) {
// slideUp started showing
fab.hide();
}
@@ -135,7 +134,7 @@ We want to collect and publish this list.
MIT License
- Copyright (c) 2017 Mansur
+ Copyright (c) 2018 Mansur
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/app/build.gradle b/app/build.gradle
index 5a927dd..82e24f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 27
- buildToolsVersion '27.0.1'
+ buildToolsVersion '27.0.2'
defaultConfig {
applicationId "com.example.slideup"
minSdkVersion 14
diff --git a/build.gradle b/build.gradle
index c059798..ce8908c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,7 @@
buildscript {
ext {
versions = [
- support : '27.0.1',
- SlideUp : '2.2.1',
- Rx : [
- Java : '1.3.0'
- ]
+ support: '27.0.2'
]
}
repositories {
@@ -20,9 +16,8 @@ buildscript {
allprojects {
repositories {
- mavenCentral()
jcenter()
- maven { url 'https://maven.google.com' }
+ google()
}
}
diff --git a/library/build.gradle b/library/build.gradle
index bb76acb..c5b96e4 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 27
- buildToolsVersion '27.0.1'
+ buildToolsVersion '27.0.2'
defaultConfig {
minSdkVersion 14
targetSdkVersion 27
- versionCode 8
- versionName "2.2.7.1"
+ versionCode 9
+ versionName "2.2.8"
}
buildTypes {
release {
diff --git a/library/src/main/java/com/mancj/slideup/Internal.java b/library/src/main/java/com/mancj/slideup/Internal.java
index 5ff7df1..f0858a7 100644
--- a/library/src/main/java/com/mancj/slideup/Internal.java
+++ b/library/src/main/java/com/mancj/slideup/Internal.java
@@ -1,5 +1,6 @@
package com.mancj.slideup;
+import android.graphics.Rect;
import android.view.MotionEvent;
import android.view.View;
@@ -7,6 +8,7 @@
* @author pa.gulko zTrap (12.07.2017)
*/
class Internal {
+ private static Rect sRect = new Rect();
static void checkNonNull(Object obj, String message) {
if (obj == null) {
@@ -15,19 +17,7 @@ static void checkNonNull(Object obj, String message) {
}
static boolean isUpEventInView(View view, MotionEvent event){
- int top = view.getTop();
- int bottom = view.getBottom();
- int right = view.getRight();
- int left = view.getLeft();
- if (event.getRawY() > top){
- if (event.getRawY() < bottom){
- if (event.getRawX() > left){
- if (event.getRawX() < right){
- return true;
- }
- }
- }
- }
- return false;
+ view.getHitRect(sRect);
+ return sRect.contains((int) event.getRawX(), (int) event.getRawY());
}
}
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
index f8331e1..6f34670 100644
--- a/library/src/main/res/values/strings.xml
+++ b/library/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
]]>
https://github.com/mancj/SlideUp-Android/
- 2.2.7.1
+ 2.2.8
true
https://github.com/mancj/SlideUp-Android/blob/master/LICENSE
@@ -22,5 +22,5 @@
mit
Mancj
- 2017
+ 2018