Skip to content

Commit 91dde44

Browse files
shamim-emonshamim-emon
committed
Refactor: Move legacy:search to feature:search & move app.k9mail.legacy.account.BaseAccount to core:account
1 parent d6f0615 commit 91dde44

59 files changed

Lines changed: 153 additions & 96 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app-common/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ dependencies {
1414
implementation(projects.legacy.core)
1515
implementation(projects.legacy.account)
1616

17+
implementation(projects.core.account)
18+
1719
implementation(projects.core.featureflags)
1820
implementation(projects.core.ui.legacy.theme2.common)
1921

‎core/account/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
plugins {
2+
id(ThunderbirdPlugins.Library.jvm)
3+
alias(libs.plugins.android.lint)
4+
}

legacy/account/src/main/java/app/k9mail/legacy/account/BaseAccount.kt renamed to core/account/src/main/kotlin/net/thunderbird/core/account/BaseAccount.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.k9mail.legacy.account
1+
package net.thunderbird.core.account
22

33
interface BaseAccount {
44
val uuid: String

‎feature/navigation/drawer/dropdown/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ dependencies {
1717

1818
implementation(projects.feature.account.avatar)
1919

20+
implementation(projects.feature.search)
21+
implementation(projects.core.account)
2022
implementation(projects.legacy.account)
2123
implementation(projects.legacy.mailstore)
2224
implementation(projects.legacy.message)

‎feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/data/UnifiedFolderRepository.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package net.thunderbird.feature.navigation.drawer.dropdown.data
22

33
import app.k9mail.legacy.message.controller.MessageCountsProvider
4-
import app.k9mail.legacy.search.LocalSearch
5-
import app.k9mail.legacy.search.api.SearchAttribute
6-
import app.k9mail.legacy.search.api.SearchField
74
import kotlinx.coroutines.flow.Flow
85
import kotlinx.coroutines.flow.map
96
import net.thunderbird.feature.navigation.drawer.dropdown.domain.DomainContract
107
import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolder
118
import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolderType
9+
import net.thunderbird.feature.search.LocalSearch
10+
import net.thunderbird.feature.search.api.SearchAttribute
11+
import net.thunderbird.feature.search.api.SearchField
1212

1313
internal class UnifiedFolderRepository(
1414
private val messageCountsProvider: MessageCountsProvider,

‎feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/data/FakeMessageCountsProvider.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ package net.thunderbird.feature.navigation.drawer.dropdown.data
33
import app.k9mail.legacy.account.LegacyAccount
44
import app.k9mail.legacy.message.controller.MessageCounts
55
import app.k9mail.legacy.message.controller.MessageCountsProvider
6-
import app.k9mail.legacy.search.LocalSearch
7-
import app.k9mail.legacy.search.SearchAccount
86
import kotlinx.coroutines.flow.Flow
97
import kotlinx.coroutines.flow.flowOf
8+
import net.thunderbird.feature.search.LocalSearch
9+
import net.thunderbird.feature.search.SearchAccount
1010

1111
internal class FakeMessageCountsProvider(
1212
private val messageCounts: MessageCounts,
1313
) : MessageCountsProvider {
14-
var recordedSearch: LocalSearch = LocalSearch()
14+
var recordedSearch: LocalSearch =
15+
LocalSearch()
1516

1617
override fun getMessageCounts(account: LegacyAccount): MessageCounts {
1718
TODO("Not yet implemented")

‎feature/navigation/drawer/dropdown/src/test/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/data/UnifiedFolderRepositoryTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package net.thunderbird.feature.navigation.drawer.dropdown.data
22

33
import app.k9mail.legacy.message.controller.MessageCounts
4-
import app.k9mail.legacy.search.api.SearchAttribute
5-
import app.k9mail.legacy.search.api.SearchField
64
import assertk.assertThat
75
import assertk.assertions.isEqualTo
86
import kotlin.test.Test
97
import kotlinx.coroutines.flow.first
108
import kotlinx.coroutines.test.runTest
119
import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolder
1210
import net.thunderbird.feature.navigation.drawer.dropdown.domain.entity.DisplayUnifiedFolderType
11+
import net.thunderbird.feature.search.api.SearchAttribute
12+
import net.thunderbird.feature.search.api.SearchField
1313

1414
internal class UnifiedFolderRepositoryTest {
1515

‎feature/navigation/drawer/siderail/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies {
1212

1313
implementation(projects.core.mail.folder.api)
1414

15+
implementation(projects.core.account)
1516
implementation(projects.core.ui.theme.api)
1617
implementation(projects.core.ui.compose.designsystem)
1718

@@ -20,7 +21,7 @@ dependencies {
2021
implementation(projects.legacy.account)
2122
implementation(projects.legacy.mailstore)
2223
implementation(projects.legacy.message)
23-
implementation(projects.legacy.search)
24+
implementation(projects.feature.search)
2425
implementation(projects.legacy.ui.folder)
2526
implementation(projects.core.featureflags)
2627

‎feature/navigation/drawer/siderail/src/main/kotlin/net/thunderbird/feature/navigation/drawer/siderail/data/UnifiedFolderRepository.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package net.thunderbird.feature.navigation.drawer.siderail.data
22

33
import app.k9mail.legacy.message.controller.MessageCountsProvider
4-
import app.k9mail.legacy.search.LocalSearch
5-
import app.k9mail.legacy.search.api.SearchAttribute
6-
import app.k9mail.legacy.search.api.SearchField
74
import kotlinx.coroutines.flow.Flow
85
import kotlinx.coroutines.flow.map
96
import net.thunderbird.feature.navigation.drawer.siderail.domain.DomainContract
107
import net.thunderbird.feature.navigation.drawer.siderail.domain.entity.DisplayUnifiedFolder
118
import net.thunderbird.feature.navigation.drawer.siderail.domain.entity.DisplayUnifiedFolderType
9+
import net.thunderbird.feature.search.LocalSearch
10+
import net.thunderbird.feature.search.api.SearchAttribute
11+
import net.thunderbird.feature.search.api.SearchField
1212

1313
internal class UnifiedFolderRepository(
1414
private val messageCountsProvider: MessageCountsProvider,

‎feature/navigation/drawer/siderail/src/test/kotlin/net/thunderbird/feature/navigation/drawer/siderail/data/FakeMessageCountsProvider.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package net.thunderbird.feature.navigation.drawer.siderail.data
33
import app.k9mail.legacy.account.LegacyAccount
44
import app.k9mail.legacy.message.controller.MessageCounts
55
import app.k9mail.legacy.message.controller.MessageCountsProvider
6-
import app.k9mail.legacy.search.LocalSearch
7-
import app.k9mail.legacy.search.SearchAccount
86
import kotlinx.coroutines.flow.Flow
97
import kotlinx.coroutines.flow.flowOf
8+
import net.thunderbird.feature.search.LocalSearch
9+
import net.thunderbird.feature.search.SearchAccount
1010

1111
internal class FakeMessageCountsProvider(
1212
private val messageCounts: MessageCounts,

0 commit comments

Comments
 (0)