Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ca2637ed authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6526 from thundernest/snackbar_behavior 

Use CoordinatorLayout for better SnackBar behavior
parents 942eca13 dc7c5e80

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

+0 −35
Original line number Diff line number Diff line 
package com.fsck.k9.activity



import android.annotation.SuppressLint

import android.app.SearchManager

import android.content.Context

import android.content.Intent
@@ -25,7 +24,6 @@ import androidx.fragment.app.FragmentManager 
import androidx.fragment.app.FragmentTransaction

import androidx.fragment.app.commit

import androidx.fragment.app.commitNow

import androidx.lifecycle.Observer

import com.fsck.k9.Account

import com.fsck.k9.K9

import com.fsck.k9.K9.SplitViewMode
@@ -48,8 +46,6 @@ import com.fsck.k9.ui.BuildConfig 
import com.fsck.k9.ui.K9Drawer

import com.fsck.k9.ui.R

import com.fsck.k9.ui.base.K9Activity

import com.fsck.k9.ui.changelog.RecentChangesActivity

import com.fsck.k9.ui.changelog.RecentChangesViewModel

import com.fsck.k9.ui.managefolders.ManageFoldersActivity

import com.fsck.k9.ui.messagelist.DefaultFolderProvider

import com.fsck.k9.ui.messagelist.MessageListFragment
@@ -65,10 +61,8 @@ import com.fsck.k9.ui.permissions.Permission 
import com.fsck.k9.ui.permissions.PermissionUiHelper

import com.fsck.k9.view.ViewSwitcher

import com.fsck.k9.view.ViewSwitcher.OnSwitchCompleteListener

import com.google.android.material.snackbar.Snackbar

import com.mikepenz.materialdrawer.util.getOptimalDrawerWidth

import org.koin.android.ext.android.inject

import org.koin.androidx.viewmodel.ext.android.viewModel

import org.koin.core.component.KoinComponent

import org.koin.core.component.inject

