From 81cdb477143d6d9cfad0abe64f8aedff6b43fff8 Mon Sep 17 00:00:00 2001 From: Jolanda Verhoef Date: Tue, 11 Oct 2022 23:39:10 +0200 Subject: [PATCH] Tint topic icons to theme's primary color --- .../samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt | 2 ++ .../apps/nowinandroid/feature/interests/InterestsItem.kt | 2 ++ .../samples/apps/nowinandroid/feature/topic/TopicScreen.kt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt index bcff09fae..afc131eda 100644 --- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt +++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt @@ -56,6 +56,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.layout import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalView @@ -383,6 +384,7 @@ fun TopicIcon( placeholder = painterResource(R.drawable.ic_icon_placeholder), model = imageUrl, contentDescription = null, // decorative + colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary), modifier = modifier .padding(10.dp) .size(32.dp) diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt index 61959a748..3cfbea53e 100644 --- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt +++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt @@ -31,6 +31,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp @@ -124,6 +125,7 @@ private fun InterestsIcon(topicImageUrl: String, modifier: Modifier = Modifier) AsyncImage( model = topicImageUrl, contentDescription = null, + colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary), modifier = modifier ) } diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt index 58c572ade..bbbde18ae 100644 --- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt +++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt @@ -41,6 +41,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -156,6 +157,7 @@ private fun TopicHeader(name: String, description: String, imageUrl: String) { AsyncImage( model = imageUrl, contentDescription = null, + colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary), modifier = Modifier .align(Alignment.CenterHorizontally) .size(216.dp)