fix(android): swap <bitmap> launcher foreground for raster in Onboarding + AuthLogoMark (fixes O-ONBOARD-001); polish BucketList add-FAB
This commit is contained in:
parent
2d77786254
commit
5a86b462c4
|
|
@ -76,7 +76,10 @@ internal fun AuthLogoMark(
|
||||||
modifier = Modifier.matchParentSize()
|
modifier = Modifier.matchParentSize()
|
||||||
)
|
)
|
||||||
Image(
|
Image(
|
||||||
painter = painterResource(R.drawable.ic_launcher_foreground),
|
// Raster foreground directly — R.drawable.ic_launcher_foreground is a <bitmap> XML
|
||||||
|
// (334cb07 icon redesign) and painterResource only loads <vector> XML or raster files,
|
||||||
|
// so the <bitmap> root crashes. Same fix as OnboardingScreen's CtaSlide.
|
||||||
|
painter = painterResource(R.drawable.closer_launcher_foreground),
|
||||||
contentDescription = "Closer",
|
contentDescription = "Closer",
|
||||||
contentScale = ContentScale.Fit,
|
contentScale = ContentScale.Fit,
|
||||||
modifier = Modifier.matchParentSize()
|
modifier = Modifier.matchParentSize()
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,6 @@ import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.geometry.Offset
|
import androidx.compose.ui.geometry.Offset
|
||||||
import androidx.compose.ui.graphics.Brush
|
import androidx.compose.ui.graphics.Brush
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.style.TextOverflow
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
|
|
@ -134,7 +133,7 @@ private fun BucketListContent(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(20.dp)
|
.padding(20.dp)
|
||||||
.align(Alignment.BottomEnd),
|
.align(Alignment.BottomEnd),
|
||||||
containerColor = Color(0xFFB98AF4),
|
containerColor = MaterialTheme.colorScheme.primary,
|
||||||
contentColor = MaterialTheme.colorScheme.onPrimary
|
contentColor = MaterialTheme.colorScheme.onPrimary
|
||||||
) {
|
) {
|
||||||
Text(text = "+", style = MaterialTheme.typography.titleLarge)
|
Text(text = "+", style = MaterialTheme.typography.titleLarge)
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,11 @@ private fun CtaSlide(onNavigate: (String) -> Unit) {
|
||||||
modifier = Modifier.matchParentSize()
|
modifier = Modifier.matchParentSize()
|
||||||
)
|
)
|
||||||
Image(
|
Image(
|
||||||
painter = painterResource(R.drawable.ic_launcher_foreground),
|
// Use the raster foreground directly: R.drawable.ic_launcher_foreground is a
|
||||||
|
// <bitmap> XML (since the 334cb07 icon redesign) and Compose's painterResource
|
||||||
|
// routes any .xml drawable through the VectorDrawable loader, which throws on a
|
||||||
|
// <bitmap> root ("Only VectorDrawables and rasterized asset types are supported").
|
||||||
|
painter = painterResource(R.drawable.closer_launcher_foreground),
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
contentScale = ContentScale.Fit,
|
contentScale = ContentScale.Fit,
|
||||||
modifier = Modifier.matchParentSize()
|
modifier = Modifier.matchParentSize()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue