highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-24 18:43:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removes dependency on the viewModel on AccountFeedStates

Browse Source
This commit is contained in:
Vitor Pamplona
2025-09-08 15:58:42 -04:00
parent ed1ea4d289
commit 26599fe24f
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountFeedContentStates.kt
View File

@@ -20,7 +20,7 @@
*/ */
package com.vitorpamplona.amethyst.ui.screen.loggedIn package com.vitorpamplona.amethyst.ui.screen.loggedIn
import androidx.lifecycle.viewModelScope import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.amethyst.service.checkNotInMainThread import com.vitorpamplona.amethyst.service.checkNotInMainThread
import com.vitorpamplona.amethyst.ui.feeds.ChannelFeedContentState import com.vitorpamplona.amethyst.ui.feeds.ChannelFeedContentState
@@ -43,33 +43,35 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.CardFeedConte
import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.NotificationSummaryState import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.NotificationSummaryState
import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.dal.NotificationFeedFilter import com.vitorpamplona.amethyst.ui.screen.loggedIn.notifications.dal.NotificationFeedFilter
import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.dal.VideoFeedFilter import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.dal.VideoFeedFilter
import kotlinx.coroutines.CoroutineScope
class AccountFeedContentStates( class AccountFeedContentStates(
val accountViewModel: AccountViewModel, val account: Account,
val scope: CoroutineScope,
) { ) {
val homeLive = ChannelFeedContentState(HomeLiveFilter(accountViewModel.account), accountViewModel.viewModelScope) val homeLive = ChannelFeedContentState(HomeLiveFilter(account), scope)
val homeNewThreads = FeedContentState(HomeNewThreadFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val homeNewThreads = FeedContentState(HomeNewThreadFeedFilter(account), scope)
val homeReplies = FeedContentState(HomeConversationsFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val homeReplies = FeedContentState(HomeConversationsFeedFilter(account), scope)
val dmKnown = FeedContentState(ChatroomListKnownFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val dmKnown = FeedContentState(ChatroomListKnownFeedFilter(account), scope)
val dmNew = FeedContentState(ChatroomListNewFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val dmNew = FeedContentState(ChatroomListNewFeedFilter(account), scope)
val videoFeed = FeedContentState(VideoFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val videoFeed = FeedContentState(VideoFeedFilter(account), scope)
val discoverFollowSets = FeedContentState(DiscoverFollowSetsFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val discoverFollowSets = FeedContentState(DiscoverFollowSetsFeedFilter(account), scope)
val discoverReads = FeedContentState(DiscoverLongFormFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val discoverReads = FeedContentState(DiscoverLongFormFeedFilter(account), scope)
val discoverMarketplace = FeedContentState(DiscoverMarketplaceFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val discoverMarketplace = FeedContentState(DiscoverMarketplaceFeedFilter(account), scope)
val discoverDVMs = FeedContentState(DiscoverNIP89FeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val discoverDVMs = FeedContentState(DiscoverNIP89FeedFilter(account), scope)
val discoverLive = FeedContentState(DiscoverLiveFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val discoverLive = FeedContentState(DiscoverLiveFeedFilter(account), scope)
val discoverCommunities = FeedContentState(DiscoverCommunityFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val discoverCommunities = FeedContentState(DiscoverCommunityFeedFilter(account), scope)
val discoverPublicChats = FeedContentState(DiscoverChatFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val discoverPublicChats = FeedContentState(DiscoverChatFeedFilter(account), scope)
val notifications = CardFeedContentState(NotificationFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val notifications = CardFeedContentState(NotificationFeedFilter(account), scope)
val notificationSummary = NotificationSummaryState(accountViewModel.account) val notificationSummary = NotificationSummaryState(account)
val feedListOptions = FollowListState(accountViewModel.account, accountViewModel.viewModelScope) val feedListOptions = FollowListState(account, scope)
val drafts = FeedContentState(DraftEventsFeedFilter(accountViewModel.account), accountViewModel.viewModelScope) val drafts = FeedContentState(DraftEventsFeedFilter(account), scope)
suspend fun init() { suspend fun init() {
notificationSummary.initializeSuspend() notificationSummary.initializeSuspend()

2
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@@ -173,7 +173,7 @@ class AccountViewModel(
var firstRoute: Route? = null var firstRoute: Route? = null
val toastManager = ToastManager() val toastManager = ToastManager()
val feedStates = AccountFeedContentStates(this) val feedStates = AccountFeedContentStates(account, viewModelScope)
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
val notificationHasNewItems = val notificationHasNewItems =