@@ -21,17 +21,17 @@ import androidx.compose.ui.text.buildAnnotatedString
2121import androidx.compose.ui.text.font.FontWeight
2222import androidx.compose.ui.text.withLink
2323import androidx.compose.ui.text.withStyle
24- import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonDefaults
25- import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonFilled
26- import app.k9mail.core.ui.compose.designsystem.atom.button.ButtonOutlined
27- import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodySmall
28- import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleLarge
29- import app.k9mail.core.ui.compose.designsystem.atom.text.TextTitleSmall
30- import app.k9mail.core.ui.compose.designsystem.template.ResponsiveWidthContainer
31- import app.k9mail.core.ui.compose.designsystem.template.Scaffold
3224import app.k9mail.feature.account.common.ui.AppTitleTopHeader
33- import net.thunderbird.core.ui.compose.designsystem.atom.icon.Icons
34- import net.thunderbird.core.ui.compose.theme2.MainTheme
25+ import net.thunderbird.components.ui.bolt.atom.button.ButtonDefaults
26+ import net.thunderbird.components.ui.bolt.atom.button.ButtonFilled
27+ import net.thunderbird.components.ui.bolt.atom.button.ButtonOutlined
28+ import net.thunderbird.components.ui.bolt.atom.icon.Icons
29+ import net.thunderbird.components.ui.bolt.atom.text.TextBodySmall
30+ import net.thunderbird.components.ui.bolt.atom.text.TextTitleLarge
31+ import net.thunderbird.components.ui.bolt.atom.text.TextTitleSmall
32+ import net.thunderbird.components.ui.bolt.template.ResponsiveWidthContainer
33+ import net.thunderbird.components.ui.bolt.template.Scaffold
34+ import net.thunderbird.components.ui.bolt.theme.BoltTheme
3535import net.thunderbird.feature.thundermail.internal.common.R
3636import net.thunderbird.feature.thundermail.R as ThundermailApiR
3737
@@ -57,17 +57,17 @@ fun ThundermailAddAccountScreen(
5757 // doubling up the insets and collapsing the header on very wide windows (e.g. tablet,
5858 // desktop, etc).
5959 AppTitleTopHeader (title = appTitle) {
60- Spacer (modifier = Modifier .height(MainTheme .spacings.triple))
60+ Spacer (modifier = Modifier .height(BoltTheme .spacings.triple))
6161 TextTitleLarge (
6262 text = stringResource(R .string.thundermail_add_account),
63- color = MainTheme .colors.primary,
63+ color = BoltTheme .colors.primary,
6464 modifier = Modifier .padding(
65- start = MainTheme .spacings.default,
66- end = MainTheme .spacings.quadruple,
65+ start = BoltTheme .spacings.default,
66+ end = BoltTheme .spacings.quadruple,
6767 ),
6868 )
6969 }
70- Spacer (modifier = Modifier .height(MainTheme .spacings.quadruple + MainTheme .spacings.double))
70+ Spacer (modifier = Modifier .height(BoltTheme .spacings.quadruple + BoltTheme .spacings.double))
7171 ButtonsPanel (
7272 onAddAccountClick = onAddAccountClick,
7373 onSignInWithThundermail = onSignInWithThundermail,
@@ -87,7 +87,7 @@ private fun ButtonsPanel(
8787 modifier : Modifier = Modifier ,
8888) {
8989 Column (
90- verticalArrangement = Arrangement .spacedBy(MainTheme .spacings.double),
90+ verticalArrangement = Arrangement .spacedBy(BoltTheme .spacings.double),
9191 horizontalAlignment = Alignment .CenterHorizontally ,
9292 modifier = modifier,
9393 ) {
@@ -107,8 +107,8 @@ private fun ButtonsPanel(
107107 onClick = onSignInWithThundermail,
108108 icon = Icons .Filled .Thundermail ,
109109 colors = ButtonDefaults .outlinedButtonColors(
110- iconColor = MainTheme .colors.primary,
111- contentColor = MainTheme .colors.primary,
110+ iconColor = BoltTheme .colors.primary,
111+ contentColor = BoltTheme .colors.primary,
112112 ),
113113 )
114114 TextBodySmall (
0 commit comments