Merge branch '5346-Swipe_refreshing_notifier_issue' into 'main' (7ab11237) · Commits · e / os / Mail

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ import android.content.Intent
		import android.content.IntentSender
		import android.content.res.Configuration
		import android.graphics.Color
		import android.graphics.PorterDuffColorFilter
		import android.os.Bundle
		import android.os.Parcelable
		import android.util.TypedValue
		@@ -21,6 +22,7 @@ import android.widget.Toast
		import androidx.appcompat.app.ActionBar
		import androidx.appcompat.widget.SearchView
		import androidx.appcompat.widget.Toolbar
		import androidx.core.content.ContextCompat
		import androidx.drawerlayout.widget.DrawerLayout
		import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
		import androidx.fragment.app.FragmentManager
		@@ -334,6 +336,7 @@ open class MessageList :

		private fun initializeLayout() {
		progressBar = findViewById(R.id.message_list_progress)
		progressBar?.progressDrawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(this, R.color.color_default_accent), android.graphics.PorterDuff.Mode.SRC_IN)
		messageViewPlaceHolder = PlaceholderFragment()
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -315,15 +315,16 @@ class MessageListFragment :
		}

		private fun setWindowProgress() {
		var level = 0
		if (currentFolder?.loading == true) {
		var level = 0
		val folderTotal = activityListener.getFolderTotal()
		if (folderTotal > 0) {
		level = (MAX_PROGRESS * activityListener.getFolderCompleted() / folderTotal).coerceAtMost(MAX_PROGRESS)
		}
		}

		fragmentListener.setMessageListProgress(level)
		} else {
		fragmentListener.setMessageListProgressEnabled(false)
		}
		}

		private fun setWindowTitle() {