fix detail FAB not being hidden if disabled, also fix malfunctioning (if

fab is disabled) detail view scroll behaviour

2 files changed, 33 insertions, 29 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index c9da82da..ecde9d51 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -119,17 +119,21 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
 
 		FloatingActionButton fab = findViewById(R.id.detail_fab);
 
-		if (fab != null && m_prefs.getBoolean("enable_article_fab", true)) {
-			fab.show();
-
-			fab.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					if (m_activeArticle != null) {
-						openUri(Uri.parse(m_activeArticle.link));
+		if (fab != null) {
+			if (m_prefs.getBoolean("enable_article_fab", true)) {
+				fab.show();
+
+				fab.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						if (m_activeArticle != null) {
+							openUri(Uri.parse(m_activeArticle.link));
+						}
 					}
-				}
-			});
+				});
+			} else {
+				fab.hide();
+			}
 		}
 
         if (savedInstanceState == null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DetailActivityScrollingViewBehavior.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DetailActivityScrollingViewBehavior.java
index 27682b13..1d7b15df 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DetailActivityScrollingViewBehavior.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/DetailActivityScrollingViewBehavior.java
@@ -48,26 +48,26 @@ public class DetailActivityScrollingViewBehavior extends AppBarLayout.ScrollingV
                                   @NonNull int[] consumed, int type) {
         super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type);
 
-        if (m_prefs.getBoolean("enable_article_fab", true)) {
-            if (dy > 0) {
-                // User scrolled down -> hide the FAB
-                List<View> dependencies = coordinatorLayout.getDependencies(child);
-                for (View view : dependencies) {
-                    if (view instanceof FloatingActionButton) {
-                        ((FloatingActionButton) view).hide();
-                    } else if (view instanceof BottomAppBar) {
-                        ((BottomAppBar) view).performHide();
-                    }
+        boolean enableFab = m_prefs.getBoolean("enable_article_fab", true);
+
+        if (dy > 0) {
+            // User scrolled down -> hide the FAB
+            List<View> dependencies = coordinatorLayout.getDependencies(child);
+            for (View view : dependencies) {
+                if (view instanceof FloatingActionButton) {
+                    ((FloatingActionButton) view).hide();
+                } else if (view instanceof BottomAppBar) {
+                    ((BottomAppBar) view).performHide();
                 }
-            } else if (dy < 0) {
-                // User scrolled up -> show the FAB
-                List<View> dependencies = coordinatorLayout.getDependencies(child);
-                for (View view : dependencies) {
-                    if (view instanceof FloatingActionButton) {
-                        ((FloatingActionButton) view).show();
-                    } else if (view instanceof BottomAppBar) {
-                        ((BottomAppBar) view).performShow();
-                    }
+            }
+        } else if (dy < 0) {
+            // User scrolled up -> show the FAB
+            List<View> dependencies = coordinatorLayout.getDependencies(child);
+            for (View view : dependencies) {
+                if (enableFab && view instanceof FloatingActionButton) {
+                    ((FloatingActionButton) view).show();
+                } else if (view instanceof BottomAppBar) {
+                    ((BottomAppBar) view).performShow();
                 }
             }
         }