Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change: Adjust SwipeRefreshLayout offset in AccountActivity (#652) 

The change in 5959d23d resulted in a stuck margin when scrolling up in
the account view.

Fix the `SwipeRefreshLayout` offset in a different way that doesn't have
that problem; move the spinner's start position to the top of the screen
(instead of the negative offset it normally has) and keep the same
relative offset from the end position.

Have it scale in on the drag to complete the effect.
This commit is contained in:
Nik Clayton 2024-04-27 00:15:21 +02:00 committed by GitHub
parent 93e6b38d43
commit 78cda01ec8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/app/pachli/components/account/AccountActivity.kt
View File

@ -35,7 +35,6 @@ import android.view.MenuInflater
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.ViewGroup.MarginLayoutParams
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
@ -50,7 +49,6 @@ import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.core.view.WindowInsetsCompat.Type.systemBars
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.core.widget.doAfterTextChanged import androidx.core.widget.doAfterTextChanged
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@ -330,10 +328,13 @@ class AccountActivity :
val left = insets.getInsets(systemBars()).left val left = insets.getInsets(systemBars()).left
binding.accountCoordinatorLayout.updatePadding(right = right, bottom = bottom, left = left) binding.accountCoordinatorLayout.updatePadding(right = right, bottom = bottom, left = left)
// Scale the swipe spinner instead of appearing to come from nowhere, and adjust the // Normal swipe spinner startOffset is negative so it slides down from the view
// top margin to avoid the system bar // above it. This puts it above the systembar and it finishes too high up the
binding.swipeRefreshLayout.setProgressViewEndTarget(true, binding.swipeRefreshLayout.progressViewEndOffset) // screen. Move it down so it starts at the top edge, scale it so it appears to
binding.swipeRefreshLayout.updateLayoutParams<MarginLayoutParams> { topMargin = top } // grow instead of appearing out of thin air, and keep the final resting place at
// the same relative offset to the start.
val absoluteOffset = binding.swipeRefreshLayout.progressViewEndOffset - binding.swipeRefreshLayout.progressViewStartOffset
binding.swipeRefreshLayout.setProgressViewOffset(true, 0, absoluteOffset)
WindowInsetsCompat.CONSUMED WindowInsetsCompat.CONSUMED
} }