import timber.log.Timber
@@ -87,8 +81,6 @@ open class MessageList : 
    OnSwitchCompleteListener,

    PermissionUiHelper {



    private val recentChangesViewModel: RecentChangesViewModel by viewModel()



    protected val searchStatusManager: SearchStatusManager by inject()

    private val preferences: Preferences by inject()

    private val defaultFolderProvider: DefaultFolderProvider by inject()
@@ -136,7 +128,6 @@ open class MessageList : 
    private var messageViewOnly = false

    private var messageListWasDisplayed = false

    private var viewSwitcher: ViewSwitcher? = null

    private lateinit var recentChangesSnackbar: Snackbar



    public override fun onCreate(savedInstanceState: Bundle?) {

        super.onCreate(savedInstanceState)
@@ -210,7 +201,6 @@ open class MessageList : 
        initializeLayout()

        initializeFragments()

        displayViews()

        initializeRecentChangesSnackbar()



        if (savedInstanceState == null) {

            checkAndRequestPermissions()
@@ -364,31 +354,6 @@ open class MessageList : 
        }

    }



    private val shouldShowRecentChangesHintObserver = Observer<Boolean> { showRecentChangesHint ->

        val recentChangesSnackbarVisible = recentChangesSnackbar.isShown

        if (showRecentChangesHint && !recentChangesSnackbarVisible) {

            recentChangesSnackbar.show()

        } else if (!showRecentChangesHint && recentChangesSnackbarVisible) {

            recentChangesSnackbar.dismiss()

        }

    }



    @SuppressLint("ShowToast")

    private fun initializeRecentChangesSnackbar() {

        recentChangesSnackbar = Snackbar

            .make(findViewById(R.id.container), R.string.changelog_snackbar_text, Snackbar.LENGTH_INDEFINITE)

            .setAction(R.string.okay_action) { launchRecentChangesActivity() }



        recentChangesViewModel.shouldShowRecentChangesHint.observe(this, shouldShowRecentChangesHintObserver)

    }



    private fun launchRecentChangesActivity() {

        recentChangesViewModel.shouldShowRecentChangesHint.removeObserver(shouldShowRecentChangesHintObserver)



        val intent = Intent(this, RecentChangesActivity::class.java)

        startActivity(intent)

    }



    private fun decodeExtras(intent: Intent): Boolean {

        val launchData = decodeExtrasToLaunchData(intent)

app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt

+35 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import android.widget.Toast 
import androidx.appcompat.view.ActionMode

import androidx.core.os.bundleOf

import androidx.fragment.app.Fragment

import androidx.lifecycle.Observer

import androidx.recyclerview.widget.RecyclerView

import androidx.swiperefreshlayout.widget.SwipeRefreshLayout

import app.k9mail.ui.utils.itemtouchhelper.ItemTouchHelper
@@ -42,11 +43,14 @@ import com.fsck.k9.search.LocalSearch 
import com.fsck.k9.search.SearchAccount

import com.fsck.k9.search.getAccounts

import com.fsck.k9.ui.R

import com.fsck.k9.ui.changelog.RecentChangesActivity

import com.fsck.k9.ui.changelog.RecentChangesViewModel

import com.fsck.k9.ui.choosefolder.ChooseFolderActivity

import com.fsck.k9.ui.folders.FolderNameFormatter

import com.fsck.k9.ui.folders.FolderNameFormatterFactory

import com.fsck.k9.ui.helper.RelativeDateTimeFormatter

import com.fsck.k9.ui.messagelist.MessageListFragment.MessageListFragmentListener.Companion.MAX_PROGRESS

import com.google.android.material.snackbar.Snackbar

import java.util.concurrent.Future

import net.jcip.annotations.GuardedBy

import org.koin.android.ext.android.inject
@@ -62,6 +66,8 @@ class MessageListFragment : 
    MessageListItemActionListener {



    val viewModel: MessageListViewModel by viewModel()

    private val recentChangesViewModel: RecentChangesViewModel by viewModel()



    private val sortTypeToastProvider: SortTypeToastProvider by inject()

    private val folderNameFormatterFactory: FolderNameFormatterFactory by inject()

    private val folderNameFormatter: FolderNameFormatter by lazy { folderNameFormatterFactory.create(requireContext()) }
@@ -75,6 +81,7 @@ class MessageListFragment : 


    private lateinit var fragmentListener: MessageListFragmentListener



    private lateinit var recentChangesSnackbar: Snackbar

    private var recyclerView: RecyclerView? = null

    private var itemTouchHelper: ItemTouchHelper? = null

    private var swipeRefreshLayout: SwipeRefreshLayout? = null
@@ -232,6 +239,7 @@ class MessageListFragment : 
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

        initializeSwipeRefreshLayout(view)

        initializeRecyclerView(view)

        initializeRecentChangesSnackbar()



        // This needs to be done before loading the message list below

        initializeSortSettings()
@@ -282,6 +290,33 @@ class MessageListFragment : 
        this.itemTouchHelper = itemTouchHelper

    }



    private val shouldShowRecentChangesHintObserver = Observer<Boolean> { showRecentChangesHint ->

        val recentChangesSnackbarVisible = recentChangesSnackbar.isShown

        if (showRecentChangesHint && !recentChangesSnackbarVisible) {

            recentChangesSnackbar.show()

        } else if (!showRecentChangesHint && recentChangesSnackbarVisible) {

            recentChangesSnackbar.dismiss()

        }

    }



    private fun initializeRecentChangesSnackbar() {

        val coordinatorLayout = requireView().findViewById<View>(R.id.message_list_coordinator)



        recentChangesSnackbar = Snackbar

            .make(coordinatorLayout, R.string.changelog_snackbar_text, Snackbar.LENGTH_INDEFINITE)

            .setAction(R.string.okay_action) { launchRecentChangesActivity() }



        recentChangesViewModel.shouldShowRecentChangesHint

            .observe(viewLifecycleOwner, shouldShowRecentChangesHintObserver)

    }



    private fun launchRecentChangesActivity() {

        recentChangesViewModel.shouldShowRecentChangesHint.removeObserver(shouldShowRecentChangesHintObserver)



        val intent = Intent(requireActivity(), RecentChangesActivity::class.java)

        startActivity(intent)

    }



    private fun initializeSortSettings() {

        if (isSingleAccountMode) {

            val account = this.account!!

app/ui/legacy/src/main/res/layout/message_list_fragment.xml

+17 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<androidx.swiperefreshlayout.widget.SwipeRefreshLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/swiperefresh"

    android:id="@+id/message_list_coordinator"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context=".messagelist.MessageListFragment">



    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout

        android:id="@+id/swiperefresh"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/message_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

        android:scrollbars="vertical"

        android:scrollbarStyle="insideOverlay"

            android:fadingEdge="none"

            android:scrollbarStyle="insideOverlay"

            android:scrollbars="vertical"

            tools:listitem="@layout/message_list_item" />



    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>



</androidx.coordinatorlayout.widget.CoordinatorLayout>