diff --git a/res/layout-xlarge-port/main.xml b/res/layout-xlarge-port/main.xml index 40a88092..980cbe47 100644 --- a/res/layout-xlarge-port/main.xml +++ b/res/layout-xlarge-port/main.xml @@ -11,12 +11,6 @@ android:gravity="center" android:orientation="vertical" > - - - - - diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml index 853df1d8..c7f9237f 100644 --- a/res/layout/feeds_fragment.xml +++ b/res/layout/feeds_fragment.xml @@ -3,7 +3,6 @@ - diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml index 5b4a5bcd..e131d28e 100644 --- a/res/layout/headlines_fragment.xml +++ b/res/layout/headlines_fragment.xml @@ -5,7 +5,6 @@ android:layout_height="fill_parent" android:id="@+id/headlines_fragment"> - - - , Integer, JsonE context.setAttribute(ClientContext.CREDS_PROVIDER, cp); } - + httpPost.setEntity(new StringEntity(requestStr, "utf-8")); HttpResponse execute = client.execute(httpPost, context); diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index 673e5a89..cddb5103 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -17,11 +17,13 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; +import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.Window; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; @@ -120,7 +122,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe if (m_cats == null || m_cats.size() == 0) refresh(false); else - view.findViewById(R.id.loading_progress).setVisibility(View.GONE); + getActivity().setProgressBarIndeterminateVisibility(false); return view; } @@ -151,13 +153,9 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe 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); } @SuppressWarnings("unchecked") @@ -169,14 +167,12 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe if (sessionId != null) { - if (!background) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - setLoadingStatus(R.string.blank, true); - } - }); - } + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + setLoadingStatus(R.string.blank, true); + } + }); @SuppressWarnings("serial") HashMap map = new HashMap() { diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 7a1631fc..f0420bbe 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -162,7 +162,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh if (m_feeds == null || m_feeds.size() == 0) refresh(false); else - view.findViewById(R.id.loading_progress).setVisibility(View.GONE); + getActivity().setProgressBarIndeterminateVisibility(false); return view; } @@ -219,14 +219,12 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh if (sessionId != null) { - if (!background) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - setLoadingStatus(R.string.blank, true); - } - }); - } + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + setLoadingStatus(R.string.blank, true); + } + }); HashMap map = new HashMap() { { @@ -251,13 +249,9 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh 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); } @SuppressWarnings({ "unchecked", "serial" }) diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 57bd79f3..58e011b7 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -148,7 +148,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (m_feed != null && (m_articles == null || m_articles.size() == 0)) refresh(false); else - view.findViewById(R.id.loading_progress).setVisibility(View.GONE); + getActivity().setProgressBarIndeterminateVisibility(false); return view; } @@ -254,13 +254,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, 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 HeadlinesRequest extends ApiRequest { diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 8d0b3261..39eb0ff4 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -48,6 +48,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; @@ -451,7 +452,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices { } super.onCreate(savedInstanceState); - + + requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); + m_themeName = m_prefs.getString("theme", "THEME_DARK"); if (savedInstanceState != null) { @@ -623,12 +626,8 @@ public class MainActivity extends FragmentActivity implements OnlineServices { 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 @@ -1325,6 +1324,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { private void loginSuccess() { findViewById(R.id.loading_container).setVisibility(View.GONE); + setProgressBarIndeterminateVisibility(false); m_isOffline = false; @@ -1629,8 +1629,6 @@ public class MainActivity extends FragmentActivity implements OnlineServices { if (tv != null) { tv.setText(R.string.login_ready); } - - findViewById(R.id.loading_progress).setVisibility(View.GONE); initMainMenu(); } 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,