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

show drawer loading when refreshing fragment not initiated by swiping

Browse Source
This commit is contained in:
Andrew Dolgov 2017-06-01 13:13:11 +03:00
parent 7d47b16357
commit a0bc87f85b
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
View File

@ -337,7 +337,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override @Override
public void onRefresh() { public void onRefresh() {
refresh(false); refresh(true);
} }
}); });
@ -356,8 +356,6 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
loadingBar.setVisibility(View.VISIBLE); loadingBar.setVisibility(View.VISIBLE);
} }
//m_activity.m_pullToRefreshAttacher.addRefreshableView(list, this);
return view; return view;
} }
@ -390,10 +388,18 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
//out.putParcelable("cats", m_cats); //out.putParcelable("cats", m_cats);
} }
public void refresh(boolean background) { public void refresh(boolean swipeRefresh) {
if (!isAdded()) return; if (!isAdded()) return;
if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true); if (m_swipeLayout != null && swipeRefresh) {
m_swipeLayout.setRefreshing(true);
} else {
View loadingBar = getView().findViewById(R.id.feeds_loading_bar);
if (loadingBar != null) {
loadingBar.setVisibility(View.VISIBLE);
}
}
getLoaderManager().restartLoader(0, null, this).forceLoad(); getLoaderManager().restartLoader(0, null, this).forceLoad();
} }
@ -529,8 +535,4 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
return m_selectedCat; return m_selectedCat;
} }
/* @Override
public void onRefreshStarted(View view) {
refresh(false);
} */
} }

14
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
View File

@ -366,7 +366,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override @Override
public void onRefresh() { public void onRefresh() {
refresh(false); refresh(true);
} }
}); });
@ -465,10 +465,18 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
} }
@SuppressWarnings({ "serial" }) @SuppressWarnings({ "serial" })
public void refresh(boolean background) { public void refresh(boolean swipeRefresh) {
if (!isAdded()) return; if (!isAdded()) return;
if (m_swipeLayout != null) m_swipeLayout.setRefreshing(true); if (m_swipeLayout != null && swipeRefresh) {
m_swipeLayout.setRefreshing(true);
} else {
View loadingBar = getView().findViewById(R.id.feeds_loading_bar);
if (loadingBar != null) {
loadingBar.setVisibility(View.VISIBLE);
}
}
getLoaderManager().restartLoader(0, null, this).forceLoad(); getLoaderManager().restartLoader(0, null, this).forceLoad();
} }