diff options
Diffstat (limited to 'org.fox.ttrss')
3 files changed, 5 insertions, 21 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 37af2818..78723434 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="377" - android:versionName="1.149" > + android:versionCode="378" + android:versionName="1.150" > <uses-sdk android:minSdkVersion="15" 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 1efee57f..da49483f 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 @@ -88,7 +88,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public static final int HEADLINES_BUFFER_MAX = 500; public static final int ARTICLE_SPECIAL_LOADMORE = -1; - public static final int ARTICLE_SPECIAL_SPACER = -2; public static final int ARTICLE_SPECIAL_TOP_CHANGED = -3; private final String TAG = this.getClass().getSimpleName(); @@ -538,7 +537,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (result != null) { m_refreshInProgress = false; - m_articles.add(0, new Article(ARTICLE_SPECIAL_SPACER)); if (m_articles.indexOf(m_activeArticle) == -1) m_activeArticle = null; @@ -702,8 +700,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, 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_SPACER = 5; - public static final int VIEW_TOP_CHANGED = 6; + public static final int VIEW_TOP_CHANGED = 5; public static final int VIEW_COUNT = VIEW_TOP_CHANGED+1; @@ -758,15 +755,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public int getItemViewType(int position) { Article a = items.get(position); - // the special invisible SPACER is here because listview animations apparently glitch if there's only one headline loaded - // so we add an invisible second one i guess - if (a.id == ARTICLE_SPECIAL_LOADMORE) { return VIEW_LOADMORE; } else if (a.id == ARTICLE_SPECIAL_TOP_CHANGED) { return VIEW_TOP_CHANGED; - } else if (a.id == ARTICLE_SPECIAL_SPACER) { - return VIEW_SPACER; } 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) { @@ -867,9 +859,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, case VIEW_LOADMORE: layoutId = R.layout.headlines_row_loadmore; break; - case VIEW_SPACER: - layoutId = R.layout.fragment_dummy; - break; case VIEW_TOP_CHANGED: layoutId = R.layout.headlines_row_top_changed; break; @@ -1382,11 +1371,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } public ArticleList getAllArticles() { - ArticleList tmp = (ArticleList) m_articles.clone(); - - tmp.remove(0); - - return tmp; + return (ArticleList) m_articles.clone(); } // if setting active doesn't make sense, scroll to whatever is passed to us @@ -1550,7 +1535,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public void setArticles(ArticleList articles) { m_articles.clear(); - m_articles.add(0, new Article(ARTICLE_SPECIAL_SPACER)); m_articles.addAll(articles); 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 19a02bd5..116c3d00 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 @@ -119,7 +119,7 @@ public class Article implements Parcelable { } } - Log.d("Article", "collectMediaInfo: " + flavorImage); + //Log.d("Article", "collectMediaInfo: " + flavorImage); } public Article(int id) { |