implement headlines fragment pull to refresh

use indeterminate progressbar under actionbar

2 files changed, 19 insertions, 2 deletions

diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index e9812d36..a7ae32ad 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -13,6 +13,8 @@ import org.fox.ttrss.types.Feed;
 import org.fox.ttrss.util.HeadlinesRequest;
 import org.jsoup.Jsoup;
 
+import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher.OnRefreshListener;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -47,7 +49,7 @@ import android.widget.TextView;
 
 import com.google.gson.JsonElement;
 
-public class HeadlinesFragment extends Fragment implements OnItemClickListener, OnScrollListener {
+public class HeadlinesFragment extends Fragment implements OnItemClickListener, OnScrollListener, OnRefreshListener {
 	public static enum ArticlesSelection { ALL, NONE, UNREAD };
 
 	public static final int HEADLINES_REQUEST_SIZE = 30;
@@ -292,6 +294,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 		list.setOnScrollListener(this);
 		//list.setEmptyView(view.findViewById(R.id.no_headlines));
 		registerForContextMenu(list);
+		
+		m_activity.m_pullToRefreshAttacher.addRefreshableView(list, this);
 
 		//if (m_activity.isSmallScreen())
 		//view.findViewById(R.id.headlines_fragment).setPadding(0, 0, 0, 0);
@@ -414,6 +418,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 						
 						m_adapter.notifyDataSetChanged();
 						m_listener.onHeadlinesLoaded(fappend);
+						
+						if (isAdded()) {
+							m_activity.m_pullToRefreshAttacher.setRefreshComplete();
+						}
+						
 					} else {
 						if (m_lastError == ApiError.LOGIN_FAILED) {
 							m_activity.login();
@@ -945,5 +954,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 		return m_feed;
 	}
 
+	@Override
+	public void onRefreshStarted(View view) {
+		refresh(false);		
+	}
+
 	
 }
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index b62c4dfb..4957e913 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -153,7 +153,7 @@ public class OnlineActivity extends CommonActivity {
 			requestWindowFeature(Window.FEATURE_PROGRESS);
 		}
 
-		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+		//requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 
 		setProgressBarVisibility(false);
 		setProgressBarIndeterminateVisibility(false);
@@ -1000,6 +1000,7 @@ public class OnlineActivity extends CommonActivity {
 			return true;
 		case R.id.update_headlines:
 			if (hf != null) {
+				m_pullToRefreshAttacher.setRefreshing(true);
 				hf.refresh(false);
 			}
 			return true;
@@ -1582,6 +1583,8 @@ public class OnlineActivity extends CommonActivity {
 	}
 	
 	protected void refresh(boolean includeHeadlines) {
+		m_pullToRefreshAttacher.setRefreshing(true);
+		
 		FeedCategoriesFragment cf = (FeedCategoriesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_CATS);
 		
 		if (cf != null) {