From afccfa1003090faeeb0f44eb050da0816dcac1ac Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 24 Jun 2015 12:56:54 +0300
Subject: add FAB to headlines list

---
 org.fox.ttrss/src/main/AndroidManifest.xml                   |  4 ++--
 .../src/main/java/org/fox/ttrss/HeadlinesFragment.java       | 11 +++++++++++
 .../java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java |  4 ++++
 org.fox.ttrss/src/main/res/layout/fragment_headlines.xml     | 12 ++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 819934de..454fc127 100755
--- 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="351"
-    android:versionName="1.124" >
+    android:versionCode="352"
+    android:versionName="1.125" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 9c4aa8da..214197ad 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -55,6 +55,8 @@ import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
 import com.nostra13.universalimageloader.core.imageaware.ImageAware;
 import com.nostra13.universalimageloader.core.imageaware.ImageViewAware;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
+import com.shamanland.fab.FloatingActionButton;
+import com.shamanland.fab.ShowHideOnScroll;
 
 import org.fox.ttrss.types.Article;
 import org.fox.ttrss.types.ArticleList;
@@ -361,6 +363,15 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 
 		m_list = (ListView)view.findViewById(R.id.headlines_list);
 
+		FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.headlines_fab);
+		m_list.setOnTouchListener(new ShowHideOnScroll(fab));
+		fab.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				refresh(false);
+			}
+		});
+
         if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
             WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
             Display display = wm.getDefaultDisplay();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index d77ef6b8..93e8e8a3 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -39,6 +39,7 @@ import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.nhaarman.listviewanimations.appearance.AnimationAdapter;
 import com.nhaarman.listviewanimations.appearance.simple.SwingBottomInAnimationAdapter;
+import com.shamanland.fab.FloatingActionButton;
 
 import org.fox.ttrss.Application;
 import org.fox.ttrss.CommonActivity;
@@ -309,6 +310,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		
 		m_list = (ListView)view.findViewById(R.id.headlines_list);
 
+		FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.headlines_fab);
+		fab.setVisibility(View.GONE);
+
         if (m_activity.isSmallScreen()) {
             View layout = inflater.inflate(R.layout.headlines_heading_spacer, m_list, false);
             m_list.addHeaderView(layout);
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
index acddc7a8..7b7244a3 100644
--- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_fragment"
     android:background="?android:colorBackground"
     android:layout_width="fill_parent"
@@ -29,4 +30,15 @@
         android:visibility="invisible" >
     </TextView> -->
 
+    <com.shamanland.fab.FloatingActionButton
+        android:id="@+id/headlines_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|right"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="20dp"
+        app:floatingActionButtonColor="?colorAccent"
+        android:src="@drawable/ic_refresh"
+        />
+
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3