From c99fd0f5204e3a0554fc26bc94fbb2cad88180d3 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Fri, 30 Aug 2019 11:55:45 +0200 Subject: [PATCH] Renamed ItemlistFragment to FeedItemlistFragment --- .../java/de/danoeh/antennapod/activity/MainActivity.java | 5 ++--- .../de/danoeh/antennapod/adapter/SubscriptionsAdapter.java | 6 ++---- .../{ItemlistFragment.java => FeedItemlistFragment.java} | 6 +++--- .../java/de/danoeh/antennapod/fragment/ItemFragment.java | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) rename app/src/main/java/de/danoeh/antennapod/fragment/{ItemlistFragment.java => FeedItemlistFragment.java} (99%) diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index f25b2ff29..ab4f584fe 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -56,14 +56,13 @@ import de.danoeh.antennapod.core.util.FeedItemUtil; import de.danoeh.antennapod.core.util.Flavors; import de.danoeh.antennapod.core.util.IntentUtils; import de.danoeh.antennapod.core.util.StorageUtils; -import de.danoeh.antennapod.core.util.gui.NotificationUtils; import de.danoeh.antennapod.dialog.RatingDialog; import de.danoeh.antennapod.dialog.RenameFeedDialog; import de.danoeh.antennapod.fragment.AddFeedFragment; import de.danoeh.antennapod.fragment.DownloadsFragment; import de.danoeh.antennapod.fragment.EpisodesFragment; import de.danoeh.antennapod.fragment.ExternalPlayerFragment; -import de.danoeh.antennapod.fragment.ItemlistFragment; +import de.danoeh.antennapod.fragment.FeedItemlistFragment; import de.danoeh.antennapod.fragment.PlaybackHistoryFragment; import de.danoeh.antennapod.fragment.QueueFragment; import de.danoeh.antennapod.fragment.SubscriptionFragment; @@ -338,7 +337,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi } public void loadFeedFragmentById(long feedId, Bundle args) { - Fragment fragment = ItemlistFragment.newInstance(feedId); + Fragment fragment = FeedItemlistFragment.newInstance(feedId); if(args != null) { fragment.setArguments(args); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java index 763dcb57d..e0fb65c61 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java @@ -14,13 +14,11 @@ import com.bumptech.glide.Glide; import java.lang.ref.WeakReference; -import com.bumptech.glide.request.RequestOptions; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.core.feed.Feed; -import de.danoeh.antennapod.core.glide.ApGlideSettings; import de.danoeh.antennapod.fragment.AddFeedFragment; -import de.danoeh.antennapod.fragment.ItemlistFragment; +import de.danoeh.antennapod.fragment.FeedItemlistFragment; import jp.shts.android.library.TriangleLabelView; /** @@ -142,7 +140,7 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI if (position == getAddTilePosition()) { mainActivityRef.get().loadChildFragment(new AddFeedFragment()); } else { - Fragment fragment = ItemlistFragment.newInstance(getItemId(position)); + Fragment fragment = FeedItemlistFragment.newInstance(getItemId(position)); mainActivityRef.get().loadChildFragment(fragment); } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java similarity index 99% rename from app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java rename to app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 0c75af986..c23efc2ff 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -79,7 +79,7 @@ import io.reactivex.schedulers.Schedulers; * Displays a list of FeedItems. */ @SuppressLint("ValidFragment") -public class ItemlistFragment extends ListFragment { +public class FeedItemlistFragment extends ListFragment { private static final String TAG = "ItemlistFragment"; private static final int EVENTS = EventDistributor.UNREAD_ITEMS_UPDATE @@ -120,8 +120,8 @@ public class ItemlistFragment extends ListFragment { * @param feedId The id of the feed to show * @return the newly created instance of an ItemlistFragment */ - public static ItemlistFragment newInstance(long feedId) { - ItemlistFragment i = new ItemlistFragment(); + public static FeedItemlistFragment newInstance(long feedId) { + FeedItemlistFragment i = new FeedItemlistFragment(); Bundle b = new Bundle(); b.putLong(ARGUMENT_FEED_ID, feedId); i.setArguments(b); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 432ada44e..516237044 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -543,7 +543,7 @@ public class ItemFragment extends Fragment implements OnSwipeGesture { } private void openPodcast() { - Fragment fragment = ItemlistFragment.newInstance(item.getFeedId()); + Fragment fragment = FeedItemlistFragment.newInstance(item.getFeedId()); ((MainActivity)getActivity()).loadChildFragment(fragment); }