Skip to content

Commit

Permalink
Delete core module (#7060)
Browse files Browse the repository at this point in the history
  • Loading branch information
ByteHamster committed Apr 5, 2024
1 parent 2143ab1 commit 92ab575
Show file tree
Hide file tree
Showing 104 changed files with 223 additions and 669 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Expand Up @@ -62,7 +62,6 @@ android {
}

dependencies {
implementation project(":core")
implementation project(":event")
implementation project(':model')
implementation project(':net:common')
Expand Down Expand Up @@ -91,6 +90,7 @@ dependencies {
implementation project(':ui:statistics')
implementation project(':net:sync:service-interface')
implementation project(':playback:service')
implementation project(':ui:chapters')

annotationProcessor "androidx.annotation:annotation:$annotationVersion"
implementation "androidx.appcompat:appcompat:$appcompatVersion"
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/AndroidManifest.xml
Expand Up @@ -4,12 +4,15 @@
android:installLocation="auto">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.VIBRATE" />

<supports-screens
android:anyDensity="true"
Expand Down
File renamed without changes.
Expand Up @@ -6,7 +6,7 @@
import androidx.annotation.StringRes;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.core.util.IntentUtils;
import de.danoeh.antennapod.ui.common.IntentUtils;

public class VisitWebsiteActionButton extends ItemActionButton {

Expand Down
Expand Up @@ -22,7 +22,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import de.danoeh.antennapod.core.R;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.ui.common.Converter;

/**
Expand Down
Expand Up @@ -16,7 +16,6 @@

import de.danoeh.antennapod.ui.SelectableAdapter;
import de.danoeh.antennapod.ui.common.ThemeUtils;
import org.apache.commons.lang3.ArrayUtils;

import java.lang.ref.WeakReference;
import java.util.ArrayList;
Expand All @@ -25,7 +24,6 @@
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.ui.screen.episode.ItemPagerFragment;

/**
Expand Down Expand Up @@ -90,9 +88,7 @@ public final void onBindViewHolder(EpisodeItemViewHolder holder, int pos) {
holder.itemView.setOnClickListener(v -> {
MainActivity activity = mainActivityRef.get();
if (activity != null && !inActionMode()) {
long[] ids = FeedItemUtil.getIds(episodes);
int position = ArrayUtils.indexOf(ids, item.getId());
activity.loadChildFragment(ItemPagerFragment.newInstance(ids, position));
activity.loadChildFragment(ItemPagerFragment.newInstance(episodes, item));
} else {
toggleSelection(holder.getBindingAdapterPosition());
}
Expand Down
Expand Up @@ -36,9 +36,8 @@

import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.core.util.ConfirmationDialog;
import de.danoeh.antennapod.ui.common.ConfirmationDialog;
import de.danoeh.antennapod.ui.MenuItemUtils;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.event.EpisodeDownloadEvent;
import de.danoeh.antennapod.event.FeedItemEvent;
import de.danoeh.antennapod.event.FeedListUpdateEvent;
Expand Down Expand Up @@ -334,7 +333,7 @@ public void onEndSelectMode() {
public void onEventMainThread(FeedItemEvent event) {
Log.d(TAG, "onEventMainThread() called with: " + "event = [" + event + "]");
for (FeedItem item : event.items) {
int pos = FeedItemUtil.indexOfItemWithId(episodes, item.getId());
int pos = FeedItemEvent.indexOfItemWithId(episodes, item.getId());
if (pos >= 0) {
episodes.remove(pos);
if (getFilter().matches(item)) {
Expand Down Expand Up @@ -378,7 +377,7 @@ public void onKeyUp(KeyEvent event) {
@Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
public void onEventMainThread(EpisodeDownloadEvent event) {
for (String downloadUrl : event.getUrls()) {
int pos = FeedItemUtil.indexOfItemWithDownloadUrl(episodes, downloadUrl);
int pos = EpisodeDownloadEvent.indexOfItemWithDownloadUrl(episodes, downloadUrl);
if (pos >= 0) {
listAdapter.notifyItemChangedCompat(pos);
}
Expand Down
Expand Up @@ -18,12 +18,10 @@
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.net.sync.serviceinterface.SynchronizationQueueSink;
import de.danoeh.antennapod.storage.preferences.PlaybackPreferences;
import de.danoeh.antennapod.core.util.FeedUtil;
import de.danoeh.antennapod.playback.service.PlaybackServiceInterface;
import de.danoeh.antennapod.storage.database.DBWriter;
import de.danoeh.antennapod.storage.preferences.SynchronizationSettings;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.core.util.IntentUtils;
import de.danoeh.antennapod.ui.common.IntentUtils;
import de.danoeh.antennapod.playback.service.PlaybackStatus;
import de.danoeh.antennapod.ui.share.ShareUtils;
import de.danoeh.antennapod.ui.share.ShareDialog;
Expand Down Expand Up @@ -198,7 +196,7 @@ public static boolean onMenuItemClicked(@NonNull Fragment fragment, int menuItem
}
DBWriter.markItemPlayed(selectedItem, FeedItem.UNPLAYED, true);
} else if (menuItemId == R.id.visit_website_item) {
IntentUtils.openInBrowser(context, FeedItemUtil.getLinkWithFallback(selectedItem));
IntentUtils.openInBrowser(context, selectedItem.getLinkWithFallback());
} else if (menuItemId == R.id.share_item) {
ShareDialog shareDialog = ShareDialog.newInstance(selectedItem);
shareDialog.show((fragment.getActivity().getSupportFragmentManager()), "ShareEpisodeDialog");
Expand Down Expand Up @@ -234,7 +232,8 @@ public static void markReadWithUndo(@NonNull Fragment fragment, FeedItem item,
if (media == null) {
return;
}
boolean shouldAutoDelete = FeedUtil.shouldAutoDeleteItemsOnThatFeed(item.getFeed());
boolean shouldAutoDelete = UserPreferences.isAutoDelete()
&& (!item.getFeed().isLocalFeed() || UserPreferences.isAutoDeleteLocal());
int smartMarkAsPlayedSecs = UserPreferences.getSmartMarkAsPlayedSecs();
boolean almostEnded = media.getDuration() > 0
&& media.getPosition() >= media.getDuration() - smartMarkAsPlayedSecs * 1000;
Expand Down
Expand Up @@ -9,10 +9,8 @@
import androidx.recyclerview.widget.RecyclerView;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.ui.screen.episode.ItemPagerFragment;
import de.danoeh.antennapod.model.feed.FeedItem;
import org.apache.commons.lang3.ArrayUtils;

import java.lang.ref.WeakReference;
import java.util.ArrayList;
Expand Down Expand Up @@ -68,9 +66,7 @@ public void onBindViewHolder(@NonNull HorizontalItemViewHolder holder, int posit
holder.card.setOnClickListener(v -> {
MainActivity activity = mainActivityRef.get();
if (activity != null) {
long[] ids = FeedItemUtil.getIds(data);
int clickPosition = ArrayUtils.indexOf(ids, item.getId());
activity.loadChildFragment(ItemPagerFragment.newInstance(ids, clickPosition));
activity.loadChildFragment(ItemPagerFragment.newInstance(data, item));
}
});
}
Expand Down
Expand Up @@ -3,8 +3,7 @@
import android.view.View;
import android.widget.ImageView;
import android.widget.ProgressBar;

import de.danoeh.antennapod.core.R;
import de.danoeh.antennapod.R;

/**
* Utility methods for the more_content_list_footer layout.
Expand Down
Expand Up @@ -8,7 +8,7 @@
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.util.ConfirmationDialog;
import de.danoeh.antennapod.ui.common.ConfirmationDialog;
import de.danoeh.antennapod.storage.database.DBReader;
import de.danoeh.antennapod.storage.database.DBWriter;
import de.danoeh.antennapod.event.playback.PlaybackHistoryEvent;
Expand Down
Expand Up @@ -40,7 +40,6 @@
import de.danoeh.antennapod.ui.episodeslist.EpisodeMultiSelectActionHandler;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.model.feed.FeedItem;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.ui.episodeslist.FeedItemMenuHandler;
import de.danoeh.antennapod.net.discovery.CombinedSearcher;
import de.danoeh.antennapod.storage.database.DBReader;
Expand Down Expand Up @@ -327,7 +326,7 @@ public void onEventMainThread(FeedItemEvent event) {
}
for (int i = 0, size = event.items.size(); i < size; i++) {
FeedItem item = event.items.get(i);
int pos = FeedItemUtil.indexOfItemWithId(results, item.getId());
int pos = FeedItemEvent.indexOfItemWithId(results, item.getId());
if (pos >= 0) {
results.remove(pos);
results.add(pos, item);
Expand All @@ -342,7 +341,7 @@ public void onEventMainThread(EpisodeDownloadEvent event) {
return;
}
for (String downloadUrl : event.getUrls()) {
int pos = FeedItemUtil.indexOfItemWithDownloadUrl(results, downloadUrl);
int pos = EpisodeDownloadEvent.indexOfItemWithDownloadUrl(results, downloadUrl);
if (pos >= 0) {
adapter.notifyItemChangedCompat(pos);
}
Expand Down
Expand Up @@ -19,13 +19,13 @@
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.util.ChapterUtils;
import de.danoeh.antennapod.event.playback.PlaybackPositionEvent;
import de.danoeh.antennapod.model.feed.Chapter;
import de.danoeh.antennapod.model.feed.FeedMedia;
import de.danoeh.antennapod.model.playback.Playable;
import de.danoeh.antennapod.playback.base.PlayerStatus;
import de.danoeh.antennapod.playback.service.PlaybackController;
import de.danoeh.antennapod.ui.chapters.ChapterUtils;
import io.reactivex.Maybe;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
Expand Down Expand Up @@ -130,7 +130,7 @@ private int getCurrentChapter(Playable media) {
if (controller == null) {
return -1;
}
return ChapterUtils.getCurrentChapterIndex(media, controller.getPosition());
return Chapter.getAfterPosition(media.getChapters(), controller.getPosition());
}

private void loadMediaInfo(boolean forceRefresh) {
Expand Down
Expand Up @@ -19,7 +19,7 @@
import de.danoeh.antennapod.model.feed.Chapter;
import de.danoeh.antennapod.ui.common.Converter;
import de.danoeh.antennapod.model.feed.EmbeddedChapterImage;
import de.danoeh.antennapod.core.util.IntentUtils;
import de.danoeh.antennapod.ui.common.IntentUtils;
import de.danoeh.antennapod.model.playback.Playable;
import de.danoeh.antennapod.ui.common.CircularProgressBar;

Expand Down
Expand Up @@ -23,7 +23,6 @@
import de.danoeh.antennapod.ui.screen.SearchFragment;
import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;
import de.danoeh.antennapod.storage.database.DBReader;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.ui.screen.feed.ItemSortDialog;
import de.danoeh.antennapod.event.EpisodeDownloadEvent;
import de.danoeh.antennapod.event.FeedItemEvent;
Expand Down Expand Up @@ -209,7 +208,7 @@ public void onEventMainThread(EpisodeDownloadEvent event) {
return; // Refreshed anyway
}
for (String downloadUrl : event.getUrls()) {
int pos = FeedItemUtil.indexOfItemWithDownloadUrl(items, downloadUrl);
int pos = EpisodeDownloadEvent.indexOfItemWithDownloadUrl(items, downloadUrl);
if (pos >= 0) {
adapter.notifyItemChangedCompat(pos);
}
Expand Down Expand Up @@ -249,7 +248,7 @@ public void onEventMainThread(FeedItemEvent event) {
}
for (int i = 0, size = event.items.size(); i < size; i++) {
FeedItem item = event.items.get(i);
int pos = FeedItemUtil.indexOfItemWithId(items, item.getId());
int pos = FeedItemEvent.indexOfItemWithId(items, item.getId());
if (pos >= 0) {
items.remove(pos);
if (item.getMedia().isDownloaded()) {
Expand Down Expand Up @@ -305,7 +304,7 @@ private void loadItems() {
return downloadedItems;
}
for (String url : runningDownloads) {
if (FeedItemUtil.indexOfItemWithDownloadUrl(downloadedItems, url) != -1) {
if (EpisodeDownloadEvent.indexOfItemWithDownloadUrl(downloadedItems, url) != -1) {
continue; // Already in list
}
mediaUrls.add(url);
Expand Down
@@ -1,8 +1,8 @@
package de.danoeh.antennapod.ui.screen.download;

import androidx.annotation.StringRes;
import de.danoeh.antennapod.core.BuildConfig;
import de.danoeh.antennapod.core.R;
import de.danoeh.antennapod.BuildConfig;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.model.download.DownloadError;

/**
Expand Down
Expand Up @@ -55,7 +55,7 @@
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.ui.screen.preferences.PreferenceActivity;
import de.danoeh.antennapod.core.util.ConfirmationDialog;
import de.danoeh.antennapod.ui.common.ConfirmationDialog;
import de.danoeh.antennapod.ui.MenuItemUtils;
import de.danoeh.antennapod.storage.database.DBReader;
import de.danoeh.antennapod.storage.database.DBWriter;
Expand Down
Expand Up @@ -29,6 +29,8 @@
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;

import java.util.List;

/**
* Displays information about a list of FeedItems.
*/
Expand All @@ -41,15 +43,21 @@ public class ItemPagerFragment extends Fragment implements MaterialToolbar.OnMen
/**
* Creates a new instance of an ItemPagerFragment.
*
* @param feeditems The IDs of the FeedItems that belong to the same list
* @param feedItemPos The position of the FeedItem that is currently shown
* @return The ItemFragment instance
*/
public static ItemPagerFragment newInstance(long[] feeditems, int feedItemPos) {
public static ItemPagerFragment newInstance(List<FeedItem> allItems, FeedItem currentItem) {
int position = 0;
long[] ids = new long[allItems.size()];
for (int i = 0; i < allItems.size(); i++) {
ids[i] = allItems.get(i).getId();
if (ids[i] == currentItem.getId()) {
position = i;
}
}
ItemPagerFragment fragment = new ItemPagerFragment();
Bundle args = new Bundle();
args.putLongArray(ARG_FEEDITEMS, feeditems);
args.putInt(ARG_FEEDITEM_POS, Math.max(0, feedItemPos));
args.putLongArray(ARG_FEEDITEMS, ids);
args.putInt(ARG_FEEDITEM_POS, position);
fragment.setArguments(args);
return fragment;
}
Expand Down
Expand Up @@ -37,7 +37,7 @@
import de.danoeh.antennapod.ui.TransitionEffect;
import de.danoeh.antennapod.storage.database.DBReader;
import de.danoeh.antennapod.storage.database.FeedDatabaseWriter;
import de.danoeh.antennapod.core.util.IntentUtils;
import de.danoeh.antennapod.ui.common.IntentUtils;
import de.danoeh.antennapod.ui.share.ShareUtils;
import de.danoeh.antennapod.ui.cleaner.HtmlToPlainText;
import de.danoeh.antennapod.model.feed.Feed;
Expand Down
@@ -1,6 +1,6 @@
package de.danoeh.antennapod.ui.screen.feed;

import de.danoeh.antennapod.core.R;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.model.feed.FeedItemFilter;

public enum FeedItemFilterGroup {
Expand Down
Expand Up @@ -50,8 +50,7 @@
import de.danoeh.antennapod.storage.database.DBReader;
import de.danoeh.antennapod.storage.database.DBWriter;
import de.danoeh.antennapod.storage.database.FeedItemPermutors;
import de.danoeh.antennapod.core.util.FeedItemUtil;
import de.danoeh.antennapod.core.util.IntentUtils;
import de.danoeh.antennapod.ui.common.IntentUtils;
import de.danoeh.antennapod.ui.share.ShareUtils;
import de.danoeh.antennapod.ui.episodeslist.MoreContentListFooterUtil;
import de.danoeh.antennapod.databinding.FeedItemListFragmentBinding;
Expand Down Expand Up @@ -321,8 +320,7 @@ public boolean onContextItemSelected(@NonNull MenuItem item) {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
MainActivity activity = (MainActivity) getActivity();
long[] ids = FeedItemUtil.getIds(feed.getItems());
activity.loadChildFragment(ItemPagerFragment.newInstance(ids, position));
activity.loadChildFragment(ItemPagerFragment.newInstance(feed.getItems(), feed.getItems().get(position)));
}

@Subscribe(threadMode = ThreadMode.MAIN)
Expand All @@ -341,7 +339,7 @@ public void onEventMainThread(FeedItemEvent event) {
}
for (int i = 0, size = event.items.size(); i < size; i++) {
FeedItem item = event.items.get(i);
int pos = FeedItemUtil.indexOfItemWithId(feed.getItems(), item.getId());
int pos = FeedItemEvent.indexOfItemWithId(feed.getItems(), item.getId());
if (pos >= 0) {
feed.getItems().remove(pos);
feed.getItems().add(pos, item);
Expand All @@ -356,7 +354,7 @@ public void onEventMainThread(EpisodeDownloadEvent event) {
return;
}
for (String downloadUrl : event.getUrls()) {
int pos = FeedItemUtil.indexOfItemWithDownloadUrl(feed.getItems(), downloadUrl);
int pos = EpisodeDownloadEvent.indexOfItemWithDownloadUrl(feed.getItems(), downloadUrl);
if (pos >= 0) {
adapter.notifyItemChangedCompat(pos);
}
Expand Down
Expand Up @@ -11,7 +11,7 @@
import java.util.List;

import de.danoeh.antennapod.R;
import de.danoeh.antennapod.core.util.ConfirmationDialog;
import de.danoeh.antennapod.ui.common.ConfirmationDialog;
import de.danoeh.antennapod.model.feed.Feed;
import de.danoeh.antennapod.storage.database.DBWriter;
import io.reactivex.Completable;
Expand Down

0 comments on commit 92ab575

Please sign in to comment.