From a509415720d059d59d35d83750c78d25b35256cb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 8 Nov 2014 00:57:08 +0400
Subject: [PATCH] add fab button to article fragment

---
 org.fox.ttrss/build.gradle                    |   1 +
 org.fox.ttrss/org.fox.ttrss.iml               |   1 +
 org.fox.ttrss/src/main/AndroidManifest.xml    |   4 +--
 .../java/org/fox/ttrss/ArticleFragment.java   |  28 ++++++++++++++-
 .../ttrss/offline/OfflineArticleFragment.java |  33 +++++++++++++++---
 .../res/drawable-hdpi/ic_action_web_site.png  | Bin 0 -> 1154 bytes
 .../res/drawable-xhdpi/ic_action_web_site.png | Bin 0 -> 1532 bytes
 .../src/main/res/layout/article_fragment.xml  |  13 +++++--
 org.fox.ttrss/src/main/res/values/style.xml   |   6 ++++
 9 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png
 create mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index f2952775..4cc22613 100644
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -33,4 +33,5 @@ dependencies {
     compile 'com.android.support:support-v4:21.0.0'
     compile 'com.google.code.gson:gson:2.2.4'
     compile 'com.android.support:appcompat-v7:21.0.0'
+    compile 'com.shamanland:fab:0.0.5'
 }
diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml
index 2f2a4b69..5506e1af 100644
--- a/org.fox.ttrss/org.fox.ttrss.iml
+++ b/org.fox.ttrss/org.fox.ttrss.iml
@@ -82,6 +82,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="fab-0.0.5" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
     <orderEntry type="library" exported="" name="dashclock-api-r1.1" level="project" />
     <orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index a5817e4b..d215d256 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="273"
-    android:versionName="1.66" >
+    android:versionCode="274"
+    android:versionName="1.67" >
 
     <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 e4205f24..6a371c19 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
@@ -23,6 +23,8 @@ import android.webkit.WebView;
 import android.webkit.WebView.HitTestResult;
 import android.widget.TextView;
 
+import com.shamanland.fab.ShowHideOnScroll;
+
 import org.fox.ttrss.types.Article;
 import org.fox.ttrss.types.Attachment;
 import org.fox.ttrss.util.TypefaceCache;
@@ -93,7 +95,31 @@ public class ArticleFragment extends Fragment  {
 		View view = inflater.inflate(useTitleWebView ? R.layout.article_fragment_compat : R.layout.article_fragment, container, false);
 		
 		if (m_article != null) {
-			
+
+            View scrollView = view.findViewById(R.id.article_scrollview);
+            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 (!useTitleWebView) {
 				View scroll = view.findViewById(R.id.article_scrollview);
 
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 37e5b17d..b20c23f0 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
@@ -27,6 +27,8 @@ import android.webkit.WebView;
 import android.webkit.WebView.HitTestResult;
 import android.widget.TextView;
 
+import com.shamanland.fab.ShowHideOnScroll;
+
 import org.fox.ttrss.CommonActivity;
 import org.fox.ttrss.R;
 import org.fox.ttrss.util.ImageCacheService;
@@ -133,8 +135,33 @@ public class OfflineArticleFragment extends Fragment {
 		m_cursor.moveToFirst();
 		
 		if (m_cursor.isFirst()) {
+            final String link = m_cursor.getString(m_cursor.getColumnIndex("link"));
+
 			if (!useTitleWebView) {
-				View scroll = view.findViewById(R.id.article_scrollview);
+                View scrollView = view.findViewById(R.id.article_scrollview);
+                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(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);
+                            }
+                        }
+                    });
+                }
+
+				/* View scroll = view.findViewById(R.id.article_scrollview);
 
 				if (scroll != null) {
 					final float scale = getResources().getDisplayMetrics().density;
@@ -152,7 +179,7 @@ public class OfflineArticleFragment extends Fragment {
 
 					}
 					
-				}
+				} */
 			}
 			
 			int articleFontSize = Integer.parseInt(m_prefs.getString("article_font_size_sp", "16"));
