From 05495a7380bad6d230b68fefd68924b3d5606178 Mon Sep 17 00:00:00 2001 From: woxingxiao Date: Sat, 18 Jan 2020 23:06:03 +0800 Subject: [PATCH] never over scroll for default --- build.gradle | 4 ++-- library/build.gradle | 4 ++-- .../src/main/java/com/xw/repo/widget/BounceScrollView.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index dc25159..81605cb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.60' + ext.kotlin_version = '1.3.61' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/library/build.gradle b/library/build.gradle index 7f69251..4ebac95 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 28 - versionCode 5 - versionName "1.4" + versionCode 6 + versionName "1.5" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/library/src/main/java/com/xw/repo/widget/BounceScrollView.java b/library/src/main/java/com/xw/repo/widget/BounceScrollView.java index 3f57eb4..c382437 100644 --- a/library/src/main/java/com/xw/repo/widget/BounceScrollView.java +++ b/library/src/main/java/com/xw/repo/widget/BounceScrollView.java @@ -49,6 +49,7 @@ public BounceScrollView(@NonNull Context context, @Nullable AttributeSet attrs, setVerticalScrollBarEnabled(false); setHorizontalScrollBarEnabled(false); setFillViewport(true); + setOverScrollMode(View.OVER_SCROLL_NEVER); TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BounceScrollView, 0, 0); mDamping = a.getFloat(R.styleable.BounceScrollView_damping, DEFAULT_DAMPING_COEFFICIENT);