diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 71278c81..2b24c14a 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -3,7 +3,7 @@ package dev.msfjarvis.lobsters.ui.posts import androidx.compose.animation.Crossfade import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background -import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.requiredWidth import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.IconButton import androidx.compose.material.IconToggleButton import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface @@ -59,27 +60,35 @@ fun LobstersItem( ) { Surface( modifier = Modifier - .combinedClickable( - onClick = onClick, - onLongClick = onLongClick, - ), + .clickable { onClick.invoke() }, ) { Row( - modifier = Modifier.padding(start = 12.dp, end = 24.dp), + modifier = Modifier.padding(start = 12.dp, end = 12.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, ) { Box( - modifier = Modifier.weight(1f), + modifier = Modifier.weight(0.8f), ) { PostDetails( post, ) } - SaveButton( - isSaved, - onSaveButtonClick, - ) + Box( + modifier = Modifier.weight(0.1f), + ) { + SaveButton( + isSaved, + onSaveButtonClick, + ) + } + Box( + modifier = Modifier.weight(0.1f), + ) { + CommentsButton( + onClick = onLongClick, + ) + } } } } @@ -148,6 +157,23 @@ fun SaveButton( } } +@Composable +fun CommentsButton( + onClick: () -> Unit, +) { + IconButton( + onClick = onClick, + modifier = Modifier + .requiredSize(24.dp), + ) { + IconResource( + resourceId = R.drawable.ic_insert_comment_24px, + tint = MaterialTheme.colors.secondary, + contentDescription = stringResource(R.string.open_comments), + ) + } +} + @Composable fun TagRow( tags: List, diff --git a/app/src/main/res/drawable/ic_insert_comment_24px.xml b/app/src/main/res/drawable/ic_insert_comment_24px.xml new file mode 100644 index 00000000..c8057e91 --- /dev/null +++ b/app/src/main/res/drawable/ic_insert_comment_24px.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c6140868..75e20d9d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,4 +9,5 @@ Add to saved posts Remove from saved posts Refresh posts + Open comments