summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorTom Hennen <tom.hennen@gmail.com>2015-10-10 19:29:32 -0400
committerTom Hennen <tom.hennen@gmail.com>2015-11-03 21:40:02 -0500
commitf9ef32fff29e4544fa46c2efa321338248c04d73 (patch)
tree464eafaca2a61f38c75b4e1f8e3a8df03e682822 /app/src/main/java
parent89bbc8882680fe0f8585d0995495e7ee2a2f8e36 (diff)
downloadAntennaPod-f9ef32fff29e4544fa46c2efa321338248c04d73.zip
resolved compilation problem and got rid of the 'no items' label
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java7
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java7
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java7
3 files changed, 5 insertions, 16 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index b26ce7991..3c94505ab 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -21,6 +21,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -76,7 +77,6 @@ public class AllEpisodesFragment extends Fragment {
private String prefName;
protected RecyclerView listView;
private AllEpisodesRecycleAdapter listAdapter;
- private TextView txtvEmpty;
private ProgressBar progLoading;
private List<FeedItem> episodes;
@@ -291,14 +291,10 @@ public class AllEpisodesFragment extends Fragment {
layoutManager = new LinearLayoutManager(getActivity());
listView.setLayoutManager(layoutManager);
- txtvEmpty = (TextView) root.findViewById(android.R.id.empty);
progLoading = (ProgressBar) root.findViewById(R.id.progLoading);
- //registerForContextMenu(listView);
-
if (!itemsLoaded) {
progLoading.setVisibility(View.VISIBLE);
- txtvEmpty.setVisibility(View.GONE);
}
viewsCreated = true;
@@ -395,7 +391,6 @@ public class AllEpisodesFragment extends Fragment {
}
if (viewsCreated && !itemsLoaded) {
listView.setVisibility(View.GONE);
- txtvEmpty.setVisibility(View.GONE);
progLoading.setVisibility(View.VISIBLE);
}
subscription = Observable.defer(() -> Observable.just(loadData()))
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
index 13b121eb9..20b4efd7c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
@@ -119,10 +119,7 @@ public class FavoriteEpisodesFragment extends AllEpisodesFragment {
}
@Override
- protected Pair<List<FeedItem>,LongList> loadData() {
- List<FeedItem> items;
- items = DBReader.getFavoriteItemsList();
- LongList queuedIds = DBReader.getQueueIDList();
- return Pair.create(items, queuedIds);
+ protected List<FeedItem> loadData() {
+ return DBReader.getFavoriteItemsList();
}
}
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index 4f06741bc..0b9e469d6 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -125,11 +125,8 @@ public class NewEpisodesFragment extends AllEpisodesFragment {
}
@Override
- protected Pair<List<FeedItem>,LongList> loadData() {
- List<FeedItem> items;
- items = DBReader.getNewItemsList();
- LongList queuedIds = DBReader.getQueueIDList();
- return Pair.create(items, queuedIds);
+ protected List<FeedItem> loadData() {
+ return DBReader.getNewItemsList();
}
}