From 3f793b219359b3d3469f1263045c282454bfe89c Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Thu, 27 Apr 2017 23:56:54 +0800 Subject: [PATCH] close #803 updated version --- build.gradle | 2 +- twidere/build.gradle | 4 +-- .../twidere/fragment/AbsActivitiesFragment.kt | 4 ++- .../twidere/fragment/AbsStatusesFragment.kt | 5 ++-- .../fragment/CursorActivitiesFragment.kt | 25 +++++-------------- .../fragment/CursorStatusesFragment.kt | 17 +++---------- 6 files changed, 18 insertions(+), 39 deletions(-) diff --git a/build.gradle b/build.gradle index 0f9b926b2..3ee619d32 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ subprojects { buildscript { ext { libVersions = [ - Kotlin : '1.1.1', + Kotlin : '1.1.2', SupportLib : '25.3.1', MariotakuCommons : '0.9.15', RestFu : '0.9.54', diff --git a/twidere/build.gradle b/twidere/build.gradle index 2e1ed9e12..015738fb5 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -41,8 +41,8 @@ android { applicationId "org.mariotaku.twidere" minSdkVersion project.properties['overrideMinSdkVersion'] ?: 14 targetSdkVersion 25 - versionCode 348 - versionName '3.5.31' + versionCode 349 + versionName '3.5.32' multiDexEnabled true buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")' 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 09da709fc..a403639b2 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt @@ -26,6 +26,7 @@ import android.content.Intent import android.graphics.Rect import android.os.Bundle import android.os.Parcelable +import android.support.annotation.CallSuper import android.support.v4.app.LoaderManager.LoaderCallbacks import android.support.v4.content.Loader import android.support.v7.widget.LinearLayoutManager @@ -445,7 +446,8 @@ abstract class AbsActivitiesFragment protected constructor() : protected abstract fun onContentLoaded(loader: Loader>, data: List?) - protected fun saveReadPosition(position: Int) { + @CallSuper + protected open fun saveReadPosition(position: Int) { if (host == null) return if (position == RecyclerView.NO_POSITION || adapter.getActivityCount(false) <= 0) return val item = adapter.getActivity(position) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt index c4d0c195e..d71790826 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt @@ -26,6 +26,7 @@ import android.content.Context import android.content.Intent import android.graphics.Rect import android.os.Bundle +import android.support.annotation.CallSuper import android.support.v4.app.Fragment import android.support.v4.app.LoaderManager.LoaderCallbacks import android.support.v4.content.Loader @@ -475,8 +476,8 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment> { val uri = contentUri val table = getTableNameByUri(uri)!! @@ -215,6 +196,12 @@ abstract class CursorActivitiesFragment : AbsActivitiesFragment() { return true } + override fun saveReadPosition(position: Int) { + super.saveReadPosition(position) + if (position == 0) { + clearNotifications() + } + } protected fun getFiltersWhere(table: String): Expression? { if (!isFilterEnabled) return null return DataStoreUtils.buildActivityFilterWhereClause(table, null) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt index a1ba047ca..fdd7bce73 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/CursorStatusesFragment.kt @@ -27,7 +27,6 @@ import android.net.Uri import android.os.Bundle import android.os.Handler import android.support.v4.content.Loader -import android.support.v7.widget.RecyclerView import android.widget.Toast import com.bumptech.glide.Glide import com.squareup.otto.Subscribe @@ -85,14 +84,6 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { reloadStatuses() } - private val onScrollListener = object : RecyclerView.OnScrollListener() { - override fun onScrollStateChanged(recyclerView: RecyclerView?, newState: Int) { - if (newState == RecyclerView.SCROLL_STATE_IDLE) { - clearNotifications() - } - } - } - override fun onStart() { super.onStart() if (contentObserver == null) { @@ -104,13 +95,11 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { context.contentResolver.registerContentObserver(Filters.CONTENT_URI, true, contentObserver) } AccountManager.get(context).addOnAccountsUpdatedListenerSafe(accountListener, updateImmediately = false) - recyclerView.addOnScrollListener(onScrollListener) updateRefreshState() reloadStatuses() } override fun onStop() { - recyclerView.removeOnScrollListener(onScrollListener) if (contentObserver != null) { context.contentResolver.unregisterContentObserver(contentObserver) contentObserver = null @@ -207,9 +196,9 @@ abstract class CursorStatusesFragment : AbsStatusesFragment() { return true } - override fun setUserVisibleHint(isVisibleToUser: Boolean) { - super.setUserVisibleHint(isVisibleToUser) - if (isVisibleToUser) { + override fun saveReadPosition(position: Int) { + super.saveReadPosition(position) + if (position == 0) { clearNotifications() } }