diff options
Diffstat (limited to 'app/src/main')
5 files changed, 5 insertions, 54 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(); } } diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml index 87bf9266e..81562b560 100644 --- a/app/src/main/res/layout/all_episodes_fragment.xml +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -15,36 +15,6 @@ android:paddingTop="@dimen/list_vertical_padding" android:paddingBottom="@dimen/list_vertical_padding" android:clipToPadding="false"/> - <!-- - <com.mobeta.android.dslv.DragSortListView - android:id="@android:id/list" - android:scrollbarStyle="outsideOverlay" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="@dimen/list_vertical_padding" - android:paddingBottom="@dimen/list_vertical_padding" - android:clipToPadding="false" - dslv:collapsed_height="2dp" - dslv:drag_enabled="false" - dslv:drag_scroll_start="0.33" - dslv:float_alpha="0.6" - dslv:max_drag_scroll_speed="0.5" - dslv:remove_enabled="true" - dslv:remove_mode="flingRemove" - dslv:slide_shuffle_speed="0.3" - dslv:sort_enabled="false" - dslv:track_drag_sort="false" - dslv:float_background_color="?attr/dragview_float_background" - dslv:use_default_controller="true" - tools:background="@android:color/holo_green_dark"/> ---> - <TextView - android:id="@id/android:empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/no_items_label"/> <ProgressBar android:id="@+id/progLoading" diff --git a/app/src/main/res/layout/episodes_fragment_with_undo.xml b/app/src/main/res/layout/episodes_fragment_with_undo.xml index 7767a0833..0878b548f 100644 --- a/app/src/main/res/layout/episodes_fragment_with_undo.xml +++ b/app/src/main/res/layout/episodes_fragment_with_undo.xml @@ -39,14 +39,6 @@ tools:background="@android:color/holo_green_dark"/> --> - <TextView - android:id="@id/android:empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" - android:text="@string/no_items_label"/> - <ProgressBar android:id="@+id/progLoading" android:layout_width="wrap_content" |