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

hopefully improve headline footer handling

This commit is contained in:
Andrew Dolgov 2016-04-19 10:16:57 +03:00
parent fb540692ae
commit f0de531e2e
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
android:versionCode="409"
android:versionCode="410"
android:versionName="1.176" >
<uses-sdk

37
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -117,7 +117,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
private ListView m_list;
private ImageLoader m_imageLoader = ImageLoader.getInstance();
private View m_listLoadingView;
//private View m_topChangedView;
private View m_topChangedView;
private View m_amrFooterView;
public ArticleList getSelectedArticles() {
ArticleList tmp = new ArticleList();
@ -450,23 +451,22 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
}
m_listLoadingView = inflater.inflate(R.layout.headlines_row_loadmore, m_list, false);
m_list.addFooterView(m_listLoadingView, null, false);
m_listLoadingView.setVisibility(View.GONE);
//m_list.addFooterView(m_listLoadingView, null, false);
//m_listLoadingView.setVisibility(View.GONE);
/*m_topChangedView = inflater.inflate(R.layout.headlines_row_top_changed, m_list, false);
m_list.addFooterView(m_topChangedView, null, false);
m_topChangedView.setVisibility(View.GONE);*/
m_topChangedView = inflater.inflate(R.layout.headlines_row_top_changed, m_list, false);
//m_list.addFooterView(m_topChangedView, null, false);
//m_topChangedView.setVisibility(View.GONE);*/
if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
Display display = wm.getDefaultDisplay();
int screenHeight = display.getHeight();
View layout = inflater.inflate(R.layout.headlines_footer, container, false);
m_amrFooterView = inflater.inflate(R.layout.headlines_footer, container, false);
m_amrFooterView.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, screenHeight));
layout.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, screenHeight));
m_list.addFooterView(layout, null, false);
m_list.addFooterView(m_amrFooterView, null, false);
}
if (m_activity.isSmallScreen()) {
@ -569,6 +569,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
@SuppressWarnings({ "serial" })
public void refresh(boolean append, boolean userInitiated) {
m_list.removeFooterView(m_listLoadingView);
m_list.removeFooterView(m_topChangedView);
m_list.removeFooterView(m_amrFooterView);
if (!append) m_lazyLoadDisabled = false;
@ -612,7 +615,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
m_listLoadingView.setVisibility(View.GONE);
//m_listLoadingView.setVisibility(View.GONE);
m_list.removeFooterView(m_listLoadingView);
m_list.removeFooterView(m_topChangedView);
m_list.removeFooterView(m_amrFooterView);
if (result != null) {
m_refreshInProgress = false;
@ -624,10 +630,12 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (m_firstIdChanged) {
m_lazyLoadDisabled = true;
m_activity.toast(R.string.headlines_row_top_changed);
//m_activity.toast(R.string.headlines_row_top_changed);
//m_topChangedView.setVisibility(View.VISIBLE);
//m_articles.add(new Article(ARTICLE_SPECIAL_TOP_CHANGED));
m_list.addFooterView(m_topChangedView, null, false);
}
HeadlinesFragment.this.m_firstId = m_firstId;
@ -658,6 +666,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
//m_activity.setLoadingStatus(getErrorMessage(), false);
}
}
if (m_amrFooterView != null) m_list.addFooterView(m_amrFooterView, null, false);
}
};
@ -688,7 +698,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
}
if (skip > 0) {
m_listLoadingView.setVisibility(View.VISIBLE);
m_list.addFooterView(m_listLoadingView, null, false);
//m_listLoadingView.setVisibility(View.VISIBLE);
}
} else {