Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cf54189f authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Remove `FoldersViewModel` on `K9`

parent 737a85cd

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import androidx.lifecycle.viewModelScope 
import app.k9mail.legacy.account.Account

import app.k9mail.legacy.ui.folder.DisplayUnifiedInbox

import app.k9mail.legacy.ui.folder.FolderList

import com.fsck.k9.K9

import com.fsck.k9.controller.MessageCountsProvider

import com.fsck.k9.mailstore.FolderRepository

import com.fsck.k9.search.SearchAccount
@@ -25,6 +24,7 @@ import kotlinx.coroutines.launch 
class FoldersViewModel(

    private val folderRepository: FolderRepository,

    private val messageCountsProvider: MessageCountsProvider,

    private val isShowUnifiedInbox: () -> Boolean,

    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,

) : ViewModel() {

    private val inputFlow = MutableSharedFlow<Account?>(replay = 1)
@@ -56,7 +56,7 @@ class FoldersViewModel( 
    }



    private fun getUnifiedInboxAccount(): SearchAccount? {

        return if (K9.isShowUnifiedInbox) SearchAccount.createUnifiedInboxAccount() else null

        return if (isShowUnifiedInbox()) SearchAccount.createUnifiedInboxAccount() else null

    }



    fun getFolderListLiveData(): LiveData<FolderList> {

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/folders/KoinModule.kt

+8 −1
Original line number Diff line number Diff line
@@ -2,11 +2,18 @@ package com.fsck.k9.ui.folders 


import app.k9mail.legacy.ui.folder.FolderIconProvider

import app.k9mail.legacy.ui.folder.FolderNameFormatter

import com.fsck.k9.K9

import org.koin.androidx.viewmodel.dsl.viewModel

import org.koin.dsl.module



val foldersUiModule = module {

    factory { FolderNameFormatter(resources = get()) }

    viewModel { FoldersViewModel(folderRepository = get(), messageCountsProvider = get()) }

    viewModel {

        FoldersViewModel(

            folderRepository = get(),

            messageCountsProvider = get(),

            isShowUnifiedInbox = { K9.isShowUnifiedInbox },

        )

    }

    factory { FolderIconProvider() }

}