Skip to content

Fix invisible sparkle on welcome and sign-up screens in light mode #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dadachi merged 1 commit into from
May 4, 2026
+14 −6
Merged

Fix invisible sparkle on welcome and sign-up screens in light mode #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions ...src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/OnboardingView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
Expand All @@ -38,8 +39,11 @@ import com.nativeapptemplate.nativeapptemplatefree.ui.common.NonScaledSp.nonScal
internal fun OnboardingView(
onStartClick: () -> Unit,
) {
val brandNavy = colorResource(R.color.ic_launcher_background)

Scaffold(
topBar = { TopAppBar(onStartClick) },
topBar = { TopAppBar(onStartClick, brandNavy) },
containerColor = brandNavy,
modifier = Modifier.fillMaxSize(),
) { padding ->
Column(
Expand All @@ -60,7 +64,7 @@ internal fun OnboardingView(
Spacer(Modifier.height(24.dp))
Text(
text = stringResource(R.string.welcome_to_app, stringResource(R.string.app_name)),
color = MaterialTheme.colorScheme.onBackground,
color = Color.White,
fontSize = 34.sp.nonScaledSp,
lineHeight = 41.sp.nonScaledSp,
fontWeight = FontWeight.Bold,
Expand All @@ -76,13 +80,16 @@ internal fun OnboardingView(
@Composable
private fun TopAppBar(
onStartClick: () -> Unit,
containerColor: Color,
) {
val context = LocalContext.current

CenterAlignedTopAppBar(
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.primaryContainer,
titleContentColor = MaterialTheme.colorScheme.primary,
containerColor = containerColor,
titleContentColor = Color.White,
navigationIconContentColor = Color.White,
actionIconContentColor = Color.White,
),
title = { Text("") },
actions = {
Expand All @@ -91,6 +98,7 @@ private fun TopAppBar(
) {
Text(
"Start",
color = Color.White,
style = MaterialTheme.typography.displaySmall,
)
}
Expand All @@ -101,6 +109,7 @@ private fun TopAppBar(
) {
Text(
stringResource(R.string.support_website),
color = Color.White,
)
}
},
Expand Down
3 changes: 1 addition & 2 deletions ...main/kotlin/com/nativeapptemplate/nativeapptemplatefree/ui/app_root/SignUpOrSignInView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.LinkAnnotation
Expand Down Expand Up @@ -76,7 +75,7 @@ internal fun SignUpOrSignInView(
Icon(
imageVector = Icons.Filled.AutoAwesome,
contentDescription = null,
tint = Color.White,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier
.fillMaxWidth()
.height(256.dp)
Expand Down
Loading