wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4762 from ByteHamster/pull-to-refresh-all

Browse source 
Add swipe to refresh to drawer
This commit is contained in:
cketti 2020-05-16 21:17:53 +02:00 committed by GitHub
commit ffe75e464f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.kt
View file

@ -1,5 +1,6 @@
package com.fsck.k9.ui
import android.content.Context
import android.content.res.Resources
import android.graphics.Color
import android.graphics.PorterDuff
@ -8,10 +9,13 @@ import android.os.Bundle
import android.util.TypedValue
import android.view.View
import androidx.drawerlayout.widget.DrawerLayout
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.fsck.k9.Account
import com.fsck.k9.K9
import com.fsck.k9.Preferences
import com.fsck.k9.activity.MessageList
import com.fsck.k9.controller.MessagingController
import com.fsck.k9.controller.SimpleMessagingListener
import com.fsck.k9.helper.Contacts
import com.fsck.k9.mailstore.DisplayFolder
import com.fsck.k9.mailstore.Folder
@ -46,10 +50,12 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
private val preferences: Preferences by inject()
private val themeManager: ThemeManager by inject()
private val resources: Resources by inject()
private val messagingController: MessagingController by inject()
private val drawer: Drawer
private val accountHeader: AccountHeader
private val folderIconProvider: FolderIconProvider = FolderIconProvider(parent.theme)
private val swipeRefreshLayout: SwipeRefreshLayout
private val userFolderDrawerIds = ArrayList<Long>()
private var unifiedInboxSelected: Boolean = false
@ -74,6 +80,18 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
.withAccountHeader(accountHeader)
.build()
swipeRefreshLayout = drawer.slider.findViewById(R.id.material_drawer_swipe_refresh)
accountHeader.view.addOnLayoutChangeListener { view, _, _, _, _, _, _, _, _ ->
val densityMultiplier = view.resources.displayMetrics.density
val progressViewStart = view.measuredHeight
val progressViewEnd = progressViewStart + (PROGRESS_VIEW_END_OFFSET * densityMultiplier).toInt()
swipeRefreshLayout.setProgressViewOffset(true, progressViewStart, progressViewEnd)
val slingshotDistance = (PROGRESS_VIEW_SLINGSHOT_DISTANCE * densityMultiplier).toInt()
swipeRefreshLayout.setSlingshotDistance(slingshotDistance)
}
addFooterItems()
viewModel.getFolderListLiveData().observe(parent) { folders ->
@ -190,11 +208,20 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
accountHeader.setActiveProfile((account.accountNumber + 1 shl DRAWER_ACCOUNT_SHIFT).toLong())
accountHeader.headerBackgroundView.setColorFilter(account.chipColor, PorterDuff.Mode.MULTIPLY)
viewModel.loadFolders(account)
updateFooterItems()
}
// Account can be null to refresh all (unified inbox or account list).
swipeRefreshLayout.setOnRefreshListener {
val accountToRefresh = if (accountHeader.isSelectionListShown) null else account
messagingController.checkMail(parent, accountToRefresh, true, true, object : SimpleMessagingListener() {
override fun checkMailFinished(context: Context?, account: Account?) {
swipeRefreshLayout.isRefreshing = false
}
})
}
}
private fun updateFooterItems() {
@ -341,5 +368,8 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
private const val DRAWER_ID_UNIFIED_INBOX: Long = 0
private const val DRAWER_ID_PREFERENCES: Long = 1
private const val DRAWER_ID_FOLDERS: Long = 2
private const val PROGRESS_VIEW_END_OFFSET = 32
private const val PROGRESS_VIEW_SLINGSHOT_DISTANCE = 48
}
}

21
app/ui/src/main/res/layout/material_drawer_recycler_view.xml Normal file
View file

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Overwrites MaterialDrawer library layout -->
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/material_drawer_swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- RelativeLayout is required by the MaterialDrawer library to show persistent footer views -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/material_drawer_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:scrollbars="vertical" />
</RelativeLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>