From 8a2dfc5778c341375cccfb545ba948c2d0dd3867 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Fri, 1 Sep 2017 18:17:01 +0800
Subject: [PATCH] improved refresh indicator position

---
 .../AbsContentRecyclerViewFragment.kt         | 12 +++-----
 .../twidere/fragment/UserFragment.kt          | 29 +++++++++++++++----
 2 files changed, 27 insertions(+), 14 deletions(-)

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 d92cdfcee..eb0118498 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentRecyclerViewFragment.kt
@@ -308,19 +308,15 @@ abstract class AbsContentRecyclerViewFragment<A : LoadMoreSupportAdapter<Recycle
     }
 
     protected fun updateRefreshProgressOffset() {
-        val activity = activity
         val insets = this.systemWindowsInsets
-        if (activity !is IControlBarActivity || insets.top == 0 || swipeLayout == null || refreshing) {
+        if (insets.top == 0 || swipeLayout == null || swipeLayout.isRefreshing) {
             return
         }
         val progressCircleDiameter = swipeLayout.progressCircleDiameter
         if (progressCircleDiameter == 0) return
-        val density = resources.displayMetrics.density
-        val controlBarOffsetPixels = Math.round(activity.controlBarHeight * (1 - activity.controlBarOffset))
-        val swipeStart = insets.top - controlBarOffsetPixels - progressCircleDiameter
-        // 64: SwipeRefreshLayout.DEFAULT_CIRCLE_TARGET
-        val swipeDistance = Math.round(64 * density)
-        swipeLayout.setProgressViewOffset(false, swipeStart, swipeStart + swipeDistance)
+        val progressViewStart = 0 - progressCircleDiameter
+        val progressViewEnd = insets.top + resources.getDimensionPixelSize(R.dimen.element_spacing_normal)
+        swipeLayout.setProgressViewOffset(false, progressViewStart, progressViewEnd)
     }
 
     interface RefreshCompleteListener {
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
index 2ae9ef31f..93d8a92eb 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
@@ -170,8 +170,10 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
         private set
     private var account: AccountDetails? = null
     private var relationship: ParcelableRelationship? = null
-    private var getUserInfoLoaderInitialized: Boolean = false
-    private var getFriendShipLoaderInitialized: Boolean = false
+
+    private var systemWindowsInsets: Rect = Rect()
+    private var userInfoLoaderInitialized: Boolean = false
+    private var friendShipLoaderInitialized: Boolean = false
     private var bannerWidth: Int = 0
     private var cardBackgroundColor: Int = 0
     private var actionBarShadowColor: Int = 0
@@ -571,9 +573,9 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
         args.putParcelable(EXTRA_USER_KEY, userKey)
         args.putString(EXTRA_SCREEN_NAME, screenName)
         args.putBoolean(EXTRA_OMIT_INTENT_EXTRA, omitIntentExtra)
-        if (!getUserInfoLoaderInitialized) {
+        if (!userInfoLoaderInitialized) {
             lm.initLoader(LOADER_ID_USER, args, userInfoLoaderCallbacks)
-            getUserInfoLoaderInitialized = true
+            userInfoLoaderInitialized = true
         } else {
             lm.restartLoader(LOADER_ID_USER, args, userInfoLoaderCallbacks)
         }
@@ -676,6 +678,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
 
 
         userFragmentView.windowInsetsListener = OnApplyWindowInsetsListener listener@ { _, insets ->
+            insets.getSystemWindowInsets(systemWindowsInsets)
             val top = insets.systemWindowInsetTop
             profileContentContainer.setPadding(0, top, 0, 0)
             profileBannerSpace.statusBarHeight = top
@@ -687,6 +690,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
                 }
                 profileBannerSpace.toolbarHeight = toolbarHeight
             }
+            updateRefreshProgressOffset()
             return@listener insets
         }
 
@@ -1342,6 +1346,19 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
         userProfileSwipeLayout.isRefreshing = false
     }
 
+    private fun updateRefreshProgressOffset() {
+        val insets = this.systemWindowsInsets
+        if (insets.top == 0 || userProfileSwipeLayout == null || userProfileSwipeLayout.isRefreshing) {
+            return
+        }
+        val progressCircleDiameter = userProfileSwipeLayout.progressCircleDiameter
+        if (progressCircleDiameter == 0) return
+        val progressViewStart = 0 - progressCircleDiameter
+        val progressViewEnd = profileBannerSpace.toolbarHeight + resources.getDimensionPixelSize(R.dimen.element_spacing_normal)
+        userProfileSwipeLayout.setProgressViewOffset(false, progressViewStart, progressViewEnd)
+    }
+
+
     private fun getFriendship() {
         val user = user ?: return
         relationship = null
@@ -1350,9 +1367,9 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
         val args = Bundle()
         args.putParcelable(EXTRA_ACCOUNT_KEY, user.account_key)
         args.putParcelable(EXTRA_USER, user)
-        if (!getFriendShipLoaderInitialized) {
+        if (!friendShipLoaderInitialized) {
             lm.initLoader(LOADER_ID_FRIENDSHIP, args, friendshipLoaderCallbacks)
-            getFriendShipLoaderInitialized = true
+            friendShipLoaderInitialized = true
         } else {
             lm.restartLoader(LOADER_ID_FRIENDSHIP, args, friendshipLoaderCallbacks)
         }