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

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

Move `DisplayFolder` to `:legacy:folder` module

parent 7b32170b

legacy/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt

+1 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package com.fsck.k9.mailstore 
import app.k9mail.legacy.account.Account

import app.k9mail.legacy.account.Account.FolderMode

import app.k9mail.legacy.di.DI

import app.k9mail.legacy.folder.DisplayFolder

import app.k9mail.legacy.folder.Folder

import app.k9mail.legacy.folder.FolderType

import app.k9mail.legacy.folder.RemoteFolder
@@ -313,10 +314,3 @@ data class RemoteFolderDetails( 
    val notifyClass: FolderClass,

    val pushClass: FolderClass,

)
 


data class DisplayFolder(

    val folder: Folder,

    val isInTopGroup: Boolean,

    val unreadMessageCount: Int,

    val starredMessageCount: Int,

)

legacy/folder/src/main/kotlin/app/k9mail/legacy/folder/DisplayFolder.kt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package app.k9mail.legacy.folder



data class DisplayFolder(

    val folder: Folder,

    val isInTopGroup: Boolean,

    val unreadMessageCount: Int,

    val starredMessageCount: Int,

)

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import androidx.drawerlayout.widget.DrawerLayout 
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout

import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons

import app.k9mail.legacy.account.Account

import app.k9mail.legacy.folder.DisplayFolder

import app.k9mail.legacy.folder.Folder

import app.k9mail.legacy.ui.account.DisplayAccount

import app.k9mail.legacy.ui.folder.FolderIconProvider
@@ -21,7 +22,6 @@ import com.fsck.k9.K9 
import com.fsck.k9.activity.MessageList

import com.fsck.k9.controller.MessagingController

import com.fsck.k9.controller.SimpleMessagingListener

import com.fsck.k9.mailstore.DisplayFolder

import com.fsck.k9.ui.account.AccountImageLoader

import com.fsck.k9.ui.account.AccountsViewModel

import com.fsck.k9.ui.base.Theme

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ import androidx.recyclerview.widget.RecyclerView 
import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons

import app.k9mail.legacy.account.Account

import app.k9mail.legacy.account.Account.FolderMode

import app.k9mail.legacy.folder.DisplayFolder

import app.k9mail.legacy.folder.FolderType

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

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

import com.fsck.k9.Preferences

import com.fsck.k9.controller.MessageReference

import com.fsck.k9.controller.MessagingController

import com.fsck.k9.mailstore.DisplayFolder

import com.fsck.k9.ui.R

import com.fsck.k9.ui.base.K9Activity

import com.mikepenz.fastadapter.FastAdapter

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import androidx.lifecycle.asLiveData 
import androidx.lifecycle.viewModelScope

import app.k9mail.legacy.account.Account

import app.k9mail.legacy.account.Account.FolderMode

import com.fsck.k9.mailstore.DisplayFolder

import app.k9mail.legacy.folder.DisplayFolder

import com.fsck.k9.mailstore.FolderRepository

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableSharedFlow