diff --git a/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_k9_logo.xml b/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_k9_logo.xml
index fb570ed1f..2637f9700 100644
--- a/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_k9_logo.xml
+++ b/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_k9_logo.xml
@@ -1,104 +1,151 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_thunderbird_logo.xml b/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_thunderbird_logo.xml
index 71399c54d..24f06c976 100644
--- a/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_thunderbird_logo.xml
+++ b/core/ui/compose/theme/src/main/res/drawable/core_ui_theme_thunderbird_logo.xml
@@ -1,104 +1,150 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/AppTitleTopHeader.kt b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/AppTitleTopHeader.kt
index ad0818602..bc78c4838 100644
--- a/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/AppTitleTopHeader.kt
+++ b/feature/account/common/src/main/kotlin/app/k9mail/feature/account/common/ui/AppTitleTopHeader.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@@ -15,12 +16,15 @@ import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
import app.k9mail.core.ui.compose.designsystem.atom.text.TextHeadline2
import app.k9mail.core.ui.compose.designsystem.template.ResponsiveWidthContainer
import app.k9mail.core.ui.compose.theme.MainTheme
import app.k9mail.core.ui.compose.theme.PreviewWithThemes
import app.k9mail.feature.account.common.R
+private const val TITLE_ICON_SIZE_DP = 56
+
@Composable
fun AppTitleTopHeader(
modifier: Modifier = Modifier,
@@ -48,6 +52,10 @@ fun AppTitleTopHeader(
) {
Image(
painter = painterResource(id = MainTheme.images.logo),
+ modifier = Modifier
+ .padding(all = MainTheme.spacings.default)
+ .padding(end = MainTheme.spacings.default)
+ .size(TITLE_ICON_SIZE_DP.dp),
contentDescription = null,
)
diff --git a/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt b/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt
index 30aeb177e..81ea32599 100644
--- a/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt
+++ b/feature/onboarding/welcome/src/main/kotlin/app/k9mail/feature/onboarding/welcome/ui/WelcomeContent.kt
@@ -1,17 +1,24 @@
package app.k9mail.feature.onboarding.welcome.ui
import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
import app.k9mail.core.ui.compose.common.annotation.PreviewDevices
import app.k9mail.core.ui.compose.designsystem.atom.Background
import app.k9mail.core.ui.compose.designsystem.atom.button.Button
@@ -25,6 +32,10 @@ import app.k9mail.core.ui.compose.theme.MainTheme
import app.k9mail.core.ui.compose.theme.ThunderbirdTheme
import app.k9mail.feature.onboarding.welcome.R
+private const val CIRCLE_COLOR = 0xFFEEEEEE
+private const val CIRCLE_SIZE_DP = 300
+private const val LOGO_SIZE_DP = 200
+
@Composable
internal fun WelcomeContent(
onStartClick: () -> Unit,
@@ -75,13 +86,23 @@ private fun WelcomeLogo(
modifier: Modifier = Modifier,
) {
Column(
- modifier = Modifier.then(modifier),
+ modifier = modifier,
horizontalAlignment = Alignment.CenterHorizontally,
) {
- Image(
- painter = painterResource(id = R.drawable.onboarding_welcome_logo),
- contentDescription = null,
- )
+ Box(
+ modifier = Modifier
+ .clip(CircleShape)
+ .background(Color(CIRCLE_COLOR))
+ .size(CIRCLE_SIZE_DP.dp),
+ ) {
+ Image(
+ painter = painterResource(id = MainTheme.images.logo),
+ contentDescription = null,
+ modifier = Modifier
+ .size(LOGO_SIZE_DP.dp)
+ .align(Alignment.Center),
+ )
+ }
}
}
diff --git a/feature/onboarding/welcome/src/main/res/drawable/onboarding_welcome_logo.xml b/feature/onboarding/welcome/src/main/res/drawable/onboarding_welcome_logo.xml
deleted file mode 100644
index 1e2a8735f..000000000
--- a/feature/onboarding/welcome/src/main/res/drawable/onboarding_welcome_logo.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-