Skip to content

Commit 80c0f88

Browse files
authored
chore: Move EventHub from :app to :core:eventhub (#1204)
Precursor to other work that will use the eventhub from modules other than :app.
1 parent c79e7a4 commit 80c0f88

31 files changed

+131
-83
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ dependencies {
127127
implementation(projects.core.database)
128128
implementation(projects.core.designsystem)
129129
implementation(projects.core.domain)
130+
implementation(projects.core.eventhub)
130131
implementation(projects.core.model)
131132
implementation(projects.core.navigation)
132133
implementation(projects.core.network)

app/src/main/java/app/pachli/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import androidx.lifecycle.lifecycleScope
5858
import androidx.lifecycle.repeatOnLifecycle
5959
import androidx.viewpager2.widget.MarginPageTransformer
6060
import app.pachli.appstore.CacheUpdater
61-
import app.pachli.appstore.EventHub
6261
import app.pachli.components.compose.ComposeActivity.Companion.canHandleMimeType
6362
import app.pachli.components.notifications.createNotificationChannelsForAccount
6463
import app.pachli.components.notifications.domain.AndroidNotificationsAreEnabledUseCase
@@ -81,6 +80,7 @@ import app.pachli.core.data.repository.SetActiveAccountError
8180
import app.pachli.core.database.model.AccountEntity
8281
import app.pachli.core.designsystem.EmbeddedFontFamily
8382
import app.pachli.core.designsystem.R as DR
83+
import app.pachli.core.eventhub.EventHub
8484
import app.pachli.core.model.Timeline
8585
import app.pachli.core.navigation.AboutActivityIntent
8686
import app.pachli.core.navigation.AccountActivityIntent

app/src/main/java/app/pachli/TabPreferenceActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import androidx.recyclerview.widget.RecyclerView
3636
import androidx.transition.TransitionManager
3737
import app.pachli.adapter.ItemInteractionListener
3838
import app.pachli.adapter.TabAdapter
39-
import app.pachli.appstore.EventHub
4039
import app.pachli.core.activity.BaseActivity
4140
import app.pachli.core.common.extensions.show
4241
import app.pachli.core.common.extensions.viewBinding
@@ -46,6 +45,7 @@ import app.pachli.core.data.model.MastodonList
4645
import app.pachli.core.data.repository.ListsRepository
4746
import app.pachli.core.data.repository.ListsRepository.Companion.compareByListTitle
4847
import app.pachli.core.designsystem.R as DR
48+
import app.pachli.core.eventhub.EventHub
4949
import app.pachli.core.model.Timeline
5050
import app.pachli.core.navigation.ListsActivityIntent
5151
import app.pachli.core.navigation.pachliAccountId

app/src/main/java/app/pachli/TimelineActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import android.widget.Toast
2525
import androidx.core.view.MenuProvider
2626
import androidx.fragment.app.commit
2727
import androidx.lifecycle.lifecycleScope
28-
import app.pachli.appstore.EventHub
2928
import app.pachli.core.activity.BottomSheetActivity
3029
import app.pachli.core.common.extensions.viewBinding
3130
import app.pachli.core.common.util.unsafeLazy
3231
import app.pachli.core.data.repository.ContentFilterEdit
3332
import app.pachli.core.data.repository.ContentFiltersRepository
3433
import app.pachli.core.data.repository.canFilterV1
3534
import app.pachli.core.data.repository.canFilterV2
35+
import app.pachli.core.eventhub.EventHub
3636
import app.pachli.core.model.ContentFilter
3737
import app.pachli.core.model.FilterAction
3838
import app.pachli.core.model.FilterContext

app/src/main/java/app/pachli/appstore/CacheUpdater.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ package app.pachli.appstore
22

33
import app.pachli.core.data.repository.AccountManager
44
import app.pachli.core.database.dao.TimelineDao
5+
import app.pachli.core.eventhub.BookmarkEvent
6+
import app.pachli.core.eventhub.EventHub
7+
import app.pachli.core.eventhub.FavoriteEvent
8+
import app.pachli.core.eventhub.PinEvent
9+
import app.pachli.core.eventhub.PollVoteEvent
10+
import app.pachli.core.eventhub.ReblogEvent
11+
import app.pachli.core.eventhub.StatusDeletedEvent
12+
import app.pachli.core.eventhub.UnfollowEvent
513
import javax.inject.Inject
614
import kotlinx.coroutines.CoroutineScope
715
import kotlinx.coroutines.Dispatchers

app/src/main/java/app/pachli/components/account/AccountViewModel.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package app.pachli.components.account
33
import androidx.lifecycle.MutableLiveData
44
import androidx.lifecycle.ViewModel
55
import androidx.lifecycle.viewModelScope
6-
import app.pachli.appstore.BlockEvent
7-
import app.pachli.appstore.DomainMuteEvent
8-
import app.pachli.appstore.EventHub
9-
import app.pachli.appstore.MuteEvent
10-
import app.pachli.appstore.ProfileEditedEvent
11-
import app.pachli.appstore.UnfollowEvent
126
import app.pachli.core.data.repository.AccountManager
7+
import app.pachli.core.eventhub.BlockEvent
8+
import app.pachli.core.eventhub.DomainMuteEvent
9+
import app.pachli.core.eventhub.EventHub
10+
import app.pachli.core.eventhub.MuteEvent
11+
import app.pachli.core.eventhub.ProfileEditedEvent
12+
import app.pachli.core.eventhub.UnfollowEvent
1313
import app.pachli.core.network.model.Account
1414
import app.pachli.core.network.model.Relationship
1515
import app.pachli.core.network.retrofit.MastodonApi

app/src/main/java/app/pachli/components/conversation/ConversationsFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ import androidx.recyclerview.widget.SimpleItemAnimator
3737
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
3838
import app.pachli.R
3939
import app.pachli.adapter.StatusBaseViewHolder
40-
import app.pachli.appstore.EventHub
4140
import app.pachli.core.activity.ReselectableFragment
4241
import app.pachli.core.common.extensions.hide
4342
import app.pachli.core.common.extensions.show
4443
import app.pachli.core.common.extensions.viewBinding
4544
import app.pachli.core.data.repository.StatusDisplayOptionsRepository
45+
import app.pachli.core.eventhub.EventHub
4646
import app.pachli.core.navigation.AccountActivityIntent
4747
import app.pachli.core.navigation.AttachmentViewData
4848
import app.pachli.core.navigation.TimelineActivityIntent

app/src/main/java/app/pachli/components/notifications/NotificationsViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ import androidx.paging.cachedIn
2525
import androidx.paging.filter
2626
import androidx.paging.map
2727
import app.pachli.R
28-
import app.pachli.appstore.BlockEvent
29-
import app.pachli.appstore.EventHub
30-
import app.pachli.appstore.MuteConversationEvent
31-
import app.pachli.appstore.MuteEvent
3228
import app.pachli.core.common.extensions.throttleFirst
3329
import app.pachli.core.data.model.StatusViewData
3430
import app.pachli.core.data.repository.AccountManager
3531
import app.pachli.core.data.repository.PachliAccount
3632
import app.pachli.core.data.repository.StatusDisplayOptionsRepository
3733
import app.pachli.core.database.model.AccountEntity
34+
import app.pachli.core.eventhub.BlockEvent
35+
import app.pachli.core.eventhub.EventHub
36+
import app.pachli.core.eventhub.MuteConversationEvent
37+
import app.pachli.core.eventhub.MuteEvent
3838
import app.pachli.core.model.ContentFilterVersion
3939
import app.pachli.core.model.FilterAction
4040
import app.pachli.core.model.FilterContext

app/src/main/java/app/pachli/components/preference/AccountPreferencesFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import androidx.preference.Preference
2828
import androidx.preference.PreferenceFragmentCompat
2929
import app.pachli.BuildConfig
3030
import app.pachli.R
31-
import app.pachli.appstore.EventHub
3231
import app.pachli.components.notifications.activeAccountNeedsPushScope
3332
import app.pachli.core.activity.extensions.TransitionKind
3433
import app.pachli.core.activity.extensions.startActivityWithTransition
@@ -39,6 +38,7 @@ import app.pachli.core.data.repository.ContentFiltersRepository
3938
import app.pachli.core.data.repository.canFilterV1
4039
import app.pachli.core.data.repository.canFilterV2
4140
import app.pachli.core.designsystem.R as DR
41+
import app.pachli.core.eventhub.EventHub
4242
import app.pachli.core.navigation.AccountListActivityIntent
4343
import app.pachli.core.navigation.ContentFiltersActivityIntent
4444
import app.pachli.core.navigation.FollowedTagsActivityIntent

app/src/main/java/app/pachli/components/preference/PreferencesActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import androidx.preference.Preference
2626
import androidx.preference.PreferenceFragmentCompat
2727
import app.pachli.BuildConfig
2828
import app.pachli.R
29-
import app.pachli.appstore.EventHub
3029
import app.pachli.core.activity.BaseActivity
3130
import app.pachli.core.activity.extensions.TransitionKind
3231
import app.pachli.core.activity.extensions.startActivityWithDefaultTransition
32+
import app.pachli.core.eventhub.EventHub
3333
import app.pachli.core.navigation.MainActivityIntent
3434
import app.pachli.core.navigation.PreferencesActivityIntent
3535
import app.pachli.core.navigation.PreferencesActivityIntent.PreferenceScreen

0 commit comments

Comments
 (0)