RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(jbm): use rounded corners on new mention style 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2024-12-13 21:47:40 +01:00
parent d5c78b71d2
commit 3939d039fe
1 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
app/src/main/java/chat/revolt/markdown/jbm/JBMRenderer.kt
View File

@ -41,6 +41,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.geometry.RoundRect
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Path import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.drawscope.Stroke
@ -103,6 +104,8 @@ enum class JBMAnnotations(val tag: String, val clickable: Boolean) {
Timestamp("Timestamp", false), Timestamp("Timestamp", false),
Checkbox("Checkbox", false), Checkbox("Checkbox", false),
UserAvatar("UserAvatar", true), UserAvatar("UserAvatar", true),
JBMBackgroundRoundingStart("JBMBackgroundRoundingStart", false),
JBMBackgroundRoundingEnd("JBMBackgroundRoundingEnd", false),
} }
object JBMRegularExpressions { object JBMRegularExpressions {
@ -208,11 +211,11 @@ private fun annotateText(
?: RevoltAPI.userCache[userId]?.username ?: RevoltAPI.userCache[userId]?.username
?: "<@$userId>" ?: "<@$userId>"
append(" ") appendInlineContent(JBMAnnotations.JBMBackgroundRoundingStart.tag)
appendInlineContent(JBMAnnotations.UserAvatar.tag, userId) appendInlineContent(JBMAnnotations.UserAvatar.tag, userId)
append(" ") append(" ")
append(mentionDisplay) append(mentionDisplay)
append(" ") appendInlineContent(JBMAnnotations.JBMBackgroundRoundingEnd.tag)
pop() pop()
pop() pop()
@ -721,6 +724,74 @@ private fun JBMText(node: ASTNode, modifier: Modifier) {
} }
} }
} }
},
JBMAnnotations.JBMBackgroundRoundingStart.tag to with(LocalDensity.current) {
InlineTextContent(
placeholder = Placeholder(
width = LocalTextStyle.current.fontSize * 0.25,
height = LocalTextStyle.current.fontSize * 1.5,
placeholderVerticalAlign = PlaceholderVerticalAlign.Center
),
) {
val colour = LocalJBMarkdownTreeState.current.colors.clickableBackground
Canvas(
modifier = Modifier
.width((LocalTextStyle.current.fontSize * 0.25).toDp())
.height((LocalTextStyle.current.fontSize * 1.5).toDp())
) {
drawPath(
Path().apply {
addRoundRect(
RoundRect(
0f,
0f,
size.width,
size.height,
topLeftCornerRadius = CornerRadius(size.width),
topRightCornerRadius = CornerRadius(0f),
bottomLeftCornerRadius = CornerRadius(size.width),
bottomRightCornerRadius = CornerRadius(0f)
)
)
},
color = colour
)
}
}
},
JBMAnnotations.JBMBackgroundRoundingEnd.tag to with(LocalDensity.current) {
InlineTextContent(
placeholder = Placeholder(
width = LocalTextStyle.current.fontSize * 0.25,
height = LocalTextStyle.current.fontSize * 1.5,
placeholderVerticalAlign = PlaceholderVerticalAlign.Center
),
) {
val colour = LocalJBMarkdownTreeState.current.colors.clickableBackground
Canvas(
modifier = Modifier
.width((LocalTextStyle.current.fontSize * 0.25).toDp())
.height((LocalTextStyle.current.fontSize * 1.5).toDp())
) {
drawPath(
Path().apply {
addRoundRect(
RoundRect(
0f,
0f,
size.width,
size.height,
topLeftCornerRadius = CornerRadius(0f),
topRightCornerRadius = CornerRadius(size.width),
bottomLeftCornerRadius = CornerRadius(0f),
bottomRightCornerRadius = CornerRadius(size.width)
)
)
},
color = colour
)
}
}
} }
) )
) )