Compare commits

...

6 Commits

Author SHA1 Message Date
Oleg 1570013639
update gradle (#3) 2018-10-26 16:18:45 +03:00
Oleg c5aca3c439
update gradle (#2) 2018-06-25 16:58:46 +03:00
Gavriil Sitnikov 368497fe36
Merge pull request #1 from TouchInstinct/remove_biuld_version
remove build version
2017-11-10 19:49:47 +03:00
Arseniy Borisov f2955e48fc remove build version 2017-11-10 19:44:01 +03:00
Ilia Kurtov 90428bb951 static 2017-10-25 21:33:37 +03:00
Ilia Kurtov 998158635f possible fix for swipe bug 2017-10-25 18:55:18 +03:00
3 changed files with 8 additions and 7 deletions

View File

@ -8,8 +8,8 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' // classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.github.dcendents:android-maven-plugin:1.2' // classpath 'com.github.dcendents:android-maven-plugin:1.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -2,17 +2,18 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 14
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
} }
} }
dependencies { dependencies {
compile 'com.android.support:recyclerview-v7:25.2.0' //noinspection GradleDependency
compile 'com.android.support:support-v4:25.2.0' implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
//noinspection GradleDependency
implementation "com.android.support:support-v4:$supportLibraryVersion"
} }
apply from: './gradle-mvn-push.gradle' apply from: './gradle-mvn-push.gradle'

View File

@ -1307,7 +1307,7 @@ public class SwipeLayout extends FrameLayout {
} }
int surfaceLeft = surfaceView.getLeft(); int surfaceLeft = surfaceView.getLeft();
int surfaceTop = surfaceView.getTop(); int surfaceTop = surfaceView.getTop();
if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop()) return Status.Close; if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop() && !mIsBeingDragged) return Status.Close;
if (surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance) if (surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance)
|| surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance)) || surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance))