diff --git a/bouncy/build.gradle b/bouncy/build.gradle index 316b7e4..f4806da 100644 --- a/bouncy/build.gradle +++ b/bouncy/build.gradle @@ -11,8 +11,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 31 - versionCode 22 - versionName "2.2" + versionCode 23 + versionName "2.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" } diff --git a/bouncy/src/main/java/com/factor/bouncy/BouncyNestedScrollView.kt b/bouncy/src/main/java/com/factor/bouncy/BouncyNestedScrollView.kt index c95878d..e3fe0e8 100644 --- a/bouncy/src/main/java/com/factor/bouncy/BouncyNestedScrollView.kt +++ b/bouncy/src/main/java/com/factor/bouncy/BouncyNestedScrollView.kt @@ -1951,7 +1951,7 @@ class BouncyNestedScrollView @JvmOverloads constructor(context: Context, attrs: overscrollAnimationSize = getFloat(R.styleable.BouncyNestedScrollView_overscroll_animation_size, 0.5f) flingAnimationSize = getFloat(R.styleable.BouncyNestedScrollView_fling_animation_size, 0.5f) - when (getInt(R.styleable.BouncyNestedScrollView_damping_ratio, 0)) + when (getInt(R.styleable.BouncyNestedScrollView_bouncy_scrollview_damping_ratio, 0)) { 0 -> dampingRatio = Bouncy.DAMPING_RATIO_NO_BOUNCY 1 -> dampingRatio = Bouncy.DAMPING_RATIO_LOW_BOUNCY @@ -1959,7 +1959,7 @@ class BouncyNestedScrollView @JvmOverloads constructor(context: Context, attrs: 3 -> dampingRatio = Bouncy.DAMPING_RATIO_HIGH_BOUNCY } - when (getInt(R.styleable.BouncyNestedScrollView_stiffness, 1)) + when (getInt(R.styleable.BouncyNestedScrollView_bouncy_scrollview_stiffness, 1)) { 0 -> stiffness = Bouncy.STIFFNESS_VERY_LOW 1 -> stiffness = Bouncy.STIFFNESS_LOW diff --git a/bouncy/src/main/res/values/attrs.xml b/bouncy/src/main/res/values/attrs.xml index 6cdd6dd..d55d27d 100644 --- a/bouncy/src/main/res/values/attrs.xml +++ b/bouncy/src/main/res/values/attrs.xml @@ -4,13 +4,13 @@ - + - + @@ -26,16 +26,16 @@ - - - - + + + + - - - - + + + + \ No newline at end of file diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml index baf6dd2..c9cc7ce 100644 --- a/example/src/main/res/layout/activity_main.xml +++ b/example/src/main/res/layout/activity_main.xml @@ -15,24 +15,27 @@ + android:background="@color/cardview_light_background"/> - + + -->