From 487d05e6c011fe517ff0fa30e3b6920b995f3169 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 12 Nov 2014 10:32:21 +0400
Subject: [PATCH] add preference to disable fab

---
 org.fox.ttrss/src/main/AndroidManifest.xml    |  4 +--
 .../java/org/fox/ttrss/ArticleFragment.java   | 34 +++++++++++--------
 .../ttrss/offline/OfflineArticleFragment.java | 34 +++++++++++--------
 org.fox.ttrss/src/main/res/values/strings.xml |  2 ++
 .../src/main/res/xml/preferences.xml          |  5 +++
 5 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 902684c6..8a56e027 100644
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="278"
-    android:versionName="1.70" >
+    android:versionCode="279"
+    android:versionName="1.71" >
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 6a371c19..873935d8 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -100,23 +100,27 @@ public class ArticleFragment extends Fragment  {
             View fab = view.findViewById(R.id.article_fab);
 
             if (scrollView != null && fab != null) {
-                scrollView.setOnTouchListener(new ShowHideOnScroll(fab));
+                if (m_prefs.getBoolean("enable_article_fab", true)) {
+                    scrollView.setOnTouchListener(new ShowHideOnScroll(fab));
 
-                fab.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        try {
-                            URL url = new URL(m_article.link.trim());
-                            String uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(),
-                                    url.getPort(), url.getPath(), url.getQuery(), url.getRef()).toString();
-                            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
-                            startActivity(intent);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            m_activity.toast(R.string.error_other_error);
+                    fab.setOnClickListener(new OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            try {
+                                URL url = new URL(m_article.link.trim());
+                                String uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(),
+                                        url.getPort(), url.getPath(), url.getQuery(), url.getRef()).toString();
+                                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
+                                startActivity(intent);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                                m_activity.toast(R.string.error_other_error);
+                            }
                         }
-                    }
-                });
+                    });
+                } else {
+                    fab.setVisibility(View.GONE);
+                }
             }
 
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index b20c23f0..64e6c652 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -142,23 +142,27 @@ public class OfflineArticleFragment extends Fragment {
                 View fab = view.findViewById(R.id.article_fab);
 
                 if (scrollView != null && fab != null) {
-                    scrollView.setOnTouchListener(new ShowHideOnScroll(fab));
+                    if (m_prefs.getBoolean("enable_article_fab", true)) {
+                        scrollView.setOnTouchListener(new ShowHideOnScroll(fab));
 
-                    fab.setOnClickListener(new OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            try {
-                                URL url = new URL(link.trim());
-                                String uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(),
-                                        url.getPort(), url.getPath(), url.getQuery(), url.getRef()).toString();
-                                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
-                                startActivity(intent);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                m_activity.toast(R.string.error_other_error);
+                        fab.setOnClickListener(new OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                try {
+                                    URL url = new URL(link.trim());
+                                    String uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(),
+                                            url.getPort(), url.getPath(), url.getQuery(), url.getRef()).toString();
+                                    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri));
+                                    startActivity(intent);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    m_activity.toast(R.string.error_other_error);
+                                }
                             }
-                        }
-                    });
+                        });
+                    } else {
+                        fab.setVisibility(View.GONE);
+                    }
                 }
 
 				/* View scroll = view.findViewById(R.id.article_scrollview);
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 07b1613e..eef102c3 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -250,5 +250,7 @@
     <string name="headlines_sort_articles_title">Sort articles</string>
     <string name="fresh_articles">Fresh articles</string>
     <string name="feed_all_articles">All articles</string>
+    <string name="prefs_enable_fab">Enable FAB</string>
+    <string name="prefs_enable_fab_long">Show floating action button while reading</string>
 
 </resources>
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
index 1caa2f2e..3ed1b602 100644
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -143,6 +143,11 @@
             android:defaultValue="true"
             android:key="confirm_headlines_catchup"
             android:title="@string/prefs_confirm_headlines_catchup" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="enable_article_fab"
+            android:summary="@string/prefs_enable_fab_long"
+            android:title="@string/prefs_enable_fab" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/offline_mode" >
         <ListPreference