Move time ago and score to a flowrow layout #1615
+1,944
−1,939
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,310 @@ | ||
| package com.jerboa.ui.components.post | ||
|
|
||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.ExperimentalLayoutApi | ||
| import androidx.compose.foundation.layout.FlowRow | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.alpha | ||
| import androidx.compose.ui.platform.testTag | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.TextStyle | ||
| import androidx.compose.ui.text.font.FontFamily | ||
| import androidx.compose.ui.text.font.FontStyle | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.Dp | ||
| import androidx.compose.ui.unit.dp | ||
| import com.jerboa.JerboaAppState | ||
| import com.jerboa.R | ||
| import com.jerboa.datatypes.sampleInstantScores | ||
| import com.jerboa.datatypes.samplePostView | ||
| import com.jerboa.db.entity.Account | ||
| import com.jerboa.db.entity.AnonAccount | ||
| import com.jerboa.feat.BlurNSFW | ||
| import com.jerboa.feat.InstantScores | ||
| import com.jerboa.feat.VoteType | ||
| import com.jerboa.feat.default | ||
| import com.jerboa.feat.needBlur | ||
| import com.jerboa.hostNameCleaned | ||
| import com.jerboa.isSameInstance | ||
| import com.jerboa.nsfwCheck | ||
| import com.jerboa.rememberJerboaAppState | ||
| import com.jerboa.ui.components.common.DotSpacer | ||
| import com.jerboa.ui.components.common.NsfwBadge | ||
| import com.jerboa.ui.components.common.TimeAgo | ||
| import com.jerboa.ui.components.common.VoteGeneric | ||
| import com.jerboa.ui.components.common.scoreColor | ||
| import com.jerboa.ui.components.community.CommunityLink | ||
| import com.jerboa.ui.components.person.PersonProfileLink | ||
| import com.jerboa.ui.theme.MEDIUM_PADDING | ||
| import com.jerboa.ui.theme.SMALLER_PADDING | ||
| import com.jerboa.ui.theme.SMALL_PADDING | ||
| import it.vercruysse.lemmyapi.datatypes.LocalUserVoteDisplayMode | ||
| import it.vercruysse.lemmyapi.datatypes.PostView | ||
|
|
||
| @OptIn(ExperimentalLayoutApi::class) | ||
| @Composable | ||
| fun PostListingList( | ||
| postView: PostView, | ||
| instantScores: InstantScores, | ||
| onUpvoteClick: () -> Unit, | ||
| onDownvoteClick: () -> Unit, | ||
| onPostClick: (postView: PostView) -> Unit, | ||
| showCommunityName: Boolean = true, | ||
| account: Account, | ||
| showVotingArrowsInListView: Boolean, | ||
| useCustomTabs: Boolean, | ||
| usePrivateTabs: Boolean, | ||
| blurNSFW: BlurNSFW, | ||
| appState: JerboaAppState, | ||
| showIfRead: Boolean, | ||
| enableDownVotes: Boolean, | ||
| voteDisplayMode: LocalUserVoteDisplayMode, | ||
| ) { | ||
| Column( | ||
| modifier = | ||
| Modifier | ||
| .padding( | ||
| horizontal = MEDIUM_PADDING, | ||
| vertical = MEDIUM_PADDING, | ||
| ).testTag("jerboa:post"), | ||
| ) { | ||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = | ||
| Arrangement.spacedBy( | ||
| SMALL_PADDING, | ||
| ), | ||
| ) { | ||
| if (showVotingArrowsInListView) { | ||
| PostVotingTile( | ||
| instantScores = instantScores, | ||
| onUpvoteClick = onUpvoteClick, | ||
| onDownvoteClick = onDownvoteClick, | ||
| account = account, | ||
| enableDownVotes = enableDownVotes, | ||
| voteDisplayMode = voteDisplayMode, | ||
| ) | ||
| } | ||
| Column( | ||
| modifier = | ||
| Modifier | ||
| .weight(1f) | ||
| .clickable { onPostClick(postView) }, | ||
| verticalArrangement = Arrangement.spacedBy(SMALL_PADDING), | ||
| ) { | ||
| PostName(post = postView.post, read = postView.read, showIfRead = showIfRead) | ||
| FlowRow( | ||
| horizontalArrangement = Arrangement.spacedBy(SMALLER_PADDING, Alignment.Start), | ||
| ) { | ||
| // You must use a center align modifier for each of these | ||
| val centerMod = Modifier.align(Alignment.CenterVertically) | ||
| if (showCommunityName) { | ||
| CommunityLink( | ||
| community = postView.community, | ||
| onClick = {}, | ||
| clickable = false, | ||
| showDefaultIcon = false, | ||
| showAvatar = false, | ||
| blurNSFW = blurNSFW, | ||
| modifier = centerMod, | ||
| ) | ||
| DotSpacer(modifier = centerMod) | ||
| } | ||
| PersonProfileLink( | ||
| person = postView.creator, | ||
| onClick = {}, | ||
| clickable = false, | ||
| color = MaterialTheme.colorScheme.outline, | ||
| showAvatar = false, | ||
| modifier = centerMod, | ||
| ) | ||
| DotSpacer(modifier = centerMod) | ||
| postView.post.url?.also { postUrl -> | ||
| if (!isSameInstance(postUrl, account.instance)) { | ||
| val hostName = hostNameCleaned(postUrl) | ||
| hostName?.also { | ||
| Text( | ||
| text = it, | ||
| color = MaterialTheme.colorScheme.outline, | ||
| style = MaterialTheme.typography.labelMedium, | ||
| fontFamily = FontFamily.Monospace, | ||
| modifier = centerMod, | ||
| ) | ||
| DotSpacer(modifier = centerMod) | ||
| } | ||
| } | ||
| } | ||
| TimeAgo( | ||
| published = postView.post.published, | ||
| updated = postView.post.updated, | ||
| modifier = centerMod, | ||
| ) | ||
| } | ||
| Row( | ||
| horizontalArrangement = Arrangement.spacedBy(SMALLER_PADDING), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| if (!showVotingArrowsInListView) { | ||
| Text( | ||
| text = instantScores.score.toString(), | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| color = scoreColor(myVote = instantScores.myVote), | ||
| ) | ||
| DotSpacer() | ||
| } | ||
| Text( | ||
| text = | ||
| stringResource( | ||
| R.string.post_listing_comments_count, | ||
| postView.counts.comments, | ||
| ), | ||
| style = MaterialTheme.typography.labelMedium, | ||
| color = MaterialTheme.colorScheme.outline, | ||
| ) | ||
| CommentNewCount( | ||
| comments = postView.counts.comments, | ||
| unreadCount = postView.unread_comments, | ||
| style = MaterialTheme.typography.labelMedium, | ||
| ) | ||
| NsfwBadge(nsfwCheck(postView)) | ||
| } | ||
| } | ||
| ThumbnailTile( | ||
| post = postView.post, | ||
| useCustomTabs = useCustomTabs, | ||
| usePrivateTabs = usePrivateTabs, | ||
| blurEnabled = blurNSFW.needBlur(postView), | ||
| appState = appState, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun PostListingListPreview() { | ||
| PostListingList( | ||
| postView = samplePostView, | ||
| instantScores = sampleInstantScores, | ||
| onUpvoteClick = {}, | ||
| onDownvoteClick = {}, | ||
| onPostClick = {}, | ||
| account = AnonAccount, | ||
| showVotingArrowsInListView = true, | ||
| useCustomTabs = false, | ||
| usePrivateTabs = false, | ||
| blurNSFW = BlurNSFW.NSFW, | ||
| appState = rememberJerboaAppState(), | ||
| showIfRead = true, | ||
| enableDownVotes = false, | ||
| voteDisplayMode = LocalUserVoteDisplayMode.default(), | ||
| ) | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun PostListingListWithThumbPreview() { | ||
| PostListingList( | ||
| postView = samplePostView, | ||
| instantScores = sampleInstantScores, | ||
| onUpvoteClick = {}, | ||
| onDownvoteClick = {}, | ||
| onPostClick = {}, | ||
| account = AnonAccount, | ||
| showVotingArrowsInListView = true, | ||
| useCustomTabs = false, | ||
| usePrivateTabs = false, | ||
| blurNSFW = BlurNSFW.NSFW, | ||
| appState = rememberJerboaAppState(), | ||
| showIfRead = true, | ||
| enableDownVotes = false, | ||
| voteDisplayMode = LocalUserVoteDisplayMode.default(), | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| fun CommentNewCount( | ||
| comments: Long, | ||
| unreadCount: Long, | ||
| style: TextStyle = MaterialTheme.typography.labelSmall.copy(fontStyle = FontStyle.Italic), | ||
| spacing: Dp = 0.dp, | ||
| ) { | ||
| val unread = | ||
| if (unreadCount == 0L || comments == unreadCount) { | ||
| null | ||
| } else { | ||
| unreadCount | ||
| } | ||
| if (unread != null) { | ||
| Spacer(Modifier.padding(horizontal = spacing)) | ||
|
|
||
| Text( | ||
| text = stringResource(R.string.post_listing_new, unread), | ||
| style = style, | ||
| color = MaterialTheme.colorScheme.outline, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun PostVotingTile( | ||
| instantScores: InstantScores, | ||
| onUpvoteClick: () -> Unit, | ||
| onDownvoteClick: () -> Unit, | ||
| account: Account, | ||
| enableDownVotes: Boolean, | ||
| voteDisplayMode: LocalUserVoteDisplayMode, | ||
| ) { | ||
| Column( | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.spacedBy(SMALL_PADDING), | ||
| modifier = | ||
| Modifier | ||
| .fillMaxHeight() | ||
| .padding(end = MEDIUM_PADDING), | ||
| ) { | ||
| VoteGeneric( | ||
| myVote = instantScores.myVote, | ||
| type = VoteType.Upvote, | ||
| onVoteClick = onUpvoteClick, | ||
| account = account, | ||
| ) | ||
|
|
||
| val scoreOrPctStr = instantScores.scoreOrPctStr(voteDisplayMode) | ||
|
|
||
| Text( | ||
| text = scoreOrPctStr ?: "", | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| color = scoreColor(myVote = instantScores.myVote), | ||
| // Hide the vote number if its | ||
| modifier = Modifier.alpha(if (scoreOrPctStr != null) 1f else 0f), | ||
| ) | ||
|
|
||
| if (enableDownVotes) { | ||
| // invisible Text below aligns width of PostVotingTiles | ||
| Text( | ||
| text = "00000", | ||
| modifier = Modifier.height(0.dp), | ||
| style = MaterialTheme.typography.bodyMedium, | ||
| ) | ||
| VoteGeneric( | ||
| myVote = instantScores.myVote, | ||
| type = VoteType.Downvote, | ||
| onVoteClick = onDownvoteClick, | ||
| account = account, | ||
| ) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Moved this as its only used here.