mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-19 19:52:14 +02:00
Code

Move AccountsViewModel to : feature:navigation:drawer

Browse Source
This commit is contained in:
Wolf-Martell Montwé 2024-09-10 11:49:04 +02:00
parent aae2721e01
commit 7ad6cf6211
No known key found for this signature in database
GPG Key ID: 6D45B21512ACBF72
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,13 +15,13 @@ import androidx.drawerlayout.widget.DrawerLayout
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons
import app.k9mail.core.ui.theme.api.Theme
import app.k9mail.feature.navigation.drawer.legacy.AccountsViewModel
import app.k9mail.legacy.account.Account
import app.k9mail.legacy.folder.DisplayFolder
import app.k9mail.legacy.folder.Folder
import app.k9mail.legacy.message.controller.MessagingControllerMailChecker
import app.k9mail.legacy.message.controller.SimpleMessagingListener
import app.k9mail.legacy.ui.account.AccountImageLoader
import app.k9mail.legacy.ui.account.AccountsViewModel
import app.k9mail.legacy.ui.account.DisplayAccount
import app.k9mail.legacy.ui.folder.DisplayUnifiedInbox
import app.k9mail.legacy.ui.folder.FolderIconProvider

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

@ -1,5 +1,6 @@
package app.k9mail.feature.navigation.drawer
import app.k9mail.feature.navigation.drawer.legacy.AccountsViewModel
import app.k9mail.feature.navigation.drawer.ui.DrawerViewModel
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.core.module.Module
@ -8,4 +9,12 @@ import org.koin.dsl.module
val navigationDrawerModule: Module = module {
viewModel { DrawerViewModel() }
viewModel {
AccountsViewModel(
accountManager = get(),
messageCountsProvider = get(),
messageListRepository = get(),
)
}
}

3
legacy/ui/account/src/main/java/app/k9mail/legacy/ui/account/AccountsViewModel.kt → feature/navigation/drawer/src/main/kotlin/app/k9mail/feature/navigation/drawer/legacy/AccountsViewModel.kt
View File

@ -1,4 +1,4 @@
package app.k9mail.legacy.ui.account
package app.k9mail.feature.navigation.drawer.legacy
import androidx.lifecycle.LiveData
import androidx.lifecycle.ViewModel
@ -9,6 +9,7 @@ import app.k9mail.legacy.mailstore.MessageListChangedListener
import app.k9mail.legacy.mailstore.MessageListRepository
import app.k9mail.legacy.message.controller.MessageCounts
import app.k9mail.legacy.message.controller.MessageCountsProvider
import app.k9mail.legacy.ui.account.DisplayAccount
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.channels.awaitClose

5
legacy/ui/legacy/src/main/java/com/fsck/k9/ui/account/KoinModule.kt
View File

@ -2,14 +2,9 @@ package com.fsck.k9.ui.account
import app.k9mail.legacy.ui.account.AccountFallbackImageProvider
import app.k9mail.legacy.ui.account.AccountImageLoader
import app.k9mail.legacy.ui.account.AccountsViewModel
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module
val accountUiModule = module {
viewModel {
AccountsViewModel(accountManager = get(), messageCountsProvider = get(), messageListRepository = get())
}
factory { AccountImageLoader(accountFallbackImageProvider = get()) }
factory { AccountFallbackImageProvider(context = get()) }
factory { AccountImageModelLoaderFactory(contactPhotoLoader = get(), accountFallbackImageProvider = get()) }