diff --git a/app/src/main/java/com/aurora/store/compose/composable/Info.kt b/app/src/main/java/com/aurora/store/compose/composable/Info.kt index 38e357145..12de22f8f 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/Info.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/Info.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material3.Icon -import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -38,7 +37,7 @@ import com.aurora.store.compose.preview.AppPreviewProvider * @param title Title of the information * @param description Information to show * @param painter Optional painter to draw the icon - * @param tint Optional tint color for the icon + * @param titleColor Optional color for the title * @param onClick Callback when this composable is clicked */ @Composable @@ -47,7 +46,7 @@ fun Info( title: AnnotatedString, description: AnnotatedString? = null, painter: Painter? = null, - tint: Color = LocalContentColor.current, + titleColor: Color = Color.Unspecified, onClick: (() -> Unit)? = null ) { Row( @@ -61,13 +60,14 @@ fun Info( horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.margin_normal)), verticalAlignment = Alignment.CenterVertically ) { - if (painter != null) Icon(painter = painter, contentDescription = null, tint = tint) + if (painter != null) Icon(painter = painter, contentDescription = null) Column(modifier = Modifier.weight(1F)) { Text( text = title, style = MaterialTheme.typography.bodyMedium, maxLines = 1, overflow = TextOverflow.Ellipsis, + color = titleColor ) if (!description.isNullOrBlank()) { Text( diff --git a/app/src/main/java/com/aurora/store/compose/theme/Color.kt b/app/src/main/java/com/aurora/store/compose/theme/Color.kt index d856eacbb..8e2d709a6 100644 --- a/app/src/main/java/com/aurora/store/compose/theme/Color.kt +++ b/app/src/main/java/com/aurora/store/compose/theme/Color.kt @@ -7,5 +7,5 @@ package com.aurora.store.compose.theme import androidx.compose.ui.graphics.Color -val warningColor = Color(0xFFFFA000) // Amber +val warningColor = Color(0xFFFF7600) // Amber val successColor = Color(0xFF1B8738) // Green diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/components/Compatibility.kt b/app/src/main/java/com/aurora/store/compose/ui/details/components/Compatibility.kt index 74a7c55f9..3d5a70372 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/components/Compatibility.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/components/Compatibility.kt @@ -36,7 +36,7 @@ fun Compatibility(needsGms: Boolean, plexusScores: Scores? = null) { if (!needsGms) { Info( painter = painterResource(R.drawable.ic_menu_about), - tint = successColor, + titleColor = successColor, title = AnnotatedString( text = stringResource(R.string.details_compatibility_gms_not_required_title) ), @@ -51,7 +51,7 @@ fun Compatibility(needsGms: Boolean, plexusScores: Scores? = null) { Info( painter = painterResource(R.drawable.ic_menu_about), - tint = warningColor, + titleColor = warningColor, title = AnnotatedString( text = stringResource(R.string.details_compatibility_gms_required_title) ), diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/components/Privacy.kt b/app/src/main/java/com/aurora/store/compose/ui/details/components/Privacy.kt index f68ee9adc..3a7bdfab9 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/components/Privacy.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/components/Privacy.kt @@ -7,7 +7,6 @@ package com.aurora.store.compose.ui.details.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column -import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource @@ -47,7 +46,7 @@ fun Privacy(report: Report?, onNavigateToDetailsExodus: (() -> Unit)? = null) { Info( painter = painterResource(R.drawable.ic_visibility), - tint = when { + titleColor = when { report != null && report.trackers.isEmpty() -> successColor else -> warningColor },