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

Change AutoDiscoveryStatusHeaderState to enum

Browse source
This commit is contained in:
Wolf-Martell Montwé 2023-06-15 17:45:52 +02:00
parent e0dd88d599
commit ef6d35c44c
No known key found for this signature in database
GPG key ID: 6D45B21512ACBF72
2 changed files with 37 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderState.kt
View file

@ -1,7 +1,34 @@
package app.k9mail.feature.account.setup.ui.autoconfig.view
sealed interface AutoDiscoveryStatusHeaderState {
object NoSettings : AutoDiscoveryStatusHeaderState
object Trusted : AutoDiscoveryStatusHeaderState
object Untrusted : AutoDiscoveryStatusHeaderState
import androidx.annotation.StringRes
import androidx.compose.ui.graphics.vector.ImageVector
import app.k9mail.core.ui.compose.theme.Icons
import app.k9mail.feature.account.setup.R
enum class AutoDiscoveryStatusHeaderState(
val icon: ImageVector,
@StringRes val titleResourceId: Int,
@StringRes val subtitleResourceId: Int,
val isExpandable: Boolean,
) {
NoSettings(
icon = Icons.Outlined.info,
titleResourceId = R.string.account_setup_auto_config_status_header_title_configuration_not_found,
subtitleResourceId = R.string.account_setup_auto_config_status_header_subtitle_configuration_not_found,
isExpandable = false,
),
Trusted(
icon = Icons.Outlined.check,
titleResourceId = R.string.account_setup_auto_config_status_header_title_configuration_found,
subtitleResourceId = R.string.account_setup_auto_config_status_header_subtitle_configuration_trusted,
isExpandable = true,
),
Untrusted(
icon = Icons.Outlined.info,
titleResourceId = R.string.account_setup_auto_config_status_header_title_configuration_found,
subtitleResourceId = R.string.account_setup_auto_config_status_header_subtitle_configuration_untrusted,
isExpandable = true,
),
}

42
feature/account/setup/src/main/kotlin/app/k9mail/feature/account/setup/ui/autoconfig/view/AutoDiscoveryStatusHeaderView.kt
View file

@ -17,7 +17,6 @@ import app.k9mail.core.ui.compose.designsystem.atom.text.TextHeadline6
import app.k9mail.core.ui.compose.theme.Icons
import app.k9mail.core.ui.compose.theme.MainTheme
import app.k9mail.core.ui.compose.theme.PreviewWithThemes
import app.k9mail.feature.account.setup.R
@Suppress("LongMethod")
@Composable
@ -33,13 +32,10 @@ internal fun AutoDiscoveryStatusHeaderView(
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
imageVector = when (state) {
AutoDiscoveryStatusHeaderState.NoSettings -> Icons.Outlined.info
AutoDiscoveryStatusHeaderState.Trusted -> Icons.Outlined.check
AutoDiscoveryStatusHeaderState.Untrusted -> Icons.Outlined.info
},
imageVector = state.icon,
tint = selectColor(state),
modifier = Modifier.padding(MainTheme.spacings.default)
modifier = Modifier
.padding(MainTheme.spacings.default)
.requiredSize(MainTheme.sizes.medium),
)
Column(
@ -52,40 +48,14 @@ internal fun AutoDiscoveryStatusHeaderView(
),
) {
TextHeadline6(
text = stringResource(
id = when (state) {
AutoDiscoveryStatusHeaderState.NoSettings -> {
R.string.account_setup_auto_config_status_header_title_configuration_not_found
}
AutoDiscoveryStatusHeaderState.Trusted,
AutoDiscoveryStatusHeaderState.Untrusted,
-> {
R.string.account_setup_auto_config_status_header_title_configuration_found
}
},
),
text = stringResource(state.titleResourceId),
)
TextBody2(
text = stringResource(
when (state) {
AutoDiscoveryStatusHeaderState.NoSettings -> {
R.string.account_setup_auto_config_status_header_subtitle_configuration_not_found
}
AutoDiscoveryStatusHeaderState.Trusted -> {
R.string.account_setup_auto_config_status_header_subtitle_configuration_trusted
}
AutoDiscoveryStatusHeaderState.Untrusted -> {
R.string.account_setup_auto_config_status_header_subtitle_configuration_untrusted
}
},
),
text = stringResource(state.subtitleResourceId),
color = selectColor(state),
)
}
if (state != AutoDiscoveryStatusHeaderState.NoSettings) {
if (state.isExpandable) {
Icon(
imageVector = if (isExpanded) Icons.Outlined.expandLess else Icons.Outlined.expandMore,
modifier = Modifier.padding(MainTheme.spacings.default),