msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-15 01:47:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 4

common: integrate CommentTreeColors into comments UI

Browse source
This commit is contained in:
Harsh Shandilya 2021-10-04 17:49:10 +05:30
parent d56b887a21
commit 79faf01c17
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
2 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

34
common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt
View file

@ -1,10 +1,16 @@
package dev.msfjarvis.claw.common.comments package dev.msfjarvis.claw.common.comments
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material.Divider import androidx.compose.material.Divider
import androidx.compose.material.Surface import androidx.compose.material.Surface
import androidx.compose.material.Text import androidx.compose.material.Text
@ -41,12 +47,14 @@ fun CommentEntry(
) { ) {
val indentLevel = comment.indentLevel.toInt() - 1 val indentLevel = comment.indentLevel.toInt() - 1
val startPadding = ((10 * indentLevel) + 16).dp val startPadding = ((10 * indentLevel) + 16).dp
val text = parseHtml(comment.comment)
Divider(color = Color.Gray.copy(0.4f)) Divider(color = Color.Gray.copy(0.4f))
Row(modifier = Modifier.height(IntrinsicSize.Min)) {
Row(modifier = Modifier.padding(start = startPadding, end = 8.dp, top = 4.dp, bottom = 4.dp)) { CommentTreeColors(indentLevel = indentLevel)
val text = parseHtml(comment.comment) Column(
Column { modifier = Modifier.padding(start = startPadding, end = 8.dp, top = 4.dp, bottom = 4.dp)
) {
SubmitterName( SubmitterName(
text = "Submitted by ${comment.user.username}", text = "Submitted by ${comment.user.username}",
avatarUrl = "https://lobste.rs/${comment.user.avatarUrl}", avatarUrl = "https://lobste.rs/${comment.user.avatarUrl}",
@ -56,3 +64,21 @@ fun CommentEntry(
} }
} }
} }
@Composable
private fun CommentTreeColors(
indentLevel: Int,
modifier: Modifier = Modifier,
) {
Box(modifier = modifier) {
for (level in 1..indentLevel) {
Box(
modifier =
Modifier.padding(start = (level * 12).dp)
.fillMaxHeight()
.width(1.dp)
.background(CommentTreeColor[level])
)
}
}
}

2
common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentTreeColors.kt
View file

@ -24,7 +24,7 @@ object CommentTreeColor {
Color(0xFFFF0097), Color(0xFFFF0097),
Color(0xFF1E7145), Color(0xFF1E7145),
) )
private val size = colors.size val size = colors.size
operator fun get(idx: Int): Color = colors[idx % size] operator fun get(idx: Int): Color = colors[idx % size]
} }