fix(common): simplify favicon display

This commit is contained in:
Harsh Shandilya 2022-12-09 18:18:02 +05:30
parent a2f3faad0f
commit d36bcd6b26
No known key found for this signature in database
2 changed files with 7 additions and 19 deletions

View file

@ -20,9 +20,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme 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
@ -33,7 +31,6 @@ import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.buildAnnotatedString
@ -115,21 +112,12 @@ fun PostLink(
) )
) { ) {
Row(modifier = Modifier.padding(16.dp), horizontalArrangement = Arrangement.spacedBy(16.dp)) { Row(modifier = Modifier.padding(16.dp), horizontalArrangement = Arrangement.spacedBy(16.dp)) {
if (linkMetadata.faviconUrl != null) {
NetworkImage( NetworkImage(
url = linkMetadata.faviconUrl!!, url = linkMetadata.faviconUrl,
placeholder = ClawIcons.Web, placeholder = ClawIcons.Web,
contentDescription = "", contentDescription = "",
modifier = Modifier.size(24.dp), modifier = Modifier.size(24.dp),
) )
} else {
Icon(
painter = ClawIcons.Web,
contentDescription = null,
tint = MaterialTheme.colorScheme.onSecondary,
modifier = Modifier.clip(CircleShape),
)
}
Text( Text(
text = linkMetadata.url, text = linkMetadata.url,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,

View file

@ -13,7 +13,7 @@ import coil.compose.AsyncImage
@Composable @Composable
fun NetworkImage( fun NetworkImage(
url: String, url: String?,
placeholder: Painter, placeholder: Painter,
contentDescription: String, contentDescription: String,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,