wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add AccountOptions and state mapper

Browse source
This commit is contained in:
Wolf-Martell Montwé 2023-06-27 18:58:16 +02:00
parent 5384350689
commit 1c142876d0
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
5 changed files with 63 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/k9mail/src/main/java/com/fsck/k9/account/AccountCreator.kt
View file

@ -18,11 +18,11 @@ class AccountCreator(
val newAccount = preferences.newAccount()
newAccount.email = account.emailAddress
newAccount.senderName = account.senderName
newAccount.incomingServerSettings = account.incomingServerSettings
newAccount.outgoingServerSettings = account.outgoingServerSettings
newAccount.senderName = account.options.accountName
newAccount.deletePolicy = accountCreatorHelper.getDefaultDeletePolicy(newAccount.incomingServerSettings.type)
newAccount.chipColor = accountCreatorHelper.pickColor()

2
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/Account.kt
View file

@ -6,5 +6,5 @@ data class Account(
val emailAddress: String,
val incomingServerSettings: ServerSettings,
val outgoingServerSettings: ServerSettings,
val senderName: String,
val options: AccountOptions,
)

10
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/domain/entity/AccountOptions.kt Normal file
View file

@ -0,0 +1,10 @@
package app.k9mail.feature.account.setup.domain.entity
data class AccountOptions(
val accountName: String,
val displayName: String,
val emailSignature: String?,
val checkFrequencyInMinutes: Int,
val messageDisplayCount: Int,
val showNotification: Boolean,
)

14
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/options/AccountOptionsStateMapper.kt Normal file
View file

@ -0,0 +1,14 @@
package app.k9mail.feature.account.setup.ui.options
import app.k9mail.feature.account.setup.domain.entity.AccountOptions
internal fun AccountOptionsContract.State.toAccountOptions(): AccountOptions {
return AccountOptions(
accountName = accountName.value,
displayName = displayName.value,
emailSignature = emailSignature.value,
checkFrequencyInMinutes = checkFrequency.minutes,
messageDisplayCount = messageDisplayCount.count,
showNotification = showNotification,
)
}

37
feature/account/setup/src/test/kotlin/app/k9mail/feature/account/setup/ui/options/AccountOptionsStateMapperKtTest.kt Normal file
View file

@ -0,0 +1,37 @@
package app.k9mail.feature.account.setup.ui.options
import app.k9mail.feature.account.setup.domain.entity.AccountOptions
import app.k9mail.feature.account.setup.domain.entity.EmailCheckFrequency
import app.k9mail.feature.account.setup.domain.entity.EmailDisplayCount
import app.k9mail.feature.account.setup.domain.input.StringInputField
import assertk.assertThat
import assertk.assertions.isEqualTo
import org.junit.Test
class AccountOptionsStateMapperKtTest {
@Test
fun `should map state to account options`() {
val state = AccountOptionsContract.State(
accountName = StringInputField("accountName"),
displayName = StringInputField("displayName"),
emailSignature = StringInputField("emailSignature"),
checkFrequency = EmailCheckFrequency.EVERY_2_HOURS,
messageDisplayCount = EmailDisplayCount.MESSAGES_100,
showNotification = true,
)
val result = state.toAccountOptions()
assertThat(result).isEqualTo(
AccountOptions(
accountName = "accountName",
displayName = "displayName",
emailSignature = "emailSignature",
checkFrequencyInMinutes = 120,
messageDisplayCount = 100,
showNotification = true,
),
)
}
}