From 98830beee54bc6fb1e0763481cd18f549c6d6ec7 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Tue, 2 Nov 2021 20:58:05 +0100 Subject: [PATCH] Move (most) events to their own module --- app/build.gradle | 1 + .../PlaybackServiceTaskManagerTest.java | 4 ++-- .../de/test/antennapod/ui/UITestUtils.java | 4 ++-- .../util/event/FeedItemEventListener.java | 2 +- .../antennapod/activity/MainActivity.java | 2 +- .../activity/OnlineFeedViewActivity.java | 4 ++-- .../activity/VideoplayerActivity.java | 10 +++++----- .../antennapod/dialog/FeedSortDialog.java | 2 +- .../dialog/PlaybackControlsDialog.java | 2 +- .../antennapod/dialog/SleepTimerDialog.java | 2 +- .../dialog/SubscriptionsFilterDialog.java | 2 +- .../dialog/VariableSpeedDialog.java | 2 +- .../fragment/AudioPlayerFragment.java | 20 +++++++++---------- .../antennapod/fragment/ChaptersFragment.java | 2 +- .../fragment/CompletedDownloadsFragment.java | 8 ++++---- .../antennapod/fragment/CoverFragment.java | 2 +- .../fragment/DiscoveryFragment.java | 2 +- .../fragment/EpisodesListFragment.java | 10 +++++----- .../fragment/ExternalPlayerFragment.java | 4 ++-- .../fragment/FavoriteEpisodesFragment.java | 2 +- .../fragment/FeedItemlistFragment.java | 14 ++++++------- .../fragment/FeedSettingsFragment.java | 6 +++--- .../antennapod/fragment/ItemFragment.java | 6 +++--- .../fragment/ItemPagerFragment.java | 2 +- .../fragment/NavDrawerFragment.java | 6 +++--- .../fragment/PlaybackHistoryFragment.java | 10 +++++----- .../antennapod/fragment/QueueFragment.java | 10 +++++----- .../fragment/QuickFeedDiscoveryFragment.java | 2 +- .../antennapod/fragment/SearchFragment.java | 8 ++++---- .../fragment/SubscriptionFragment.java | 4 ++-- .../PlaybackPreferencesFragment.java | 2 +- .../UserInterfacePreferencesFragment.java | 4 ++-- .../SynchronizationPreferencesFragment.java | 2 +- .../viewholder/EpisodeItemViewHolder.java | 2 +- core/build.gradle | 1 + .../core/preferences/PlaybackPreferences.java | 2 +- .../service/download/DownloadService.java | 2 +- .../handler/MediaDownloadedHandler.java | 2 +- .../core/service/playback/LocalPSMP.java | 6 +++--- .../service/playback/PlaybackService.java | 18 ++++++++--------- .../playback/PlaybackServiceTaskManager.java | 6 +++--- .../antennapod/core/storage/DBTasks.java | 6 +++--- .../antennapod/core/storage/DBWriter.java | 14 ++++++------- .../antennapod/core/sync/SyncService.java | 2 +- .../util/playback/PlaybackController.java | 6 +++--- .../playback/PlaybackServiceFlavorHelper.java | 2 +- event/build.gradle | 8 ++++++++ event/src/main/AndroidManifest.xml | 1 + .../event/DiscoveryDefaultUpdateEvent.java | 2 +- .../antennapod}/event/FavoritesEvent.java | 17 +--------------- .../antennapod}/event/FeedItemEvent.java | 15 +------------- .../event/FeedListUpdateEvent.java | 2 +- .../antennapod}/event/MessageEvent.java | 2 +- .../antennapod}/event/PlayerErrorEvent.java | 2 +- .../antennapod}/event/PlayerStatusEvent.java | 2 +- .../danoeh/antennapod}/event/QueueEvent.java | 15 +------------- .../antennapod}/event/SyncServiceEvent.java | 2 +- .../event/UnreadItemsUpdateEvent.java | 2 +- .../event/playback/BufferUpdateEvent.java | 2 +- .../event/playback/PlaybackHistoryEvent.java | 2 +- .../event/playback/PlaybackPositionEvent.java | 2 +- .../event/playback/PlaybackServiceEvent.java | 2 +- .../playback/SleepTimerUpdatedEvent.java | 2 +- .../event/playback/SpeedChangedEvent.java | 2 +- .../settings/SkipIntroEndingChangedEvent.java | 2 +- .../settings/SpeedPresetChangedEvent.java | 2 +- .../settings/VolumeAdaptionChangedEvent.java | 2 +- settings.gradle | 1 + 68 files changed, 146 insertions(+), 175 deletions(-) create mode 100644 event/build.gradle create mode 100644 event/src/main/AndroidManifest.xml rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/DiscoveryDefaultUpdateEvent.java (69%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/FavoritesEvent.java (56%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/FeedItemEvent.java (71%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/FeedListUpdateEvent.java (93%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/MessageEvent.java (89%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/PlayerErrorEvent.java (84%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/PlayerStatusEvent.java (64%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/QueueEvent.java (77%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/SyncServiceEvent.java (85%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/UnreadItemsUpdateEvent.java (67%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/playback/BufferUpdateEvent.java (94%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/playback/PlaybackHistoryEvent.java (84%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/playback/PlaybackPositionEvent.java (88%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/playback/PlaybackServiceEvent.java (82%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/playback/SleepTimerUpdatedEvent.java (94%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/playback/SpeedChangedEvent.java (81%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/settings/SkipIntroEndingChangedEvent.java (91%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/settings/SpeedPresetChangedEvent.java (87%) rename {core/src/main/java/de/danoeh/antennapod/core => event/src/main/java/de/danoeh/antennapod}/event/settings/VolumeAdaptionChangedEvent.java (91%) diff --git a/app/build.gradle b/app/build.gradle index 8c414702a..87dea29de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,6 +111,7 @@ android { dependencies { implementation project(":core") + implementation project(":event") implementation project(':model') implementation project(':net:sync:gpoddernet') implementation project(':net:sync:model') diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java index 5dd419412..808cb5268 100644 --- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java +++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceTaskManagerTest.java @@ -5,7 +5,7 @@ import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.annotation.UiThreadTest; import androidx.test.filters.LargeTest; -import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent; +import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.widget.WidgetUpdater; import org.awaitility.Awaitility; @@ -21,7 +21,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import de.danoeh.antennapod.core.event.QueueEvent; +import de.danoeh.antennapod.event.QueueEvent; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java index b25f957d3..eedb2d9de 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java @@ -2,8 +2,8 @@ package de.test.antennapod.ui; import android.content.Context; import android.util.Log; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.QueueEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.QueueEvent; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; diff --git a/app/src/androidTest/java/de/test/antennapod/util/event/FeedItemEventListener.java b/app/src/androidTest/java/de/test/antennapod/util/event/FeedItemEventListener.java index 601bba853..7e8fc1205 100644 --- a/app/src/androidTest/java/de/test/antennapod/util/event/FeedItemEventListener.java +++ b/app/src/androidTest/java/de/test/antennapod/util/event/FeedItemEventListener.java @@ -8,7 +8,7 @@ import org.greenrobot.eventbus.Subscribe; import java.util.ArrayList; import java.util.List; -import de.danoeh.antennapod.core.event.FeedItemEvent; +import de.danoeh.antennapod.event.FeedItemEvent; import io.reactivex.functions.Consumer; /** 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 f07ad6ad5..94270339d 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -45,7 +45,7 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.MessageEvent; +import de.danoeh.antennapod.event.MessageEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.receiver.MediaButtonReceiver; import de.danoeh.antennapod.core.service.playback.PlaybackService; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java index f0ca5a2cb..a80877026 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java @@ -32,8 +32,8 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.FeedItemlistDescriptionAdapter; import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator; import de.danoeh.antennapod.core.event.DownloadEvent; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; import de.danoeh.antennapod.core.glide.ApGlideSettings; import de.danoeh.antennapod.core.glide.FastBlurTransformation; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index 5d7ab8959..f895f76bb 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -36,11 +36,11 @@ import androidx.core.view.WindowCompat; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import com.bumptech.glide.Glide; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.playback.BufferUpdateEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.PlayerErrorEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackServiceEvent; -import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent; +import de.danoeh.antennapod.event.playback.BufferUpdateEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.PlayerErrorEvent; +import de.danoeh.antennapod.event.playback.PlaybackServiceEvent; +import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.service.playback.PlayerStatus; diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java index 96d1b9b67..b89d05f88 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.List; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; public class FeedSortDialog { diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java index f4b3b1bfa..5cc1f99c6 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/PlaybackControlsDialog.java @@ -12,7 +12,7 @@ import android.widget.Button; import android.widget.CheckBox; import android.widget.TextView; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.playback.SpeedChangedEvent; +import de.danoeh.antennapod.event.playback.SpeedChangedEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.playback.PlaybackController; import de.danoeh.antennapod.view.PlaybackSpeedSeekBar; diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java index 26e222539..764940e06 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java @@ -18,7 +18,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import com.google.android.material.snackbar.Snackbar; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent; +import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.util.Converter; diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java index 29172bb5e..9e524188f 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/SubscriptionsFilterDialog.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.Set; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.feed.SubscriptionsFilter; import de.danoeh.antennapod.core.feed.SubscriptionsFilterGroup; import de.danoeh.antennapod.core.preferences.UserPreferences; diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java index 12cb26409..1c4f1804c 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java @@ -15,7 +15,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import com.google.android.material.chip.Chip; import com.google.android.material.snackbar.Snackbar; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.playback.SpeedChangedEvent; +import de.danoeh.antennapod.event.playback.SpeedChangedEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.playback.PlaybackController; import de.danoeh.antennapod.view.ItemOffsetDecoration; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java index 77c99c3a8..70ea98af3 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java @@ -25,11 +25,13 @@ import androidx.viewpager2.widget.ViewPager2; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.snackbar.Snackbar; -import de.danoeh.antennapod.core.event.playback.BufferUpdateEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackServiceEvent; -import de.danoeh.antennapod.core.event.PlayerErrorEvent; -import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent; -import de.danoeh.antennapod.core.event.playback.SpeedChangedEvent; +import de.danoeh.antennapod.core.service.playback.PlaybackService; +import de.danoeh.antennapod.core.util.playback.PlaybackController; +import de.danoeh.antennapod.event.playback.BufferUpdateEvent; +import de.danoeh.antennapod.event.playback.PlaybackServiceEvent; +import de.danoeh.antennapod.event.PlayerErrorEvent; +import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent; +import de.danoeh.antennapod.event.playback.SpeedChangedEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -41,21 +43,19 @@ import java.util.List; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.CastEnabledActivity; import de.danoeh.antennapod.activity.MainActivity; -import de.danoeh.antennapod.core.event.FavoritesEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.FavoritesEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; import de.danoeh.antennapod.model.feed.Chapter; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.core.feed.util.PlaybackSpeedUtils; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.util.ChapterUtils; import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.util.IntentUtils; import de.danoeh.antennapod.core.util.TimeSpeedConverter; import de.danoeh.antennapod.model.playback.Playable; -import de.danoeh.antennapod.core.util.playback.PlaybackController; import de.danoeh.antennapod.dialog.PlaybackControlsDialog; import de.danoeh.antennapod.dialog.SkipPreferenceDialog; import de.danoeh.antennapod.dialog.SleepTimerDialog; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java index d323edcb9..0d7aadbd0 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java @@ -23,7 +23,7 @@ import org.greenrobot.eventbus.ThreadMode; import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.ChaptersListAdapter; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; import de.danoeh.antennapod.core.service.playback.PlayerStatus; import de.danoeh.antennapod.core.util.ChapterUtils; import de.danoeh.antennapod.core.util.playback.PlaybackController; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java index a65539a14..933147378 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java @@ -23,10 +23,10 @@ import de.danoeh.antennapod.adapter.EpisodeItemListAdapter; import de.danoeh.antennapod.adapter.actionbutton.DeleteActionButton; import de.danoeh.antennapod.core.event.DownloadEvent; import de.danoeh.antennapod.core.event.DownloadLogEvent; -import de.danoeh.antennapod.core.event.FeedItemEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.menuhandler.MenuItemUtils; import de.danoeh.antennapod.fragment.actions.EpisodeMultiSelectActionHandler; import de.danoeh.antennapod.model.feed.FeedItem; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java index 397d6a223..dd69e5fbd 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java @@ -45,7 +45,7 @@ import org.greenrobot.eventbus.ThreadMode; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.core.feed.util.ImageResourceUtils; import de.danoeh.antennapod.core.glide.ApGlideSettings; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DiscoveryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DiscoveryFragment.java index 034b111e1..230a0ce0d 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/DiscoveryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/DiscoveryFragment.java @@ -23,7 +23,7 @@ import org.greenrobot.eventbus.EventBus; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.OnlineFeedViewActivity; import de.danoeh.antennapod.adapter.itunes.ItunesAdapter; -import de.danoeh.antennapod.core.event.DiscoveryDefaultUpdateEvent; +import de.danoeh.antennapod.event.DiscoveryDefaultUpdateEvent; import de.danoeh.antennapod.discovery.ItunesTopListLoader; import de.danoeh.antennapod.discovery.PodcastSearchResult; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java index 8abef8685..37d77d31f 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java @@ -21,10 +21,10 @@ import android.widget.TextView; import android.widget.Toast; import de.danoeh.antennapod.adapter.EpisodeItemListAdapter; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.menuhandler.MenuItemUtils; import de.danoeh.antennapod.view.EpisodeItemListRecyclerView; import de.danoeh.antennapod.view.viewholder.EpisodeItemViewHolder; @@ -40,7 +40,7 @@ import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.core.dialog.ConfirmationDialog; 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.event.FeedItemEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.core.service.download.DownloadService; import de.danoeh.antennapod.core.storage.DBWriter; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java index e86694f68..9f7a943fc 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java @@ -17,8 +17,8 @@ import com.bumptech.glide.request.RequestOptions; import com.google.android.material.bottomsheet.BottomSheetBehavior; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackServiceEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.playback.PlaybackServiceEvent; import de.danoeh.antennapod.model.playback.MediaType; import de.danoeh.antennapod.core.feed.util.ImageResourceUtils; import de.danoeh.antennapod.core.glide.ApGlideSettings; 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 986c417fd..d7bfd404d 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java @@ -18,7 +18,7 @@ import org.greenrobot.eventbus.Subscribe; import java.util.List; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.FavoritesEvent; +import de.danoeh.antennapod.event.FavoritesEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.DBWriter; 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 920ae1108..1d40a28be 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -52,13 +52,13 @@ import de.danoeh.antennapod.adapter.EpisodeItemListAdapter; 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.FavoritesEvent; -import de.danoeh.antennapod.core.event.FeedItemEvent; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.QueueEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FavoritesEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.QueueEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.feed.FeedEvent; import de.danoeh.antennapod.core.glide.ApGlideSettings; import de.danoeh.antennapod.core.glide.FastBlurTransformation; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java index 5bd1dbb20..44493c64e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java @@ -16,9 +16,9 @@ import androidx.preference.PreferenceFragmentCompat; import androidx.preference.SwitchPreferenceCompat; import androidx.recyclerview.widget.RecyclerView; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.event.settings.SkipIntroEndingChangedEvent; -import de.danoeh.antennapod.core.event.settings.SpeedPresetChangedEvent; -import de.danoeh.antennapod.core.event.settings.VolumeAdaptionChangedEvent; +import de.danoeh.antennapod.event.settings.SkipIntroEndingChangedEvent; +import de.danoeh.antennapod.event.settings.SpeedPresetChangedEvent; +import de.danoeh.antennapod.event.settings.VolumeAdaptionChangedEvent; import de.danoeh.antennapod.databinding.PlaybackSpeedFeedSettingDialogBinding; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.model.feed.FeedFilter; 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 7f561e583..f13255de9 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -41,9 +41,9 @@ import de.danoeh.antennapod.adapter.actionbutton.StreamActionButton; import de.danoeh.antennapod.adapter.actionbutton.VisitWebsiteActionButton; 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.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.core.feed.util.ImageResourceUtils; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemPagerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemPagerFragment.java index d42300ca7..14f6ae875 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemPagerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemPagerFragment.java @@ -20,7 +20,7 @@ import org.greenrobot.eventbus.ThreadMode; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; -import de.danoeh.antennapod.core.event.FeedItemEvent; +import de.danoeh.antennapod.event.FeedItemEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.menuhandler.FeedItemMenuHandler; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java index 911f262cb..5abc42ab2 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/NavDrawerFragment.java @@ -28,9 +28,9 @@ import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.activity.PreferenceActivity; import de.danoeh.antennapod.adapter.NavListAdapter; import de.danoeh.antennapod.core.dialog.ConfirmationDialog; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.QueueEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.QueueEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.dialog.TagSettingsDialog; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.core.preferences.UserPreferences; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java index 7fb0b8c44..e1fa5eeb6 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java @@ -16,11 +16,11 @@ import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.adapter.EpisodeItemListAdapter; 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.playback.PlaybackHistoryEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.playback.PlaybackHistoryEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.DBWriter; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index 8591cf42e..b308db0f6 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -33,11 +33,11 @@ import de.danoeh.antennapod.adapter.QueueRecyclerAdapter; import de.danoeh.antennapod.core.dialog.ConfirmationDialog; 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.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.QueueEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.QueueEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.menuhandler.MenuItemUtils; import de.danoeh.antennapod.fragment.actions.EpisodeMultiSelectActionHandler; import de.danoeh.antennapod.fragment.swipeactions.SwipeActions; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java index 14f355b52..8bfcfd1ed 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QuickFeedDiscoveryFragment.java @@ -25,7 +25,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.activity.OnlineFeedViewActivity; import de.danoeh.antennapod.adapter.FeedDiscoverAdapter; -import de.danoeh.antennapod.core.event.DiscoveryDefaultUpdateEvent; +import de.danoeh.antennapod.event.DiscoveryDefaultUpdateEvent; import de.danoeh.antennapod.discovery.ItunesTopListLoader; import de.danoeh.antennapod.discovery.PodcastSearchResult; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java index 837abc838..e43b6f314 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java @@ -29,10 +29,10 @@ import de.danoeh.antennapod.adapter.EpisodeItemListAdapter; import de.danoeh.antennapod.adapter.FeedSearchResultAdapter; 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.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.core.storage.FeedSearcher; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java index db19c828d..0914996d3 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java @@ -42,8 +42,8 @@ import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.adapter.SubscriptionsRecyclerAdapter; import de.danoeh.antennapod.core.dialog.ConfirmationDialog; import de.danoeh.antennapod.core.event.DownloadEvent; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.menuhandler.MenuItemUtils; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.download.DownloadService; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java index 1fa1fed58..9a86a4b3c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/PlaybackPreferencesFragment.java @@ -10,7 +10,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.PreferenceActivity; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.preferences.UsageStatistics; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.gui.PictureInPictureUtil; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java index 04b9677e2..ff974179e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java @@ -10,8 +10,8 @@ import androidx.preference.PreferenceFragmentCompat; import android.widget.ListView; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.PreferenceActivity; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.dialog.SubscriptionsFilterDialog; import de.danoeh.antennapod.dialog.FeedSortDialog; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/SynchronizationPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/SynchronizationPreferencesFragment.java index 9b63b38ec..8cb7f45db 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/SynchronizationPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/synchronization/SynchronizationPreferencesFragment.java @@ -26,7 +26,7 @@ import org.greenrobot.eventbus.ThreadMode; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.PreferenceActivity; -import de.danoeh.antennapod.core.event.SyncServiceEvent; +import de.danoeh.antennapod.event.SyncServiceEvent; import de.danoeh.antennapod.core.sync.SynchronizationCredentials; import de.danoeh.antennapod.core.sync.SyncService; import de.danoeh.antennapod.core.sync.SynchronizationProviderViewData; diff --git a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java index fbd2ae5df..8d1810ecb 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java +++ b/app/src/main/java/de/danoeh/antennapod/view/viewholder/EpisodeItemViewHolder.java @@ -21,7 +21,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.adapter.CoverLoader; import de.danoeh.antennapod.adapter.actionbutton.ItemActionButton; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; import de.danoeh.antennapod.core.util.DateFormatter; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; diff --git a/core/build.gradle b/core/build.gradle index 59e2973ae..0c734b336 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -20,6 +20,7 @@ android { } dependencies { + implementation project(':event') implementation project(':model') implementation project(':net:ssl') implementation project(':net:sync:gpoddernet') diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java index 9c73ed9ae..8d80ef32b 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java @@ -5,7 +5,7 @@ import android.content.SharedPreferences; import androidx.preference.PreferenceManager; import android.util.Log; -import de.danoeh.antennapod.core.event.PlayerStatusEvent; +import de.danoeh.antennapod.event.PlayerStatusEvent; import de.danoeh.antennapod.model.feed.FeedMedia; import de.danoeh.antennapod.model.playback.MediaType; import de.danoeh.antennapod.core.service.playback.PlayerStatus; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java index 2a1aef6cc..f26421cdf 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java @@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import de.danoeh.antennapod.core.event.DownloadEvent; -import de.danoeh.antennapod.core.event.FeedItemEvent; +import de.danoeh.antennapod.event.FeedItemEvent; import de.danoeh.antennapod.model.feed.Feed; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java index 6bbd704e2..84d66918a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/handler/MediaDownloadedHandler.java @@ -11,7 +11,7 @@ import org.greenrobot.eventbus.EventBus; import java.io.File; import java.util.concurrent.ExecutionException; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.service.download.DownloadRequest; import de.danoeh.antennapod.core.service.download.DownloadStatus; import de.danoeh.antennapod.core.storage.DBReader; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java index 1556e5a51..7f2db7bef 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java @@ -14,9 +14,9 @@ import android.view.SurfaceHolder; import androidx.media.AudioAttributesCompat; import androidx.media.AudioFocusRequestCompat; import androidx.media.AudioManagerCompat; -import de.danoeh.antennapod.core.event.PlayerErrorEvent; -import de.danoeh.antennapod.core.event.playback.BufferUpdateEvent; -import de.danoeh.antennapod.core.event.playback.SpeedChangedEvent; +import de.danoeh.antennapod.event.PlayerErrorEvent; +import de.danoeh.antennapod.event.playback.BufferUpdateEvent; +import de.danoeh.antennapod.event.playback.SpeedChangedEvent; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.util.playback.MediaPlayerError; import org.antennapod.audio.MediaPlayer; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index c969923d4..415b9f1ed 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -43,10 +43,10 @@ import androidx.core.app.NotificationManagerCompat; import androidx.media.MediaBrowserServiceCompat; import androidx.preference.PreferenceManager; -import de.danoeh.antennapod.core.event.playback.BufferUpdateEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackServiceEvent; -import de.danoeh.antennapod.core.event.PlayerErrorEvent; -import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent; +import de.danoeh.antennapod.event.playback.BufferUpdateEvent; +import de.danoeh.antennapod.event.playback.PlaybackServiceEvent; +import de.danoeh.antennapod.event.PlayerErrorEvent; +import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -57,11 +57,11 @@ import java.util.List; import java.util.concurrent.TimeUnit; import de.danoeh.antennapod.core.R; -import de.danoeh.antennapod.core.event.MessageEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.settings.SkipIntroEndingChangedEvent; -import de.danoeh.antennapod.core.event.settings.SpeedPresetChangedEvent; -import de.danoeh.antennapod.core.event.settings.VolumeAdaptionChangedEvent; +import de.danoeh.antennapod.event.MessageEvent; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; +import de.danoeh.antennapod.event.settings.SkipIntroEndingChangedEvent; +import de.danoeh.antennapod.event.settings.SpeedPresetChangedEvent; +import de.danoeh.antennapod.event.settings.VolumeAdaptionChangedEvent; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java index a99a178da..7ddb65c8e 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceTaskManager.java @@ -7,7 +7,7 @@ import android.os.Vibrator; import androidx.annotation.NonNull; import android.util.Log; -import de.danoeh.antennapod.core.event.playback.SleepTimerUpdatedEvent; +import de.danoeh.antennapod.event.playback.SleepTimerUpdatedEvent; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.util.ChapterUtils; import de.danoeh.antennapod.core.widget.WidgetUpdater; @@ -23,8 +23,8 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import de.danoeh.antennapod.core.event.FeedItemEvent; -import de.danoeh.antennapod.core.event.QueueEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.QueueEvent; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.model.playback.Playable; diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java index d7267f16a..04722b916 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java @@ -28,9 +28,9 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicBoolean; import de.danoeh.antennapod.core.R; -import de.danoeh.antennapod.core.event.FeedItemEvent; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.MessageEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.MessageEvent; import de.danoeh.antennapod.core.feed.LocalFeedUpdater; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.download.DownloadStatus; diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java index f659fb34d..51dafc575 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java @@ -23,13 +23,13 @@ import java.util.concurrent.TimeUnit; import de.danoeh.antennapod.core.R; import de.danoeh.antennapod.core.event.DownloadLogEvent; -import de.danoeh.antennapod.core.event.FavoritesEvent; -import de.danoeh.antennapod.core.event.FeedItemEvent; -import de.danoeh.antennapod.core.event.FeedListUpdateEvent; -import de.danoeh.antennapod.core.event.MessageEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackHistoryEvent; -import de.danoeh.antennapod.core.event.QueueEvent; -import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; +import de.danoeh.antennapod.event.FavoritesEvent; +import de.danoeh.antennapod.event.FeedItemEvent; +import de.danoeh.antennapod.event.FeedListUpdateEvent; +import de.danoeh.antennapod.event.MessageEvent; +import de.danoeh.antennapod.event.playback.PlaybackHistoryEvent; +import de.danoeh.antennapod.event.QueueEvent; +import de.danoeh.antennapod.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.feed.FeedEvent; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences; diff --git a/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java b/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java index e6496bb7d..b2a474598 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/sync/SyncService.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import de.danoeh.antennapod.core.R; -import de.danoeh.antennapod.core.event.SyncServiceEvent; +import de.danoeh.antennapod.event.SyncServiceEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.download.AntennapodHttpClient; import de.danoeh.antennapod.core.storage.DBReader; diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java index 11a3ad9b3..b436d80b2 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java @@ -12,11 +12,11 @@ import android.util.Log; import android.util.Pair; import android.view.SurfaceHolder; import androidx.annotation.NonNull; -import de.danoeh.antennapod.core.event.playback.PlaybackPositionEvent; -import de.danoeh.antennapod.core.event.playback.PlaybackServiceEvent; -import de.danoeh.antennapod.core.event.playback.SpeedChangedEvent; import de.danoeh.antennapod.core.storage.DBWriter; +import de.danoeh.antennapod.event.playback.PlaybackPositionEvent; import de.danoeh.antennapod.model.feed.FeedMedia; +import de.danoeh.antennapod.event.playback.PlaybackServiceEvent; +import de.danoeh.antennapod.event.playback.SpeedChangedEvent; import de.danoeh.antennapod.model.playback.MediaType; import de.danoeh.antennapod.core.feed.util.PlaybackSpeedUtils; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; diff --git a/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java b/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java index 38e84017f..41fd01441 100644 --- a/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java +++ b/core/src/play/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceFlavorHelper.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException; import de.danoeh.antennapod.core.cast.CastConsumer; import de.danoeh.antennapod.core.cast.CastManager; import de.danoeh.antennapod.core.cast.DefaultCastConsumer; -import de.danoeh.antennapod.core.event.MessageEvent; +import de.danoeh.antennapod.event.MessageEvent; import de.danoeh.antennapod.model.playback.MediaType; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.NetworkUtils; diff --git a/event/build.gradle b/event/build.gradle new file mode 100644 index 000000000..c852c0351 --- /dev/null +++ b/event/build.gradle @@ -0,0 +1,8 @@ +apply plugin: "com.android.library" +apply from: "../common.gradle" + +dependencies { + implementation project(':model') + + annotationProcessor "androidx.annotation:annotation:$annotationVersion" +} diff --git a/event/src/main/AndroidManifest.xml b/event/src/main/AndroidManifest.xml new file mode 100644 index 000000000..7561cf555 --- /dev/null +++ b/event/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/DiscoveryDefaultUpdateEvent.java b/event/src/main/java/de/danoeh/antennapod/event/DiscoveryDefaultUpdateEvent.java similarity index 69% rename from core/src/main/java/de/danoeh/antennapod/core/event/DiscoveryDefaultUpdateEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/DiscoveryDefaultUpdateEvent.java index f7757935a..944c7759a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/DiscoveryDefaultUpdateEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/DiscoveryDefaultUpdateEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; public class DiscoveryDefaultUpdateEvent { public DiscoveryDefaultUpdateEvent() { diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/FavoritesEvent.java b/event/src/main/java/de/danoeh/antennapod/event/FavoritesEvent.java similarity index 56% rename from core/src/main/java/de/danoeh/antennapod/core/event/FavoritesEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/FavoritesEvent.java index cbfcc37e6..8b27f74ab 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/FavoritesEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/FavoritesEvent.java @@ -1,9 +1,4 @@ -package de.danoeh.antennapod.core.event; - -import androidx.annotation.NonNull; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +package de.danoeh.antennapod.event; import de.danoeh.antennapod.model.feed.FeedItem; @@ -28,14 +23,4 @@ public class FavoritesEvent { public static FavoritesEvent removed(FeedItem item) { return new FavoritesEvent(Action.REMOVED, item); } - - @NonNull - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE) - .append("action", action) - .append("item", item) - .toString(); - } - } diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/FeedItemEvent.java b/event/src/main/java/de/danoeh/antennapod/event/FeedItemEvent.java similarity index 71% rename from core/src/main/java/de/danoeh/antennapod/core/event/FeedItemEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/FeedItemEvent.java index 99cb01714..6c7adc2d7 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/FeedItemEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/FeedItemEvent.java @@ -1,11 +1,8 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; import androidx.annotation.NonNull; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import java.util.Arrays; import java.util.List; @@ -41,14 +38,4 @@ public class FeedItemEvent { public static FeedItemEvent updated(FeedItem... items) { return updated(Arrays.asList(items)); } - - @NonNull - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE) - .append("action", action) - .append("items", items) - .toString(); - } - } diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/FeedListUpdateEvent.java b/event/src/main/java/de/danoeh/antennapod/event/FeedListUpdateEvent.java similarity index 93% rename from core/src/main/java/de/danoeh/antennapod/core/event/FeedListUpdateEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/FeedListUpdateEvent.java index 4ed8e33ec..99a83abec 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/FeedListUpdateEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/FeedListUpdateEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; import de.danoeh.antennapod.model.feed.Feed; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/MessageEvent.java b/event/src/main/java/de/danoeh/antennapod/event/MessageEvent.java similarity index 89% rename from core/src/main/java/de/danoeh/antennapod/core/event/MessageEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/MessageEvent.java index 9fb22b8ea..3f6b2db32 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/MessageEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/MessageEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; import androidx.annotation.Nullable; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerErrorEvent.java b/event/src/main/java/de/danoeh/antennapod/event/PlayerErrorEvent.java similarity index 84% rename from core/src/main/java/de/danoeh/antennapod/core/event/PlayerErrorEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/PlayerErrorEvent.java index 2fb27e958..662a16f81 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerErrorEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/PlayerErrorEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; public class PlayerErrorEvent { private final String message; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerStatusEvent.java b/event/src/main/java/de/danoeh/antennapod/event/PlayerStatusEvent.java similarity index 64% rename from core/src/main/java/de/danoeh/antennapod/core/event/PlayerStatusEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/PlayerStatusEvent.java index fe7f17968..4074bd98f 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/PlayerStatusEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/PlayerStatusEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; public class PlayerStatusEvent { public PlayerStatusEvent() { diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/QueueEvent.java b/event/src/main/java/de/danoeh/antennapod/event/QueueEvent.java similarity index 77% rename from core/src/main/java/de/danoeh/antennapod/core/event/QueueEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/QueueEvent.java index c866939bd..578398865 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/QueueEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/QueueEvent.java @@ -1,10 +1,7 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; import androidx.annotation.Nullable; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import java.util.List; import de.danoeh.antennapod.model.feed.FeedItem; @@ -58,14 +55,4 @@ public class QueueEvent { public static QueueEvent moved(FeedItem item, int newPosition) { return new QueueEvent(Action.MOVED, item, null, newPosition); } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE) - .append("action", action) - .append("item", item) - .append("items", items) - .append("position", position) - .toString(); - } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/SyncServiceEvent.java b/event/src/main/java/de/danoeh/antennapod/event/SyncServiceEvent.java similarity index 85% rename from core/src/main/java/de/danoeh/antennapod/core/event/SyncServiceEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/SyncServiceEvent.java index 7aa5f6bf1..2ebac8c0a 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/SyncServiceEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/SyncServiceEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; public class SyncServiceEvent { private final int messageResId; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/UnreadItemsUpdateEvent.java b/event/src/main/java/de/danoeh/antennapod/event/UnreadItemsUpdateEvent.java similarity index 67% rename from core/src/main/java/de/danoeh/antennapod/core/event/UnreadItemsUpdateEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/UnreadItemsUpdateEvent.java index c3efbfe8b..fb1bbc739 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/UnreadItemsUpdateEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/UnreadItemsUpdateEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event; +package de.danoeh.antennapod.event; public class UnreadItemsUpdateEvent { public UnreadItemsUpdateEvent() { diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/BufferUpdateEvent.java b/event/src/main/java/de/danoeh/antennapod/event/playback/BufferUpdateEvent.java similarity index 94% rename from core/src/main/java/de/danoeh/antennapod/core/event/playback/BufferUpdateEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/playback/BufferUpdateEvent.java index 87369c360..57d41ad13 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/BufferUpdateEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/playback/BufferUpdateEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.playback; +package de.danoeh.antennapod.event.playback; public class BufferUpdateEvent { private static final float PROGRESS_STARTED = -1; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackHistoryEvent.java b/event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackHistoryEvent.java similarity index 84% rename from core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackHistoryEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackHistoryEvent.java index 6e5b66b90..b51377a3d 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackHistoryEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackHistoryEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.playback; +package de.danoeh.antennapod.event.playback; public class PlaybackHistoryEvent { diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackPositionEvent.java b/event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackPositionEvent.java similarity index 88% rename from core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackPositionEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackPositionEvent.java index 6f3d505d6..3746680eb 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackPositionEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackPositionEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.playback; +package de.danoeh.antennapod.event.playback; public class PlaybackPositionEvent { private final int position; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackServiceEvent.java b/event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackServiceEvent.java similarity index 82% rename from core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackServiceEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackServiceEvent.java index af524ad6c..8115730dd 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/PlaybackServiceEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/playback/PlaybackServiceEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.playback; +package de.danoeh.antennapod.event.playback; public class PlaybackServiceEvent { public enum Action { diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SleepTimerUpdatedEvent.java b/event/src/main/java/de/danoeh/antennapod/event/playback/SleepTimerUpdatedEvent.java similarity index 94% rename from core/src/main/java/de/danoeh/antennapod/core/event/playback/SleepTimerUpdatedEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/playback/SleepTimerUpdatedEvent.java index 37a073799..be61435a0 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SleepTimerUpdatedEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/playback/SleepTimerUpdatedEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.playback; +package de.danoeh.antennapod.event.playback; public class SleepTimerUpdatedEvent { private static final long CANCELLED = Long.MAX_VALUE; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SpeedChangedEvent.java b/event/src/main/java/de/danoeh/antennapod/event/playback/SpeedChangedEvent.java similarity index 81% rename from core/src/main/java/de/danoeh/antennapod/core/event/playback/SpeedChangedEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/playback/SpeedChangedEvent.java index 2fd20c7fb..243d20628 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/playback/SpeedChangedEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/playback/SpeedChangedEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.playback; +package de.danoeh.antennapod.event.playback; public class SpeedChangedEvent { private final float newSpeed; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SkipIntroEndingChangedEvent.java b/event/src/main/java/de/danoeh/antennapod/event/settings/SkipIntroEndingChangedEvent.java similarity index 91% rename from core/src/main/java/de/danoeh/antennapod/core/event/settings/SkipIntroEndingChangedEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/settings/SkipIntroEndingChangedEvent.java index 583f7b13f..bb6010796 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SkipIntroEndingChangedEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/settings/SkipIntroEndingChangedEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.settings; +package de.danoeh.antennapod.event.settings; public class SkipIntroEndingChangedEvent { private final int skipIntro; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SpeedPresetChangedEvent.java b/event/src/main/java/de/danoeh/antennapod/event/settings/SpeedPresetChangedEvent.java similarity index 87% rename from core/src/main/java/de/danoeh/antennapod/core/event/settings/SpeedPresetChangedEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/settings/SpeedPresetChangedEvent.java index 0ac7e1316..6ca8a1290 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/settings/SpeedPresetChangedEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/settings/SpeedPresetChangedEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.settings; +package de.danoeh.antennapod.event.settings; public class SpeedPresetChangedEvent { private final float speed; diff --git a/core/src/main/java/de/danoeh/antennapod/core/event/settings/VolumeAdaptionChangedEvent.java b/event/src/main/java/de/danoeh/antennapod/event/settings/VolumeAdaptionChangedEvent.java similarity index 91% rename from core/src/main/java/de/danoeh/antennapod/core/event/settings/VolumeAdaptionChangedEvent.java rename to event/src/main/java/de/danoeh/antennapod/event/settings/VolumeAdaptionChangedEvent.java index 3905ce68f..5a2c0b63c 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/event/settings/VolumeAdaptionChangedEvent.java +++ b/event/src/main/java/de/danoeh/antennapod/event/settings/VolumeAdaptionChangedEvent.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.core.event.settings; +package de.danoeh.antennapod.event.settings; import de.danoeh.antennapod.model.feed.VolumeAdaptionSetting; diff --git a/settings.gradle b/settings.gradle index f73020141..80fce468f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ include ':app' include ':core' +include ':event' include ':model' include ':net:ssl'