From 31858ef90a4335f61d201403ebfef31191289409 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 Jun 2017 18:07:01 +0300 Subject: [PATCH] headlines fragment: inject footer on setarticles() top changed: notify via snackbar remove some unused views --- .../java/org/fox/ttrss/HeadlinesFragment.java | 31 +++++++------------ .../java/org/fox/ttrss/types/Article.java | 1 - .../res/layout/headlines_row_top_changed.xml | 19 ------------ .../main/res/layout/headlines_row_undo.xml | 29 ----------------- org.fox.ttrss/src/main/res/values/strings.xml | 1 + 5 files changed, 13 insertions(+), 68 deletions(-) delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_row_top_changed.xml delete mode 100644 org.fox.ttrss/src/main/res/layout/headlines_row_undo.xml diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 2ea88b3e..c9bad8c9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -623,7 +623,14 @@ public class HeadlinesFragment extends Fragment { //Log.d(TAG, "first id changed, disabling lazy load"); if (!(m_activity instanceof DetailActivity)) { - m_articles.add(new Article(Article.TYPE_TOP_CHANGED)); + + Snackbar.make(getView(), R.string.headlines_row_top_changed, Snackbar.LENGTH_LONG) + .setAction(R.string.reload, new OnClickListener() { + @Override + public void onClick(View v) { + refresh(false); + } + }).show(); } } @@ -775,7 +782,6 @@ public class HeadlinesFragment extends Fragment { public ImageView textChecked; public View headlineHeader; public View flavorImageOverflow; - public View rowTopChanged; public TextureView flavorVideoView; //public int position; public boolean flavorImageEmbedded; @@ -817,7 +823,6 @@ public class HeadlinesFragment extends Fragment { textImage = (ImageView) v.findViewById(R.id.text_image); textChecked = (ImageView) v.findViewById(R.id.text_checked); headlineHeader = v.findViewById(R.id.headline_header); - rowTopChanged = v.findViewById(R.id.headlines_row_top_changed); flavorImageOverflow = v.findViewById(R.id.gallery_overflow); flavorVideoView = (TextureView) v.findViewById(R.id.flavor_video); @@ -866,8 +871,7 @@ public class HeadlinesFragment extends Fragment { public static final int VIEW_SELECTED = 2; public static final int VIEW_SELECTED_UNREAD = 3; public static final int VIEW_LOADMORE = 4; - public static final int VIEW_TOP_CHANGED = 5; - public static final int VIEW_AMR_FOOTER = 6; + public static final int VIEW_AMR_FOOTER = 5; public static final int VIEW_COUNT = VIEW_AMR_FOOTER + 1; @@ -919,9 +923,6 @@ public class HeadlinesFragment extends Fragment { case VIEW_AMR_FOOTER: layoutId = R.layout.headlines_footer; break; - case VIEW_TOP_CHANGED: - layoutId = R.layout.headlines_row_top_changed; - break; case VIEW_LOADMORE: layoutId = R.layout.headlines_row_loadmore; break; @@ -960,15 +961,6 @@ public class HeadlinesFragment extends Fragment { holder.view.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, screenHeight)); } - if (holder.rowTopChanged != null) { - holder.rowTopChanged.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - refresh(false); - } - }); - } - // nothing else of interest for those below anyway if (article.id < 0) return; @@ -1499,8 +1491,6 @@ public class HeadlinesFragment extends Fragment { return VIEW_AMR_FOOTER; } else if (a.id == Article.TYPE_LOADMORE) { return VIEW_LOADMORE; - } else if (a.id == Article.TYPE_TOP_CHANGED) { - return VIEW_TOP_CHANGED; } else if (m_activeArticle != null && a.id == m_activeArticle.id && a.unread) { return VIEW_SELECTED_UNREAD; } else if (m_activeArticle != null && a.id == m_activeArticle.id) { @@ -1804,6 +1794,9 @@ public class HeadlinesFragment extends Fragment { public void setArticles(ArticleList articles) { m_articles.clear(); m_articles.addAll(articles); + + m_articles.add(new Article(Article.TYPE_AMR_FOOTER)); + m_adapter.notifyDataSetChanged(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java index da6b8f89..ae28bb1d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java @@ -16,7 +16,6 @@ import java.util.regex.Pattern; public class Article implements Parcelable { public static final int TYPE_LOADMORE = -1; public static final int TYPE_AMR_FOOTER = -2; - public static final int TYPE_TOP_CHANGED = -3; public int id; public boolean unread; diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_top_changed.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_top_changed.xml deleted file mode 100755 index 8e6b21b3..00000000 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_top_changed.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_undo.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_undo.xml deleted file mode 100644 index 56c79056..00000000 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_undo.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - -