From ef078821a2320bf43f3075972d8d1554328f0864 Mon Sep 17 00:00:00 2001 From: Little Mango <244261996@qq.com> Date: Tue, 3 Jul 2018 18:31:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除部分冗余代码 --- .gitignore | 3 +++ .idea/caches/build_file_checksums.ser | Bin 598 -> 598 bytes .../stacklayoutmanager/DefaultAnimation.kt | 10 +++++----- .../stacklayoutmanager/StackLayoutManager.kt | 17 ++++------------- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 520a863..a78e416 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ google-services.json freeline.py freeline/ freeline_project_description.json +.idea/vcs.xml +.idea/caches/build_file_checksums.ser +*.ser diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index e0a1d728fb6cde633aab81923cec209fd5004cdc..82a9c234b6f8676def2e706ce0cc6abc6cf43b55 100644 GIT binary patch delta 77 zcmV-T0J8tq1l9zQm;_&~eCUy!vJmX$-1PYA%H>;YULPF2#dMQi0T~eQy==T7geP4a jHHgGy~e+(yU_QllK8%<6b1p delta 77 zcmV-T0J8tq1l9zQm;_#N)Pj+mvJj;-q(|KV-)<`VO)mSi&6$&40T~bu1U|8^V5e{V j@q^~&Xo-cBhXG&^Z&$mmR_Tb - * 当设置为 true 的时候,可以配合{@link #setPagerFlingVelocity(Int)} 设置触发翻页的最小速度. + * 当设置为 true 的时候,可以配合[StackLayoutManager.setPagerFlingVelocity]设置触发翻页的最小速度. * @param isPagerMode 这个值默认是 false,当设置为 true 的时候,会有 viewPager 翻页效果. */ fun setPagerMode(isPagerMode: Boolean) { @@ -85,7 +85,7 @@ class StackLayoutManager(scrollOrientation: ScrollOrientation, /** * 设置触发ViewPager翻页效果的最小速度. *

- * 该值仅在 {@link #getPagerMode() == true}的时候有效. + * 该值仅在 [StackLayoutManager.getPagerMode] == true的时候有效. * @param velocity 默认值是2000. */ fun setPagerFlingVelocity(@IntRange(from = 0, to = Int.MAX_VALUE.toLong()) velocity: Int) { @@ -403,17 +403,8 @@ class StackLayoutManager(scrollOrientation: ScrollOrientation, private fun getFirstVisibleItemMovePercent(): Float { return when (mScrollOrientation) { - ScrollOrientation.RIGHT_TO_LEFT -> { - return if (width == 0) { - 0f - } else { - (mScrollOffset % width) * 1.0f / width - } - } + ScrollOrientation.RIGHT_TO_LEFT -> (mScrollOffset % width) * 1.0f / width ScrollOrientation.LEFT_TO_RIGHT -> { - if (width == 0) { - return 0f - } val targetPercent = 1 - (mScrollOffset % width) * 1.0f / width return if (targetPercent == 1f) { 0f