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

do not reuse headline footer views

Browse Source
This commit is contained in:
Andrew Dolgov 2017-06-03 10:21:41 +03:00
parent f26b5dda51
commit 76140cff3a
2 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,9 @@ public class HeadlinesFragment extends Fragment {
private RecyclerView m_list; private RecyclerView m_list;
private LinearLayoutManager m_layoutManager; private LinearLayoutManager m_layoutManager;
private View m_listLoadingView; /*private View m_listLoadingView;
private View m_topChangedView; private View m_topChangedView;
private View m_amrFooterView; private View m_amrFooterView;*/
private MediaPlayer m_mediaPlayer; private MediaPlayer m_mediaPlayer;
private TextureView m_activeTexture; private TextureView m_activeTexture;
@ -285,6 +285,25 @@ public class HeadlinesFragment extends Fragment {
setRetainInstance(true); setRetainInstance(true);
} }
public View createListFooter(int layoutId) {
if (isAdded() || m_activity != null) {
View view = getActivity().getLayoutInflater().inflate(layoutId, m_list, false);
if (layoutId == R.layout.headlines_footer) {
WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
Display display = wm.getDefaultDisplay();
int screenHeight = display.getHeight();
view.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, screenHeight));
}
return view;
} else {
return null;
}
}
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@ -429,18 +448,18 @@ public class HeadlinesFragment extends Fragment {
fab.setVisibility(View.GONE); fab.setVisibility(View.GONE);
} }
m_listLoadingView = inflater.inflate(R.layout.headlines_row_loadmore, m_list, false); /*m_listLoadingView = inflater.inflate(R.layout.headlines_row_loadmore, m_list, false);
m_topChangedView = inflater.inflate(R.layout.headlines_row_top_changed, m_list, false); m_topChangedView = inflater.inflate(R.layout.headlines_row_top_changed, m_list, false);*/
if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) { if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) {
WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE); /*WindowManager wm = (WindowManager) m_activity.getSystemService(Context.WINDOW_SERVICE);
Display display = wm.getDefaultDisplay(); Display display = wm.getDefaultDisplay();
int screenHeight = display.getHeight(); int screenHeight = display.getHeight();*/
m_amrFooterView = 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)); m_amrFooterView.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, screenHeight));
m_adapter.addFooterView(m_amrFooterView); m_adapter.addFooterView(m_amrFooterView);*/
} }
if (m_activity.isSmallScreen()) { if (m_activity.isSmallScreen()) {
@ -566,9 +585,11 @@ public class HeadlinesFragment extends Fragment {
@SuppressWarnings({ "serial" }) @SuppressWarnings({ "serial" })
public void refresh(final boolean append, boolean userInitiated) { public void refresh(final boolean append, boolean userInitiated) {
m_adapter.removeFooterView(m_listLoadingView); /*m_adapter.removeFooterView(m_listLoadingView);
m_adapter.removeFooterView(m_topChangedView); m_adapter.removeFooterView(m_topChangedView);
m_adapter.removeFooterView(m_amrFooterView); m_adapter.removeFooterView(m_amrFooterView);*/
m_adapter.removeAllFooterViews();
if (!append) m_lazyLoadDisabled = false; if (!append) m_lazyLoadDisabled = false;
@ -598,9 +619,10 @@ public class HeadlinesFragment extends Fragment {
if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false); if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
m_adapter.removeFooterView(m_listLoadingView); /*m_adapter.removeFooterView(m_listLoadingView);
m_adapter.removeFooterView(m_topChangedView); m_adapter.removeFooterView(m_topChangedView);
m_adapter.removeFooterView(m_amrFooterView); m_adapter.removeFooterView(m_amrFooterView);*/
m_adapter.removeAllFooterViews();
if (result != null) { if (result != null) {
m_refreshInProgress = false; m_refreshInProgress = false;
@ -612,7 +634,7 @@ public class HeadlinesFragment extends Fragment {
if (m_firstIdChanged) { if (m_firstIdChanged) {
m_lazyLoadDisabled = true; m_lazyLoadDisabled = true;
m_adapter.addFooterView(m_topChangedView); m_adapter.addFooterView(createListFooter(R.layout.headlines_row_top_changed));
} }
if (m_amountLoaded < HEADLINES_REQUEST_SIZE) { if (m_amountLoaded < HEADLINES_REQUEST_SIZE) {
@ -637,7 +659,8 @@ public class HeadlinesFragment extends Fragment {
} }
} }
if (m_amrFooterView != null) m_adapter.addFooterView(m_amrFooterView); if (m_prefs.getBoolean("headlines_mark_read_scroll", false))
m_adapter.addFooterView(createListFooter(R.layout.headlines_footer));
} }
}; };
@ -668,7 +691,7 @@ public class HeadlinesFragment extends Fragment {
} }
if (skip > 0) { if (skip > 0) {
m_adapter.addFooterView(m_listLoadingView); m_adapter.addFooterView(createListFooter(R.layout.headlines_row_loadmore));
} }
} }

4
org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeaderViewRecyclerAdapter.java
View File

@ -129,6 +129,10 @@ public class HeaderViewRecyclerAdapter extends RecyclerView.Adapter<RecyclerView
mFooterViews.remove(view); mFooterViews.remove(view);
} }
public void removeAllFooterViews() {
mFooterViews.clear();
}
@Override @Override
public int getItemCount() { public int getItemCount() {
return getHeaderCount() + getFooterCount() + getWrappedItemCount(); return getHeaderCount() + getFooterCount() + getWrappedItemCount();