From e1afe38ef3e4731cdc55d97fdfce281244ad52bf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 20 Jun 2012 00:44:37 +0400
Subject: use activity progress indicator

---
 src/org/fox/ttrss/offline/OfflineActivity.java          | 13 ++++++-------
 src/org/fox/ttrss/offline/OfflineFeedsFragment.java     | 12 ++++--------
 src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 16 ++++++----------
 3 files changed, 16 insertions(+), 25 deletions(-)

(limited to 'src/org/fox/ttrss/offline')

diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java
index fddd8dec..d863ee53 100644
--- a/src/org/fox/ttrss/offline/OfflineActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineActivity.java
@@ -35,6 +35,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.EditText;
@@ -119,6 +120,8 @@ public class OfflineActivity extends FragmentActivity implements
 		}
 
 		super.onCreate(savedInstanceState);
+		
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 
 		NotificationManager nmgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 		nmgr.cancel(OfflineDownloadService.NOTIFY_DOWNLOADING);
@@ -205,19 +208,15 @@ public class OfflineActivity extends FragmentActivity implements
 		return m_activeFeedId;
 	}
 
-	private void setLoadingStatus(int status, boolean showProgress) {
+	/* private void setLoadingStatus(int status, boolean showProgress) {
 		TextView tv = (TextView) findViewById(R.id.loading_message);
 
 		if (tv != null) {
 			tv.setText(status);
 		}
 
-		View pb = findViewById(R.id.loading_progress);
-
-		if (pb != null) {
-			pb.setVisibility(showProgress ? View.VISIBLE : View.GONE);
-		}
-	}
+		setProgressBarIndeterminateVisibility(showProgress);
+	} */
 
 	@Override
 	public void onSaveInstanceState(Bundle out) {
diff --git a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
index f1eafd20..682fb168 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -153,21 +153,17 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
 		}
 	}
 
-	public void setLoadingStatus(int status, boolean showProgress) {
+	/* public void setLoadingStatus(int status, boolean showProgress) {
 		if (getView() != null) {
 			TextView tv = (TextView)getView().findViewById(R.id.loading_message);
 			
 			if (tv != null) {
 				tv.setText(status);
 			}
-			
-			View pb = getView().findViewById(R.id.loading_progress);
-			
-			if (pb != null) {
-				pb.setVisibility(showProgress ? View.VISIBLE : View.GONE);
-			}
 		}
-	}
+		
+		getActivity().setProgressBarIndeterminateVisibility(showProgress);
+	} */
 	
 	private class FeedListAdapter extends SimpleCursorAdapter {
 		
diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 3b29c435..50d72332 100644
--- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -151,7 +151,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		list.setEmptyView(view.findViewById(R.id.no_headlines));
 		registerForContextMenu(list);
 
-		view.findViewById(R.id.loading_progress).setVisibility(View.GONE);
+		getActivity().setProgressBarIndeterminateVisibility(false);
 
 		return view;    	
 	}
@@ -213,21 +213,17 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		out.putCharSequence("searchQuery", m_searchQuery);
 	}
 
-	public void setLoadingStatus(int status, boolean showProgress) {
+	/* public void setLoadingStatus(int status, boolean showProgress) {
 		if (getView() != null) {
 			TextView tv = (TextView)getView().findViewById(R.id.loading_message);
 			
 			if (tv != null) {
 				tv.setText(status);
-			}
-			
-			View pb = getView().findViewById(R.id.loading_progress);
-			
-			if (pb != null) {
-				pb.setVisibility(showProgress ? View.VISIBLE : View.GONE);
-			}
+			}	
 		}
-	}
+		
+		getActivity().setProgressBarIndeterminateVisibility(showProgress);
+	} */
 	
 	private class ArticleListAdapter extends SimpleCursorAdapter {
 		public ArticleListAdapter(Context context, int layout, Cursor c,
-- 
cgit v1.2.3-54-g00ecf