From 1620d2954982195d2033444e227214dbcd90a245 Mon Sep 17 00:00:00 2001 From: orionlee Date: Thu, 17 Oct 2019 11:44:00 -0700 Subject: Sort in Podcast screen - UI --- .../de/danoeh/antennapod/fragment/FeedItemlistFragment.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 0c33dce5a..471651e88 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -5,10 +5,6 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.LightingColorFilter; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.fragment.app.ListFragment; -import androidx.core.view.MenuItemCompat; -import androidx.appcompat.widget.SearchView; import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; @@ -23,12 +19,16 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.SearchView; +import androidx.core.view.MenuItemCompat; +import androidx.fragment.app.ListFragment; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.joanzapata.iconify.Iconify; import com.joanzapata.iconify.widget.IconTextView; -import de.danoeh.antennapod.core.event.PlaybackPositionEvent; import org.apache.commons.lang3.Validate; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -45,6 +45,7 @@ import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator; import de.danoeh.antennapod.core.event.DownloadEvent; import de.danoeh.antennapod.core.event.DownloaderUpdate; import de.danoeh.antennapod.core.event.FeedItemEvent; +import de.danoeh.antennapod.core.event.PlaybackPositionEvent; import de.danoeh.antennapod.core.feed.EventDistributor; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.feed.FeedEvent; @@ -192,6 +193,7 @@ public class FeedItemlistFragment extends ListFragment { searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() { @Override public boolean onMenuItemActionExpand(MenuItem item) { + menu.findItem(R.id.sort_items).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); menu.findItem(R.id.filter_items).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); menu.findItem(R.id.episode_actions).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); menu.findItem(R.id.refresh_item).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); @@ -623,6 +625,7 @@ public class FeedItemlistFragment extends ListFragment { @NonNull private Optional loadData() { + // TODO-2524: apply sorting, either at db level or here Feed feed = DBReader.getFeed(feedID); if (feed != null && feed.getItemFilter() != null) { DBReader.loadAdditionalFeedItemListData(feed.getItems()); -- cgit v1.2.3 From be7db6cef1feedd2ea777cd8dec98348965bb861 Mon Sep 17 00:00:00 2001 From: orionlee Date: Fri, 18 Oct 2019 14:14:18 -0700 Subject: sort in podcast screen - logic, no db persistence yet. --- .../antennapod/fragment/FeedItemlistFragment.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 471651e88..415af83d5 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -34,6 +34,7 @@ import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import java.util.Collections; import java.util.List; import de.danoeh.antennapod.R; @@ -52,6 +53,7 @@ import de.danoeh.antennapod.core.feed.FeedEvent; import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedItemFilter; import de.danoeh.antennapod.core.feed.FeedMedia; +import de.danoeh.antennapod.core.feed.IntraFeedSortOrder; import de.danoeh.antennapod.core.glide.ApGlideSettings; import de.danoeh.antennapod.core.glide.FastBlurTransformation; import de.danoeh.antennapod.core.service.download.DownloadService; @@ -63,6 +65,7 @@ import de.danoeh.antennapod.core.storage.DownloadRequester; import de.danoeh.antennapod.core.util.FeedItemUtil; import de.danoeh.antennapod.core.util.LongList; import de.danoeh.antennapod.core.util.Optional; +import de.danoeh.antennapod.core.util.comparator.FeedItemPubdateComparator; import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil; import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment; import de.danoeh.antennapod.dialog.RenameFeedDialog; @@ -625,13 +628,26 @@ public class FeedItemlistFragment extends ListFragment { @NonNull private Optional loadData() { - // TODO-2524: apply sorting, either at db level or here Feed feed = DBReader.getFeed(feedID); if (feed != null && feed.getItemFilter() != null) { DBReader.loadAdditionalFeedItemListData(feed.getItems()); FeedItemFilter filter = feed.getItemFilter(); feed.setItems(filter.filter(feed.getItems())); } + IntraFeedSortOrder sortOrder = feed.getSortOrder(); + if (sortOrder != null) { + long tS = System.currentTimeMillis(); // TODO-2524: + if (sortOrder == IntraFeedSortOrder.DATE_OLD_NEW) { + List feedItems = feed.getItems(); + Collections.sort(feedItems, FeedItemPubdateComparator.ascending); + feed.setItems(feedItems); + } else { + System.err.println("DBG - to-implement: " + sortOrder); // TODO-2524: + } + long tE = System.currentTimeMillis(); + System.err.println("DBG - sort elapsed time: " + (tE -tS) + + "ms ; " + "num items: " + feed.getItems().size() + ", order: " + sortOrder); // TODO: 2524 + } return Optional.ofNullable(feed); } -- cgit v1.2.3 From f56a02d5138c7dc63d371de65e527b7b50f60255 Mon Sep 17 00:00:00 2001 From: orionlee Date: Thu, 24 Oct 2019 11:01:48 -0700 Subject: sort in Podcast screen - implement all the sorts --- .../antennapod/fragment/FeedItemlistFragment.java | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 415af83d5..88f48003f 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -34,7 +34,6 @@ import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import java.util.Collections; import java.util.List; import de.danoeh.antennapod.R; @@ -53,7 +52,6 @@ import de.danoeh.antennapod.core.feed.FeedEvent; import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedItemFilter; import de.danoeh.antennapod.core.feed.FeedMedia; -import de.danoeh.antennapod.core.feed.IntraFeedSortOrder; import de.danoeh.antennapod.core.glide.ApGlideSettings; import de.danoeh.antennapod.core.glide.FastBlurTransformation; import de.danoeh.antennapod.core.service.download.DownloadService; @@ -65,7 +63,7 @@ import de.danoeh.antennapod.core.storage.DownloadRequester; import de.danoeh.antennapod.core.util.FeedItemUtil; import de.danoeh.antennapod.core.util.LongList; import de.danoeh.antennapod.core.util.Optional; -import de.danoeh.antennapod.core.util.comparator.FeedItemPubdateComparator; +import de.danoeh.antennapod.core.util.QueueSorter; import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil; import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment; import de.danoeh.antennapod.dialog.RenameFeedDialog; @@ -634,19 +632,10 @@ public class FeedItemlistFragment extends ListFragment { FeedItemFilter filter = feed.getItemFilter(); feed.setItems(filter.filter(feed.getItems())); } - IntraFeedSortOrder sortOrder = feed.getSortOrder(); - if (sortOrder != null) { - long tS = System.currentTimeMillis(); // TODO-2524: - if (sortOrder == IntraFeedSortOrder.DATE_OLD_NEW) { - List feedItems = feed.getItems(); - Collections.sort(feedItems, FeedItemPubdateComparator.ascending); - feed.setItems(feedItems); - } else { - System.err.println("DBG - to-implement: " + sortOrder); // TODO-2524: - } - long tE = System.currentTimeMillis(); - System.err.println("DBG - sort elapsed time: " + (tE -tS) + - "ms ; " + "num items: " + feed.getItems().size() + ", order: " + sortOrder); // TODO: 2524 + if (feed != null && feed.getSortOrder() != null) { + List feedItems = feed.getItems(); + QueueSorter.getPermutor(feed.getSortOrder()).reorder(feedItems); + feed.setItems(feedItems); } return Optional.ofNullable(feed); } -- cgit v1.2.3 From 306b6f30a4c416445886af33954fac20dbc29f22 Mon Sep 17 00:00:00 2001 From: orionlee Date: Thu, 24 Oct 2019 11:32:06 -0700 Subject: rename + refactor QueueSorter to FeedItemPermutors, to support both queue and podcast screen. --- .../main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 88f48003f..076320754 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -60,10 +60,10 @@ import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.DBTasks; import de.danoeh.antennapod.core.storage.DownloadRequestException; import de.danoeh.antennapod.core.storage.DownloadRequester; +import de.danoeh.antennapod.core.util.FeedItemPermutors; import de.danoeh.antennapod.core.util.FeedItemUtil; import de.danoeh.antennapod.core.util.LongList; import de.danoeh.antennapod.core.util.Optional; -import de.danoeh.antennapod.core.util.QueueSorter; import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil; import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment; import de.danoeh.antennapod.dialog.RenameFeedDialog; @@ -634,7 +634,7 @@ public class FeedItemlistFragment extends ListFragment { } if (feed != null && feed.getSortOrder() != null) { List feedItems = feed.getItems(); - QueueSorter.getPermutor(feed.getSortOrder()).reorder(feedItems); + FeedItemPermutors.getPermutor(feed.getSortOrder()).reorder(feedItems); feed.setItems(feedItems); } return Optional.ofNullable(feed); -- cgit v1.2.3