Card UI: Use M3 theme instead of M2

Bug: 228067197
Change-Id: If178b0aa3087ee6a8b6ee10c3340cefb14f4a728
pull/2/head
Caren Chang 4 years ago committed by Don Turner
parent a62d91f188
commit 132566dc40

@ -27,13 +27,13 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.MaterialTheme
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Bookmark import androidx.compose.material.icons.filled.Bookmark
import androidx.compose.material.icons.filled.BookmarkBorder import androidx.compose.material.icons.filled.BookmarkBorder
import androidx.compose.material.icons.filled.Person import androidx.compose.material.icons.filled.Person
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconToggleButton import androidx.compose.material3.IconToggleButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -148,14 +148,14 @@ fun NewsResourceAuthors(
} else { } else {
Icon( Icon(
modifier = authorImageModifier modifier = authorImageModifier
.background(MaterialTheme.colors.background) .background(MaterialTheme.colorScheme.surface)
.padding(4.dp), .padding(4.dp),
imageVector = Icons.Filled.Person, imageVector = Icons.Filled.Person,
contentDescription = null // decorative image contentDescription = null // decorative image
) )
} }
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))
Text(authorNameFormatted, style = MaterialTheme.typography.body2) Text(authorNameFormatted, style = MaterialTheme.typography.labelSmall)
} }
} }
} }
@ -165,7 +165,7 @@ fun NewsResourceTitle(
newsResourceTitle: String, newsResourceTitle: String,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
Text(newsResourceTitle, style = MaterialTheme.typography.h4, modifier = modifier) Text(newsResourceTitle, style = MaterialTheme.typography.headlineSmall, modifier = modifier)
} }
@Composable @Composable
@ -217,7 +217,7 @@ private fun dateFormatted(publishDate: Instant): String {
fun NewsResourceDate( fun NewsResourceDate(
publishDate: Instant publishDate: Instant
) { ) {
Text(dateFormatted(publishDate), style = MaterialTheme.typography.body2) Text(dateFormatted(publishDate), style = MaterialTheme.typography.labelSmall)
} }
@Composable @Composable
@ -231,7 +231,7 @@ fun NewsResourceLink(
fun NewsResourceShortDescription( fun NewsResourceShortDescription(
newsResourceShortDescription: String newsResourceShortDescription: String
) { ) {
Text(newsResourceShortDescription, style = MaterialTheme.typography.body1) Text(newsResourceShortDescription, style = MaterialTheme.typography.bodyLarge)
} }
@Composable @Composable

Loading…
Cancel
Save