iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove per-fragment loading messages

Browse Source
This commit is contained in:
Andrew Dolgov 2012-09-21 10:56:49 +04:00
parent b9bd5e89b1
commit 81522a6172
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/fox/ttrss/CommonActivity.java
View File

@ -10,6 +10,7 @@ import android.util.DisplayMetrics;
import android.util.FloatMath; import android.util.FloatMath;
import android.util.Log; import android.util.Log;
import android.view.Display; import android.view.Display;
import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
@ -55,6 +56,8 @@ public class CommonActivity extends FragmentActivity {
tv.setText(status); tv.setText(status);
} }
findViewById(R.id.loading_container).setVisibility(status == R.string.blank ? View.GONE : View.VISIBLE);
setProgressBarIndeterminateVisibility(showProgress); setProgressBarIndeterminateVisibility(showProgress);
} }

15
src/org/fox/ttrss/FeedCategoriesFragment.java
View File

@ -203,7 +203,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
out.putParcelable("cats", m_cats); out.putParcelable("cats", m_cats);
} }
private void setLoadingStatus(int status, boolean showProgress) { /* private void setLoadingStatus(int status, boolean showProgress) {
if (getView() != null) { if (getView() != null) {
TextView tv = (TextView)getView().findViewById(R.id.loading_message); TextView tv = (TextView)getView().findViewById(R.id.loading_message);
@ -213,7 +213,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
} }
m_activity.setProgressBarIndeterminateVisibility(showProgress); m_activity.setProgressBarIndeterminateVisibility(showProgress);
} } */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void refresh(boolean background) { public void refresh(boolean background) {
@ -223,7 +223,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
final boolean unreadOnly = m_activity.getUnreadOnly(); final boolean unreadOnly = m_activity.getUnreadOnly();
if (sessionId != null) { if (sessionId != null) {
setLoadingStatus(R.string.blank, true); m_activity.setLoadingStatus(R.string.blank, true);
m_activity.setProgressBarVisibility(true); m_activity.setProgressBarVisibility(true);
@SuppressWarnings("serial") @SuppressWarnings("serial")
@ -280,10 +280,11 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
sortCats(); sortCats();
if (m_cats.size() == 0) /* if (m_cats.size() == 0)
setLoadingStatus(R.string.no_feeds_to_display, false); setLoadingStatus(R.string.no_feeds_to_display, false);
else else */
setLoadingStatus(R.string.blank, false);
m_activity.setLoadingStatus(R.string.blank, false);
return; return;
} }
@ -296,7 +297,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
if (m_lastError == ApiError.LOGIN_FAILED) { if (m_lastError == ApiError.LOGIN_FAILED) {
m_activity.login(true); m_activity.login(true);
} else { } else {
setLoadingStatus(getErrorMessage(), false); m_activity.setLoadingStatus(getErrorMessage(), false);
} }
} }

15
src/org/fox/ttrss/FeedsFragment.java
View File

@ -296,7 +296,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
FeedsRequest req = new FeedsRequest(getActivity().getApplicationContext(), catId); FeedsRequest req = new FeedsRequest(getActivity().getApplicationContext(), catId);
if (sessionId != null) { if (sessionId != null) {
setLoadingStatus(R.string.blank, true); m_activity.setLoadingStatus(R.string.blank, true);
HashMap<String,String> map = new HashMap<String,String>() { HashMap<String,String> map = new HashMap<String,String>() {
{ {
@ -315,7 +315,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
} }
} }
private void setLoadingStatus(int status, boolean showProgress) { /* private void setLoadingStatus(int status, boolean showProgress) {
if (getView() != null) { if (getView() != null) {
TextView tv = (TextView)getView().findViewById(R.id.loading_message); TextView tv = (TextView)getView().findViewById(R.id.loading_message);
@ -326,7 +326,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
if (getActivity() != null) if (getActivity() != null)
getActivity().setProgressBarIndeterminateVisibility(showProgress); getActivity().setProgressBarIndeterminateVisibility(showProgress);
} } */
@SuppressWarnings({ "unchecked", "serial" }) @SuppressWarnings({ "unchecked", "serial" })
public void getFeedIcons() { public void getFeedIcons() {
@ -407,10 +407,11 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
sortFeeds(); sortFeeds();
if (m_feeds.size() == 0) /*if (m_feeds.size() == 0)
setLoadingStatus(R.string.no_feeds_to_display, false); setLoadingStatus(R.string.no_feeds_to_display, false);
else else */
setLoadingStatus(R.string.blank, false);
m_activity.setLoadingStatus(R.string.blank, false);
if (m_enableFeedIcons && !m_feedIconsChecked && if (m_enableFeedIcons && !m_feedIconsChecked &&
Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()))
@ -427,7 +428,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
if (m_lastError == ApiError.LOGIN_FAILED) { if (m_lastError == ApiError.LOGIN_FAILED) {
m_activity.login(true); m_activity.login(true);
} else { } else {
setLoadingStatus(getErrorMessage(), false); m_activity.setLoadingStatus(getErrorMessage(), false);
} }
} }
} }

8
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -384,7 +384,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (m_lastError == ApiError.LOGIN_FAILED) { if (m_lastError == ApiError.LOGIN_FAILED) {
m_activity.login(); m_activity.login();
} else { } else {
setLoadingStatus(getErrorMessage(), false); m_activity.setLoadingStatus(getErrorMessage(), false);
} }
} }
} }
@ -399,7 +399,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (skip == 0) skip = m_articles.size(); if (skip == 0) skip = m_articles.size();
} else { } else {
setLoadingStatus(R.string.blank, true); m_activity.setLoadingStatus(R.string.blank, true);
} }
final int fskip = skip; final int fskip = skip;
@ -445,7 +445,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
out.putCharSequence("searchQuery", m_searchQuery); out.putCharSequence("searchQuery", m_searchQuery);
} }
private void setLoadingStatus(int status, boolean showProgress) { /* private void setLoadingStatus(int status, boolean showProgress) {
if (getView() != null) { if (getView() != null) {
TextView tv = (TextView)getView().findViewById(R.id.loading_message); TextView tv = (TextView)getView().findViewById(R.id.loading_message);
@ -456,7 +456,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (getActivity() != null) if (getActivity() != null)
getActivity().setProgressBarIndeterminateVisibility(showProgress); getActivity().setProgressBarIndeterminateVisibility(showProgress);
} } */
/* private class HeadlinesRequest extends ApiRequest { /* private class HeadlinesRequest extends ApiRequest {
int m_offset = 0; int m_offset = 0;

2
src/org/fox/ttrss/OnlineActivity.java
View File

@ -406,6 +406,7 @@ public class OnlineActivity extends CommonActivity {
alert.show(); alert.show();
} else { } else {
setLoadingStatus(R.string.login_in_progress, true);
LoginRequest ar = new LoginRequest(getApplicationContext(), refresh); LoginRequest ar = new LoginRequest(getApplicationContext(), refresh);
@ -425,7 +426,6 @@ public class OnlineActivity extends CommonActivity {
protected void loginSuccess(boolean refresh) { protected void loginSuccess(boolean refresh) {
setLoadingStatus(R.string.blank, false); setLoadingStatus(R.string.blank, false);
findViewById(R.id.loading_container).setVisibility(View.GONE);
initMenu(); initMenu();