@@ -160,8 +187,6 @@ public class OfflineArticleFragment extends Fragment {
 			
 			TextView title = (TextView)view.findViewById(R.id.title);
 
-			final String link = m_cursor.getString(m_cursor.getColumnIndex("link"));
-			
 			if (title != null) {
 				
 				if (m_prefs.getBoolean("enable_condensed_fonts", false)) {
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c4add42ef7c617836c9f00b4bff302838768dab
GIT binary patch
literal 1154
zcmV-|1bzF7P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$BuPX;RCwC#Sxa)-KoCV#mev8J11JZO
z_u&92dwc+CZ?g~H!vU<lVQ<(6A3z6)4uB3o_D(l>lj@q9p9FTrRdm%9HX6;mp6Pz`
zrWuW{cD1X0YKty8*xTD%N*_73gj!53!=skkky=NsiK6K6-#7r!Ginn64>5LRPi=Fq
zGtrsAOKMZ?(Gjc9pBsFa!nq93r0uBHLmi0*f-eEyWG#U12-L#xE<d|7IL=Pg@9F?e
z&a1aXoa?s7N@p@u2vlJhhePhcFh)adPVXE;F^zkIe-hvugo#Sd)Q|(VoVc@m&tpGf
zuFE+fz^m1L<Sj=$H~4N&t%5`PyYm0S;#h~ztdA3+JFwI!F#+>5n3zGofQc#@5;7bB
z{)b`w9YXC<II#=?_9ZZ3bFuQjXtGv3&qYEW5lS+qRlkMk*N8EBtQD^~jk~4K1O$=u
z+`hyf2U6t-oW0e+7h<It{BMn&QU*qCsj*Hh-dSLmPVWKm4$n(q7#u>Sh|gMcZh~-#
z(Rk8(jfEKW8lfdk^?Bt5!9q;HPHZcY6XhTW;Q3T=v`%ePErxm0?=oyWOmrH9=6QhQ
zHwrZ7szsl4$PUZ|mv0TvYXNpECf)?(UL!&%N9a}b{{G(q^>@xr!_vzEwe4%;2}oN{
zt-`@0SN$L+b~(@j^c^#h%q?MS4NI5<*fO>CucmW>S%vdJts4JL?I+F)pRUOOzIDtm
z=T2;4G<KYbCyFzPEQHF@pn*ChbnewK$SF8p2=E*_&#aj+cdKCvItLN~$_8L1PTJBH
zrzX)R1R*=ZOr%0<g&q2e`IR_K`Zy4ac=kz*b&q?%i4^EPrK!|`mJ6xPfcJtp4jQH)
z2eLpgWl!)*UTh8WLIO-fG5Ms#L>^!`yk>$$W<A00^qhix;PDd0X1>!mB#Bk*XNXm$
zdDLB?wCH(n{9E$rpi%LSn%96S$N|YPGptCe$=>AL)proYsR)1^iw&5(4s=>VKLapd
zL>2?D(c4~E#VFc9u4D#GUI!WjE0tiJ0>bS$dVhP>Zh&D)%v(*{*IB|uiMYAcE=cgw
z!C*`3vyniwxOW|>oh|%aEVTEqOol!R%pPp=V&Uvqm&Vke`F`$Fs{%`JG3Qg2jYS?*
zt_gLTw%vVEe#w1U#*QR9h?|k=dE-#29A3AO1*5<)(d{9Gy?i&a+94x~z!IW&7c67v
zJ`7$5;Cb!2ZVp*pY2OT?b1#J7;jFR>F4?AVNdk6Z65v1#&`KPxRJ|#r)EHV9np=+Y
z(xy^TMhQKw3pk;aZHqZCR~t1{=hP0}hV%=_l^Y?atI+yraBWmjWMjGhnW}i9mWVQC
z)u*_7sq*?x)PKs+Fnj;<x}|D2JyY*|{0|%kM?T+AOb%y0^hds{UF~Y0-2MnK039~%
U(#g6Ky8r+H07*qoM6N<$f~O%BcmMzZ

literal 0
HcmV?d00001

diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d759defeef0cb528108481de415cfb49e49dc10
GIT binary patch
literal 1532
zcmV<Y1q1qtP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%o=HSORCwC#TRn2yIuNEZX?XzY0LlTB
zUQ92$S6)x`v3t|Km0s*E_Lllb_u&D;1BeG;dI!jSNH!aQ07%$T#@rbUGc*P6e*3>*
zqG+U%MjC0PkzOrLUg||pPfrVRk!vQ_)bLm%)=8{tGMQBWGyp>2SX>gZmbmtzQmjXL
z6@aw=1OP&Cso}L)E3x80+e+b&Vif|2(^&!ljZ4APj>ifD%&idSz+6P$pTkuahCOls
z(Vh(eU_LYWc7yvBgi}^=*`-YjpmNVFM4WgNKzPaEt|PEXE#E?;)FmFoZ+Aw`bZc0?
zYlnCLJqr*FWH4!+&&EXi5&QQ~O$tFTI`%(w0ITRI_Q+n`0yM(Qi2V_!-XLg66W?M@
z4Vvt7tEmGkEAaAi0BD4lTDTV1cf{0{e?N-96#%C-WDTAFUs>3wLV)n5r_ZlgK-%N}
zCkT0k02ag7@9^BU#(Ym2Kz0b2I;zF`Abz(&Y@r~e&k6v{GG%G)fa*>P^FdrU;#%Wx
zO5+Ixs+kp(Y=8O8eTVQZqJN7(d4PK<O2K1z0AQ9G)81CBT&z-QQVI`2R6cK!^QFn&
zuuRaB{V$+-_4gyw@Q)e*;3}}xb2WJ;1Fyj?V9g@>)&NujLB8RZWM+x`yd+MD@En{a
zv$hhkL_PnGq{|I>Qh{|HG!4QpAIPnZt_Xqo@!WodFmXpPb1_@#_bs$5dHIZ{>125K
zrAyiDY5^%TeNzRN8FKWc$zmLZmvjZ;Q-FB`U{&E%0c>iq!(9L`U9wu-L|-*k;14r}
z`Ia6o*YJEV)*S>>ai!4o2{bFjAuJ%FfyrW4w_u`0l~-xp!Ie%-pbGo8aKVG7d_IwP
z#4c_4#K8jY$VMBN1_a2@4ROMyy#49-V*QWkpL?Y09SNM*Ljm~WShuV0?Kdl7gOLU5
zgVe(fyt_UMviR-$-Y&q33L6tsnBAJ>XqwUzn))0mw+SyZlzbmj;~%`*3L{$#a0UPc
zN{eAdZ3t*_N0n#I5K>67cyyQMzGp%2t812dYhhs45#e<p<eI)=-D5P?Al{r{O&KYr
z<-KoYPPixguMs#agACpPOqqsVeQ@5<0y|{@2!DYFO9`l~=LW7;L)b?ecTkR7TW%Ks
z`cgJPcnabaL6a6Ya{|U(b*AF^t)?!pk}Cj}2ji)ypPQyUHEVL@-X&|86mNe#>sn&F
z0w5#pf=6U>*wKQ4#v{cU{a;t)5YxT{z^#v44h3L}HuIzE#SM+mHh}x&mO$I;ED{r;
zEg7cHLbt=b&D3f7>bbP<KzqjDGz0*=AxX&$uO+4*it@fcRCNdnqgjUxUM`?(eD1{y
z3NWiSe~1DcgALHW`h9^QTv=prwg6r9S3UV2CLd!saV}J{a=QxE4B3EcG-%H((;!Zp
z5XW7D=e<hBwr1#U4@6BhyNn0_>E;ERiq1sxxa+6}DTHd*!%+DDobWz44L&+{a4{n9
zN$1-rO>Z3bSw))THl*O%@%NPX!D+CJG$%TaS%U|-Vt{44w$W>nrOLqo!1P>3S*2|X
zE6)+4Ujx!AGyrIo>G-Y<VF8h&<{HOTB|E(WM_bn(0L*pgh-~tddh+ZB05oeWQdT}E
zGCirQxuFLux$CDiKBaJB(Q+JloXEILYc#YpX#aw^NaGW0oB@D8Wwrq1X$8s9IDomq
zCpwGp`F_ajbQncS9>NO9z{9u5N!T7cX8K;i)%*JZ%>9l-tN_6*>lp_UgYZY!vx7kZ
z0EDaqgwDw?G<ZK?YP29H&{X(dfIinpQa-20L+S5)Bt<MCcZu#W`@6ux=R<@aYynKO
z84GF+7(DO}EdT}kQ1UrGmE{K^Ef@|Z{P}$<t1<Q0_p!9WB9iE}eJ*c_6KD4yCPo@*
iq>)A%=@rv=0R{j8xwM3zArT$`0000<MNUMnLSTXeK*9$A

literal 0
HcmV?d00001

diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml
index 2f1b4498..45d41f72 100644
--- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_fragment.xml
@@ -1,4 +1,4 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
     android:layout_height="match_parent"
@@ -101,5 +101,14 @@
         </LinearLayout>
     </org.fox.ttrss.util.NoChildFocusScrollView>
 
+    <com.shamanland.fab.FloatingActionButton
+        android:id="@+id/article_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|right"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="20dp"
+        android:src="@drawable/ic_action_web_site"
+        />
 
-</RelativeLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 4dc4db9f..41e913e1 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -30,6 +30,7 @@
         <item name="parentBtnBackground">#dddddd</item>
         <item name="articleHeader">?colorPrimaryDark</item>
         <item name="articleHeaderTextColor">@android:color/white</item>
+        <item name="floatingActionButtonStyle">@style/FabTheme</item>
 
         <item name="colorPrimary">#6482af</item>
         <item name="colorPrimaryDark">#526A8E</item>
@@ -79,6 +80,7 @@
         <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
         <item name="articleHeader">?colorPrimaryDark</item>
         <item name="articleHeaderTextColor">@android:color/white</item>
+        <item name="floatingActionButtonStyle">@style/FabTheme</item>
 
         <item name="colorPrimary">#51698E</item>
         <item name="colorPrimaryDark">#445877</item>
@@ -87,4 +89,8 @@
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>
 
+    <style name="FabTheme" parent="FloatingActionButton">
+        <item name="floatingActionButtonColor">?colorPrimaryDark</item>
+    </style>
+
 </resources>
\ No newline at end of file