From a38d90e80649bca8aecc8e1669af1bf2b1670aad Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 8 Jun 2015 09:42:31 +0300 Subject: feeds/cats: do not set empty view because doing so obscures headers/footers when there's no content --- .../src/main/java/org/fox/ttrss/FeedCategoriesFragment.java | 6 ------ org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java | 7 ------- .../java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java | 1 - .../src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java | 1 - 4 files changed, 15 deletions(-) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 08028297..66fe7283 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -322,12 +322,6 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false); if (getView() != null) { - ListView list = (ListView)getView().findViewById(R.id.feeds); - - if (list != null) { - list.setEmptyView(getView().findViewById(R.id.no_feeds)); - } - View loadingBar = getView().findViewById(R.id.feeds_loading_bar); if (loadingBar != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index a8a71787..ebf1d692 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -301,7 +301,6 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi m_adapter = new FeedListAdapter(getActivity(), R.layout.feeds_row, (ArrayList)m_feeds); m_list.setAdapter(m_adapter); - //list.setEmptyView(view.findViewById(R.id.no_feeds)); m_list.setOnItemClickListener(this); registerForContextMenu(m_list); @@ -499,12 +498,6 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi if (isDetached()) return; if (getView() != null) { - ListView list = (ListView)getView().findViewById(R.id.feeds); - - if (list != null) { - list.setEmptyView(getView().findViewById(R.id.no_feeds)); - } - View loadingBar = getView().findViewById(R.id.feeds_loading_bar); if (loadingBar != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index 79d56775..24c915cc 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -154,7 +154,6 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen m_list.setAdapter(m_adapter); m_list.setOnItemClickListener(this); - m_list.setEmptyView(view.findViewById(R.id.no_feeds)); registerForContextMenu(m_list); return view; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java index a64076c8..b3195596 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -175,7 +175,6 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem m_list.setAdapter(m_adapter); m_list.setOnItemClickListener(this); - m_list.setEmptyView(view.findViewById(R.id.no_feeds)); registerForContextMenu(m_list); m_enableFeedIcons = m_prefs.getBoolean("download_feed_icons", false); -- cgit v1.2.3