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

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

Move `FoldersViewModel` to `: feature:navigation:drawer`

parent 4e1b5d0b

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/LegacyDrawer.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons 
import app.k9mail.core.ui.theme.api.Theme

import app.k9mail.feature.navigation.drawer.domain.entity.DisplayAccount

import app.k9mail.feature.navigation.drawer.legacy.AccountsViewModel

import app.k9mail.feature.navigation.drawer.legacy.FoldersViewModel

import app.k9mail.legacy.account.Account

import app.k9mail.legacy.folder.DisplayFolder

import app.k9mail.legacy.folder.Folder
@@ -27,7 +28,6 @@ import app.k9mail.legacy.ui.folder.DisplayUnifiedInbox 
import app.k9mail.legacy.ui.folder.FolderIconProvider

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

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

import app.k9mail.legacy.ui.folder.FoldersViewModel

import app.k9mail.legacy.ui.theme.ThemeManager

import com.fsck.k9.K9

import com.fsck.k9.ui.base.livedata.observeNotNull

feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/NavigationDrawerModule.kt

+15 −0
Original line number Diff line number Diff line 
package app.k9mail.feature.navigation.drawer



import app.k9mail.feature.navigation.drawer.legacy.AccountsViewModel

import app.k9mail.feature.navigation.drawer.legacy.FoldersViewModel

import app.k9mail.feature.navigation.drawer.ui.DrawerViewModel

import com.fsck.k9.CoreResourceProvider

import com.fsck.k9.K9

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

import org.koin.core.module.Module

import org.koin.dsl.module
@@ -17,4 +20,16 @@ val navigationDrawerModule: Module = module { 
            messageListRepository = get(),

        )

    }



    viewModel {

        val coreResourceProvider = get<CoreResourceProvider>()



        FoldersViewModel(

            folderRepository = get(),

            messageCountsProvider = get(),

            isShowUnifiedInbox = { K9.isShowUnifiedInbox },

            getUnifiedInboxTitle = { coreResourceProvider.searchUnifiedInboxTitle() },

            getUnifiedInboxDetail = { coreResourceProvider.searchUnifiedInboxDetail() },

        )

    }

}

legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/FoldersViewModel.kt→feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/legacy/FoldersViewModel.kt

+1 −1
Original line number Diff line number Diff line 
package app.k9mail.legacy.ui.folder

package app.k9mail.feature.navigation.drawer.legacy



import androidx.lifecycle.LiveData

import androidx.lifecycle.ViewModel

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

+0 −15
Original line number Diff line number Diff line
@@ -2,24 +2,9 @@ package com.fsck.k9.ui.folders 


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

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

import app.k9mail.legacy.ui.folder.FoldersViewModel

import com.fsck.k9.CoreResourceProvider

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 {

        val coreResourceProvider = get<CoreResourceProvider>()



        FoldersViewModel(

            folderRepository = get(),

            messageCountsProvider = get(),

            isShowUnifiedInbox = { K9.isShowUnifiedInbox },

            getUnifiedInboxTitle = { coreResourceProvider.searchUnifiedInboxTitle() },

            getUnifiedInboxDetail = { coreResourceProvider.searchUnifiedInboxDetail() },

        )

    }

    factory { FolderIconProvider() }

}