Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-03 04:47:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: inbox reload when changing type from default and navigating (#406)

Browse Source
This commit is contained in:
Diego Beraldin 2023-12-31 14:46:59 +01:00 committed by GitHub
parent d349aa5dbe
commit f0623ca9a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/notifications/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/notifications/ContentResetCoordinator.kt
View File

@ -3,4 +3,5 @@ package com.github.diegoberaldin.raccoonforlemmy.core.notifications
interface ContentResetCoordinator {
var resetHome: Boolean
var resetExplore: Boolean
var resetInbox: Boolean
}

1
core/notifications/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/notifications/DefaultContentResetCoordinator.kt
View File

@ -4,4 +4,5 @@ class DefaultContentResetCoordinator : ContentResetCoordinator {
override var resetHome = false
override var resetExplore = false
override var resetInbox = false
}

1
feature/inbox/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/inbox/di/InboxModule.kt
View File

@ -22,6 +22,7 @@ val inboxTabModule = module {
coordinator = get(),
settingsRepository = get(),
notificationCenter = get(),
contentResetCoordinator = get(),
)
}
}

20
feature/inbox/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/inbox/main/InboxViewModel.kt
View File

@ -2,6 +2,7 @@ package com.github.diegoberaldin.raccoonforlemmy.feature.inbox.main
import com.github.diegoberaldin.raccoonforlemmy.core.architecture.DefaultMviModel
import com.github.diegoberaldin.raccoonforlemmy.core.architecture.MviModel
import com.github.diegoberaldin.raccoonforlemmy.core.notifications.ContentResetCoordinator
import com.github.diegoberaldin.raccoonforlemmy.core.notifications.NotificationCenter
import com.github.diegoberaldin.raccoonforlemmy.core.notifications.NotificationCenterEvent
import com.github.diegoberaldin.raccoonforlemmy.core.persistence.repository.SettingsRepository
@ -22,9 +23,12 @@ class InboxViewModel(
private val coordinator: InboxCoordinator,
private val settingsRepository: SettingsRepository,
private val notificationCenter: NotificationCenter,
private val contentResetCoordinator: ContentResetCoordinator,
) : InboxMviModel,
MviModel<InboxMviModel.Intent, InboxMviModel.UiState, InboxMviModel.Effect> by mvi {
private var firstLoad = true
override fun onStarted() {
mvi.onStarted()
mvi.scope?.launch {
@ -47,10 +51,18 @@ class InboxViewModel(
changeUnreadOnly(evt.unreadOnly)
}.launchIn(this)
val settingsUnreadOnly =
settingsRepository.currentSettings.value.defaultInboxType.toInboxUnreadOnly()
if (uiState.value.unreadOnly != settingsUnreadOnly) {
changeUnreadOnly(settingsUnreadOnly)
if (contentResetCoordinator.resetInbox) {
contentResetCoordinator.resetInbox = false
// apply new inbox type
firstLoad = true
}
if (firstLoad) {
firstLoad = false
val settingsUnreadOnly =
settingsRepository.currentSettings.value.defaultInboxType.toInboxUnreadOnly()
if (uiState.value.unreadOnly != settingsUnreadOnly) {
changeUnreadOnly(settingsUnreadOnly)
}
}
}
}

1
feature/settings/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/feature/settings/main/SettingsViewModel.kt
View File

@ -669,6 +669,7 @@ class SettingsViewModel(
defaultInboxType = value.toInboxDefaultType(),
)
saveSettings(settings)
contentResetCoordinator.resetInbox = true
}
}