From 2ffe1d6cfddade9ca3ffb91d7657a92ed9a7d376 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 10 Jul 2020 08:28:52 +0200 Subject: [PATCH] Hide compose/reply FAB on scrolling --- .../eu/faircode/email/FragmentMessages.java | 46 +++++++++++++++---- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index b3e97adca7..60f2000720 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -285,6 +285,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. private boolean initialized = false; private boolean loading = false; private boolean swiping = false; + private boolean scrolling = false; private AdapterMessage adapter; @@ -692,6 +693,28 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. }; rvMessage.addItemDecoration(dateDecorator); + rvMessage.addOnScrollListener(new RecyclerView.OnScrollListener() { + @Override + public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) { + if (newState == RecyclerView.SCROLL_STATE_IDLE) { + scrolling = false; + if (viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER) + fabCompose.show(); + updateExpanded(); + } + } + + @Override + public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { + if (dy != 0) { + scrolling = true; + if (viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER) + fabCompose.hide(); + updateExpanded(); + } + } + }); + boolean compact = prefs.getBoolean("compact", false); int zoom = prefs.getInt("view_zoom", compact ? 0 : 1); String sort = prefs.getString("sort", "time"); @@ -4399,17 +4422,20 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. private void updateExpanded() { int expanded = (values.containsKey("expanded") ? values.get("expanded").size() : 0); - - if (expanded == 1) { - long id = values.get("expanded").get(0); - int pos = adapter.getPositionForKey(id); - TupleMessageEx message = adapter.getItemAtPosition(pos); - if (message != null && !EntityFolder.OUTBOX.equals(message.folderType)) - fabReply.show(); - else - fabReply.hide(); - } else + if (scrolling) fabReply.hide(); + else { + if (expanded == 1) { + long id = values.get("expanded").get(0); + int pos = adapter.getPositionForKey(id); + TupleMessageEx message = adapter.getItemAtPosition(pos); + if (message != null && !EntityFolder.OUTBOX.equals(message.folderType)) + fabReply.show(); + else + fabReply.hide(); + } else + fabReply.hide(); + } ibDown.setVisibility(quick_scroll && expanded > 0 ? View.VISIBLE : View.GONE); ibUp.setVisibility(quick_scroll && expanded > 0 ? View.VISIBLE : View.GONE);