From 4f2f5ee31a785853dc5a9ecc3847eaa54e54b86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Roy=C3=A9?= Date: Tue, 9 May 2017 15:55:40 +0200 Subject: [PATCH 01/15] Fixed Bug: SlidingUpPanelLayout ignores setPanelState(), as long as animated settling is in progress. --- .../com/sothree/slidinguppanel/SlidingUpPanelLayout.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java b/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java index 57f89a12..16f15dc5 100644 --- a/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java +++ b/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java @@ -17,6 +17,7 @@ import android.support.v4.view.MotionEventCompat; import android.support.v4.view.ViewCompat; import android.util.AttributeSet; +import android.util.Log; import android.view.Gravity; import android.view.MotionEvent; import android.view.View; @@ -1089,6 +1090,13 @@ public PanelState getPanelState() { * @param state - new panel state */ public void setPanelState(PanelState state) { + + // Abort any running animation, to allow state change + if(mDragHelper.getViewDragState() == ViewDragHelper.STATE_SETTLING){ + Log.d(TAG, "View is settling. Aborting animation."); + mDragHelper.abort(); + } + if (state == null || state == PanelState.DRAGGING) { throw new IllegalArgumentException("Panel state cannot be null or DRAGGING."); } @@ -1219,6 +1227,7 @@ boolean smoothSlideTo(float slideOffset, int velocity) { } int panelTop = computePanelTopPosition(slideOffset); + if (mDragHelper.smoothSlideViewTo(mSlideableView, mSlideableView.getLeft(), panelTop)) { setAllChildrenVisible(); ViewCompat.postInvalidateOnAnimation(this); From 83d367d0806f46c7c709f72d9ba148bde38ac624 Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Sat, 17 Jun 2017 13:46:46 +0530 Subject: [PATCH 02/15] Update build.gradle --- library/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index fd70fe3a..43516df0 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,17 +5,17 @@ repositories { } dependencies { - compile 'com.android.support:support-v4:23.4.0' - compile 'com.android.support:support-annotations:23.4.0' - compile 'com.android.support:recyclerview-v7:23.4.0' + compile 'com.android.support:support-v4:26.+' + compile 'com.android.support:support-annotations:26.+' + compile 'com.android.support:recyclerview-v7:26.+' } android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + buildToolsVersion "26.+" lintOptions { abortOnError false } } -apply from: '../maven_push.gradle' \ No newline at end of file +apply from: '../maven_push.gradle' From 4544df7699f234b569de81c90d4536c6c18e7f86 Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Mon, 19 Jun 2017 23:47:40 +0530 Subject: [PATCH 03/15] Update build.gradle I have updated the 26.+ to the correct version. And yes the Gradle version also has to be upgraded in the file AndroidSlidingUpPanel/build.gradle Line no 8 to -> classpath 'com.android.tools.build:gradle:2.3.2' and Line no 26 to -> gradleVersion = '3.3' --- library/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 43516df0..a7893aeb 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,14 +5,14 @@ repositories { } dependencies { - compile 'com.android.support:support-v4:26.+' - compile 'com.android.support:support-annotations:26.+' - compile 'com.android.support:recyclerview-v7:26.+' + compile 'com.android.support:support-v4:26.0.0-alpha1' + compile 'com.android.support:support-annotations:26.0.0-alpha1' + compile 'com.android.support:recyclerview-v7:26.0.0-alpha1' } android { compileSdkVersion 26 - buildToolsVersion "26.+" + buildToolsVersion "26.0.0" lintOptions { abortOnError false } From 4c32d21953f0417c2a32e2f8f1ef0b552100982d Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 20 Jun 2017 08:49:25 +0530 Subject: [PATCH 04/15] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d49db880..56a8d11d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.3.2' } } @@ -23,6 +23,6 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.13' + gradleVersion = '3.3' distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip" } From b29663672af76a66117beafeda32afa569f1f329 Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 20 Jun 2017 08:54:38 +0530 Subject: [PATCH 05/15] Update gradle.properties --- gradle.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 04e8ef27..4f5aa3bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ VERSION_NAME=3.3.1 -VERSION_CODE=16 -GROUP=com.sothree.slidinguppanel +VERSION_CODE=17 +GROUP=com.sothree.slidinguppanel1 POM_DESCRIPTION=Android Sliding Up Panel Library -POM_URL=https://github.com/umano/AndroidSlidingUpPanel -POM_SCM_URL=https://github.com/umano/AndroidSlidingUpPanel -POM_SCM_CONNECTION=scm:git@github.com:umano/AndroidSlidingUpPanel.git -POM_SCM_DEV_CONNECTION=scm:git@github.com:umano/AndroidSlidingUpPanel.git +POM_URL=https://github.com/NeilMajumder/AndroidSlidingUpPanel +POM_SCM_URL=https://github.com/NeilMajumder/AndroidSlidingUpPanel +POM_SCM_CONNECTION=scm:git@github.com:NeilMajumder/AndroidSlidingUpPanel.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:NeilMajumder/AndroidSlidingUpPanel.git POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo From 88e4d8953ceddb00c56bcb8b11e6bd4518230567 Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 20 Jun 2017 08:57:41 +0530 Subject: [PATCH 06/15] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4f5aa3bc..a5c25dc3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ VERSION_NAME=3.3.1 VERSION_CODE=17 -GROUP=com.sothree.slidinguppanel1 +GROUP=com.NeilMajumder.slidinguppanel POM_DESCRIPTION=Android Sliding Up Panel Library POM_URL=https://github.com/NeilMajumder/AndroidSlidingUpPanel From 1be3593572ca3fcf7b0a5f33a24ade3ba6040f33 Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 20 Jun 2017 09:01:23 +0530 Subject: [PATCH 07/15] Update gradle.properties --- gradle.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index a5c25dc3..3c97017e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ VERSION_NAME=3.3.1 -VERSION_CODE=17 -GROUP=com.NeilMajumder.slidinguppanel +VERSION_CODE=16 +GROUP=com.umano.slidinguppanel POM_DESCRIPTION=Android Sliding Up Panel Library -POM_URL=https://github.com/NeilMajumder/AndroidSlidingUpPanel -POM_SCM_URL=https://github.com/NeilMajumder/AndroidSlidingUpPanel -POM_SCM_CONNECTION=scm:git@github.com:NeilMajumder/AndroidSlidingUpPanel.git -POM_SCM_DEV_CONNECTION=scm:git@github.com:NeilMajumder/AndroidSlidingUpPanel.git +POM_URL=https://github.com/umano/AndroidSlidingUpPanel +POM_SCM_URL=https://github.com/umano/AndroidSlidingUpPanel +POM_SCM_CONNECTION=scm:git@github.com:umano/AndroidSlidingUpPanel.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:umano/AndroidSlidingUpPanel.git POM_LICENCE_NAME=The Apache Software License, Version 2.0 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo From cf9108cf8e833a7826e8efe443a732b873ebf98b Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 20 Jun 2017 09:04:53 +0530 Subject: [PATCH 08/15] Update build.gradle --- demo/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/build.gradle b/demo/build.gradle index 86f0df2e..f2d3c293 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 26 + buildToolsVersion "26.0.0" lintOptions { abortOnError false @@ -10,12 +10,12 @@ android { defaultConfig { minSdkVersion 11 - targetSdkVersion 23 + targetSdkVersion 26 } } dependencies { - compile 'com.android.support:support-v4:23.4.0' - compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:support-v4:26.0.0-alpha1' + compile 'com.android.support:appcompat-v7:26.0.0-alpha1' compile project(':library') } From b95f31dcee9cbd8ef59e1eb10224b8da5c47ff67 Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 20 Jun 2017 09:05:54 +0530 Subject: [PATCH 09/15] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index deb1e794..a390e815 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From 96677b69d3531bbbee72724681967040a70c2c44 Mon Sep 17 00:00:00 2001 From: NeilMajumder Date: Tue, 20 Jun 2017 09:07:59 +0530 Subject: [PATCH 10/15] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32af2e8b..c84fc407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ android: - platform-tools - extra-android-m2repository - extra-google-m2repository - - build-tools-23.0.3 - - android-23 + - build-tools-26.0.0 + - android-26 # Enable travis container based infrastructure sudo: false From 41fadaaccb837cca411119d29c9bdfc2922da5dd Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Mon, 14 Aug 2017 16:03:09 -0700 Subject: [PATCH 11/15] In SlidingUpPanelLayout.dispatchTouchEvent(), ignore horizontal scrolls This will allow child views with horizontally scrollable content to behave as expected, regardless of the state of the panel. --- .../sothree/slidinguppanel/SlidingUpPanelLayout.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java b/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java index 5004bcdb..6b4b4861 100644 --- a/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java +++ b/library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java @@ -207,6 +207,7 @@ public enum PanelState { */ private boolean mIsTouchEnabled; + private float mPrevMotionX; private float mPrevMotionY; private float mInitialMotionX; private float mInitialMotionY; @@ -961,15 +962,24 @@ public boolean dispatchTouchEvent(MotionEvent ev) { return super.dispatchTouchEvent(ev); } + final float x = ev.getX(); final float y = ev.getY(); if (action == MotionEvent.ACTION_DOWN) { mIsScrollableViewHandlingTouch = false; + mPrevMotionX = x; mPrevMotionY = y; } else if (action == MotionEvent.ACTION_MOVE) { + float dx = x - mPrevMotionX; float dy = y - mPrevMotionY; + mPrevMotionX = x; mPrevMotionY = y; + if (Math.abs(dx) > Math.abs(dy)) { + // Scrolling horizontally, so ignore + return super.dispatchTouchEvent(ev); + } + // If the scroll view isn't under the touch, pass the // event along to the dragView. if (!isViewUnder(mScrollableView, (int) mInitialMotionX, (int) mInitialMotionY)) { From f88e85062447437b7580807ab1104e81408016c3 Mon Sep 17 00:00:00 2001 From: Anton Lopyrev Date: Sun, 17 Sep 2017 13:54:51 -0700 Subject: [PATCH 12/15] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 15029b4d..bf495f6c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.sothree.slidinguppanel/library/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.sothree.slidinguppanel/library) [![Badge](http://www.libtastic.com/static/osbadges/30.png)](http://www.libtastic.com/technology/30/) +**Note:** we are **not** actively responding to issues right now. If you find a bug, please submit a PR. + Android Sliding Up Panel ========================= From 2e0179412bae438939efef01d0b5cb3d83c49eab Mon Sep 17 00:00:00 2001 From: tokudu Date: Sun, 17 Sep 2017 14:44:14 -0700 Subject: [PATCH 13/15] Upgrade to SDK --- build.gradle | 7 +++++-- demo/build.gradle | 8 ++++---- demo/src/main/AndroidManifest.xml | 7 +++++-- .../com/sothree/slidinguppanel/demo/DemoActivity.java | 4 ++-- library/build.gradle | 10 +++++----- library/src/main/AndroidManifest.xml | 2 +- 6 files changed, 22 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 56a8d11d..53d5638f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - mavenCentral() + jcenter() } dependencies { @@ -18,7 +18,10 @@ allprojects { group = GROUP repositories { - mavenCentral() + jcenter() + maven { + url "https://maven.google.com" + } } } diff --git a/demo/build.gradle b/demo/build.gradle index f2d3c293..02b6f063 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -2,20 +2,20 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.0" + buildToolsVersion "26.0.1" lintOptions { abortOnError false } defaultConfig { - minSdkVersion 11 + minSdkVersion 14 targetSdkVersion 26 } } dependencies { - compile 'com.android.support:support-v4:26.0.0-alpha1' - compile 'com.android.support:appcompat-v7:26.0.0-alpha1' + compile 'com.android.support:support-v4:26.0.2' + compile 'com.android.support:appcompat-v7:26.0.2' compile project(':library') } diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index b818fef0..6b746d87 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -1,12 +1,15 @@ + android:minSdkVersion="14" + android:targetSdkVersion="17" + tools:overrideLibrary="android.support.v7.appcompat,android.support.graphics.drawavle" + /> + android:minSdkVersion="14" /> From 869dd596be113d6b813ca9109177de8260234a2b Mon Sep 17 00:00:00 2001 From: tokudu Date: Sun, 17 Sep 2017 15:07:13 -0700 Subject: [PATCH 14/15] Update the library --- README.md | 5 ++++- demo/src/main/AndroidManifest.xml | 4 ++-- gradle.properties | 4 ++-- library/src/main/AndroidManifest.xml | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bf495f6c..52da9c4d 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ dependencies { repositories { mavenCentral() } - compile 'com.sothree.slidinguppanel:library:3.3.1' + compile 'com.sothree.slidinguppanel:library:3.4.0' } ``` @@ -141,6 +141,9 @@ If you have an awesome pull request, send it over! ### Changelog +* 3.4.0 + * Use the latest support library 26 and update the min version to 14. + * Bug fixes * 3.3.1 * Lots of bug fixes from various pull requests. * Removed the nineoldandroids dependency. Use ViewCompat instead. diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 6b746d87..a37bd78c 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="17" + android:versionName="3.4.0"> + android:versionCode="17" + android:versionName="3.4.0"> From 45a460435b07e764138a700328836cafc1ed5c42 Mon Sep 17 00:00:00 2001 From: tokudu Date: Sun, 17 Sep 2017 15:28:44 -0700 Subject: [PATCH 15/15] Fix the group --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 09a90089..65cfc38e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ VERSION_NAME=3.4.0 VERSION_CODE=17 -GROUP=com.umano.slidinguppanel +GROUP=com.sothree.slidinguppanel POM_DESCRIPTION=Android Sliding Up Panel Library POM_URL=https://github.com/umano/AndroidSlidingUpPanel