From db347550d2aa7354deb78e2afcb7d2c44133171d Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Tue, 16 Aug 2016 21:23:45 +0800 Subject: [PATCH] updated build script --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- .../twidere/util/ListViewScrollHandler.java | 4 +- .../twidere/fragment/AbsActivitiesFragment.kt | 2 +- .../fragment/AbsContentListViewFragment.kt | 12 +-- .../AbsContentRecyclerViewFragment.kt | 4 +- .../twidere/fragment/AbsStatusesFragment.kt | 2 +- .../twidere/fragment/StatusFragment.kt | 15 ++- .../twidere/util/ContentScrollHandler.kt | 91 +++++++++---------- .../twidere/util/RecyclerViewScrollHandler.kt | 22 +++-- 10 files changed, 76 insertions(+), 82 deletions(-) diff --git a/build.gradle b/build.gradle index bbdbc9352..4b8510dd3 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0' - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' classpath 'com.google.gms:google-services:3.0.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath('fr.avianey.androidsvgdrawable:gradle-plugin:3.0.0') { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1ecd21b02..d0e7bdd4e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 18 11:41:44 CST 2016 +#Tue Aug 16 11:14:33 CST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/ListViewScrollHandler.java b/twidere/src/main/java/org/mariotaku/twidere/util/ListViewScrollHandler.java index 9ee55055c..f3d95a5b5 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/ListViewScrollHandler.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/ListViewScrollHandler.java @@ -71,12 +71,12 @@ public class ListViewScrollHandler extends ContentScrollHandler implements AbsLi } @Override - public boolean isComputingLayout() { + public boolean getComputingLayout() { return ViewSupport.isInLayout(listView); } @Override - public void post(Runnable runnable) { + public void post(@NonNull Runnable runnable) { listView.post(runnable); } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt index 4ab9a7b98..3fd6e5663 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt @@ -433,7 +433,7 @@ abstract class AbsActivitiesFragment protected constructor() : AbsContentListRec override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - scrollListener!!.setReversed(preferences.getBoolean(KEY_READ_FROM_BOTTOM)) + scrollListener!!.reversed = preferences.getBoolean(KEY_READ_FROM_BOTTOM) val adapter = adapter val layoutManager = layoutManager adapter!!.setListener(this) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt index 07d2b974f..254f270bf 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt @@ -42,7 +42,7 @@ import org.mariotaku.twidere.util.TwidereColorUtils * Created by mariotaku on 15/4/16. */ abstract class AbsContentListViewFragment : BaseSupportFragment(), OnRefreshListener, RefreshScrollTopInterface, ControlBarOffsetListener, ContentListSupport, AbsListView.OnScrollListener { - private var mScrollHandler: ListViewScrollHandler? = null + private var scrollHandler: ListViewScrollHandler? = null override var adapter: A? = null @@ -128,19 +128,19 @@ abstract class AbsContentListViewFragment : BaseSupportFragment } listView.adapter = adapter listView.clipToPadding = false - mScrollHandler = ListViewScrollHandler(this, ListViewScrollHandler.ListViewCallback(listView)) - mScrollHandler!!.setTouchSlop(ViewConfiguration.get(context).scaledTouchSlop) - mScrollHandler!!.onScrollListener = this + scrollHandler = ListViewScrollHandler(this, ListViewScrollHandler.ListViewCallback(listView)) + scrollHandler!!.touchSlop = ViewConfiguration.get(context).scaledTouchSlop + scrollHandler!!.onScrollListener = this } override fun onStart() { super.onStart() - listView.setOnScrollListener(mScrollHandler) + listView.setOnScrollListener(scrollHandler) } override fun onStop() { - listView.setOnScrollListener(mScrollHandler) + listView.setOnScrollListener(scrollHandler) super.onStop() } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt index 6422000a6..91b2dbc33 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt @@ -200,8 +200,8 @@ abstract class AbsContentRecyclerViewFragment= 0) { + if (contentListSupport.reachingEnd && scrollDirection >= 0) { position = position or ILoadMoreSupportAdapter.END } - if (mContentListSupport.reachingStart && mScrollDirection <= 0) { + if (contentListSupport.reachingStart && scrollDirection <= 0) { position = position or ILoadMoreSupportAdapter.START } resetScrollDirection() - mContentListSupport.onLoadMoreContents(position.toLong()) + if (position != 0L) { + contentListSupport.onLoadMoreContents(position) + } } } fun handleScrollStateChanged(scrollState: Int, idleState: Int) { - if (mContentListSupport is Fragment) { - if (mContentListSupport.context == null) return + if (contentListSupport is Fragment) { + if (contentListSupport.context == null) return } if (this.scrollState != idleState) { postNotifyScrollStateChanged() @@ -108,17 +99,17 @@ open class ContentScrollHandler( } fun handleScroll(dy: Int, scrollState: Int, oldState: Int, idleState: Int) { - if (mContentListSupport is Fragment) { - if (mContentListSupport.context == null) return + if (contentListSupport is Fragment) { + if (contentListSupport.context == null) return } //Reset mScrollSum when scrolling in reverse direction - if (dy * mScrollSum < 0) { - mScrollSum = 0 + if (dy * scrollSum < 0) { + scrollSum = 0 } - mScrollSum += dy - if (Math.abs(mScrollSum) > mTouchSlop) { - mContentListSupport.setControlVisible(mReversed xor (dy < 0)) - mScrollSum = 0 + scrollSum += dy + if (Math.abs(scrollSum) > touchSlop) { + contentListSupport.setControlVisible(reversed xor (dy < 0)) + scrollSum = 0 } if (scrollState == idleState && oldState != scrollState) { postNotifyScrollStateChanged() @@ -126,28 +117,28 @@ open class ContentScrollHandler( } private fun setScrollDirection(direction: Int) { - mScrollDirection = direction + scrollDirection = direction } private fun resetScrollDirection() { - mScrollDirection = 0 + scrollDirection = 0 } internal class TouchListener(private val listener: ContentScrollHandler) : View.OnTouchListener { - private var mLastY: Float = 0.toFloat() + private var lastY: Float = 0f override fun onTouch(v: View, event: MotionEvent): Boolean { when (event.action) { MotionEvent.ACTION_DOWN -> { listener.resetScrollDirection() - mLastY = java.lang.Float.NaN + lastY = Float.NaN } MotionEvent.ACTION_MOVE -> { - if (!java.lang.Float.isNaN(mLastY)) { - val delta = mLastY - event.rawY + if (!java.lang.Float.isNaN(lastY)) { + val delta = lastY - event.rawY listener.setScrollDirection(if (delta < 0) -1 else 1) } else { - mLastY = event.rawY + lastY = event.rawY } } } @@ -156,7 +147,7 @@ open class ContentScrollHandler( } interface ViewCallback { - val isComputingLayout: Boolean + val computingLayout: Boolean fun post(runnable: Runnable) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt index c0d48cc53..e43e50b36 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/RecyclerViewScrollHandler.kt @@ -18,16 +18,20 @@ class RecyclerViewScrollHandler(contentListSupport: ContentListSupport, viewCall scrollHandler = ContentScrollHandler(contentListSupport, viewCallback) } - fun setReversed(inversed: Boolean) { - scrollHandler.setReversed(inversed) - } + var touchSlop: Int + get() = scrollHandler.touchSlop + set(value) { + scrollHandler.touchSlop = value + } - fun setTouchSlop(touchSlop: Int) { - scrollHandler.setTouchSlop(touchSlop) - } + var reversed: Boolean + get() = scrollHandler.reversed + set(value) { + scrollHandler.reversed = value + } - val onTouchListener: View.OnTouchListener - get() = scrollHandler.onTouchListener + val touchListener: View.OnTouchListener + get() = scrollHandler.touchListener override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { scrollHandler.handleScrollStateChanged(newState, RecyclerView.SCROLL_STATE_IDLE) @@ -41,7 +45,7 @@ class RecyclerViewScrollHandler(contentListSupport: ContentListSupport, viewCall class RecyclerViewCallback(private val recyclerView: RecyclerView) : ViewCallback { - override val isComputingLayout: Boolean + override val computingLayout: Boolean get() = recyclerView.isComputingLayout override fun post(runnable: Runnable) {