summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-11-12 10:32:21 +0400
committerAndrew Dolgov <[email protected]>2014-11-12 10:32:21 +0400
commit487d05e6c011fe517ff0fa30e3b6920b995f3169 (patch)
treed18a4ac78dc3108659e43a3f56875d21a397c667 /org.fox.ttrss/src/main/java
parentfba3486928ccc5a8f2784c6a2175615bfdc589b3 (diff)
add preference to disable fab
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java36
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java34
2 files changed, 39 insertions, 31 deletions
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));
-
- 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);
+ 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);
+ }
}
- }
- });
+ });
+ } 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);