Skip to content

Commit aa4d930

Browse files
authored
Merge pull request #386 from android/jv/topic-colors
Tint topic icons to theme's primary color
2 parents 9fa3dad + b49086f commit aa4d930

File tree

3 files changed

+6
-0
lines changed
  • feature
    • foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou
    • interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests
    • topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic

3 files changed

+6
-0
lines changed

feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import androidx.compose.runtime.LaunchedEffect
5656
import androidx.compose.runtime.getValue
5757
import androidx.compose.ui.Alignment
5858
import androidx.compose.ui.Modifier
59+
import androidx.compose.ui.graphics.ColorFilter
5960
import androidx.compose.ui.layout.layout
6061
import androidx.compose.ui.platform.LocalDensity
6162
import androidx.compose.ui.platform.LocalView
@@ -383,6 +384,7 @@ fun TopicIcon(
383384
placeholder = painterResource(R.drawable.ic_icon_placeholder),
384385
model = imageUrl,
385386
contentDescription = null, // decorative
387+
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
386388
modifier = modifier
387389
.padding(10.dp)
388390
.size(32.dp)

feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import androidx.compose.material3.Text
3131
import androidx.compose.runtime.Composable
3232
import androidx.compose.ui.Alignment
3333
import androidx.compose.ui.Modifier
34+
import androidx.compose.ui.graphics.ColorFilter
3435
import androidx.compose.ui.res.stringResource
3536
import androidx.compose.ui.tooling.preview.Preview
3637
import androidx.compose.ui.unit.Dp
@@ -124,6 +125,7 @@ private fun InterestsIcon(topicImageUrl: String, modifier: Modifier = Modifier)
124125
AsyncImage(
125126
model = topicImageUrl,
126127
contentDescription = null,
128+
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
127129
modifier = modifier
128130
)
129131
}

feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import androidx.compose.runtime.Composable
3939
import androidx.compose.runtime.getValue
4040
import androidx.compose.ui.Alignment
4141
import androidx.compose.ui.Modifier
42+
import androidx.compose.ui.graphics.ColorFilter
4243
import androidx.compose.ui.res.stringResource
4344
import androidx.compose.ui.tooling.preview.Preview
4445
import androidx.compose.ui.unit.dp
@@ -156,6 +157,7 @@ private fun TopicHeader(name: String, description: String, imageUrl: String) {
156157
AsyncImage(
157158
model = imageUrl,
158159
contentDescription = null,
160+
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
159161
modifier = Modifier
160162
.align(Alignment.CenterHorizontally)
161163
.size(216.dp)

0 commit comments

Comments
 (0)