Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add custom TextBadge() component #459

Merged
merged 11 commits into from
Jun 9, 2023
Merged

Add custom TextBadge() component #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
21df324
Change badge component from Badge to Box
mxmvncnt Jun 8, 2023
e89a7cb
Fix formatting
mxmvncnt Jun 8, 2023
183913d
Merge branch 'main' into Change-badge-radius
mxmvncnt Jun 8, 2023
b22b4f3
refactor: create TextBadge component
mxmvncnt Jun 8, 2023
4522b98
Modify attributes for TextBadge
mxmvncnt Jun 8, 2023
180467b
gradle kotlin formatting
mxmvncnt Jun 8, 2023
f9222a2
Add section in settings to edit TextBadge corner radius
mxmvncnt Jun 8, 2023
1425c7d
kotlin formatting
mxmvncnt Jun 8, 2023
0d4685f
Revert "kotlin formatting"
mxmvncnt Jun 9, 2023
da3e5d5
Revert "Add section in settings to edit TextBadge corner radius"
mxmvncnt Jun 9, 2023
8f9737c
Merge branch 'main' into Change-badge-radius
twizmwazin Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions app/src/main/java/com/jerboa/ui/components/common/TextBadge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.jerboa.ui.components.common

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp

@Composable
fun TextBadge(
text: String,
verticalTextPadding: Float = 0f,
horizontalTextPadding: Float = 6f,
textColor: Color = MaterialTheme.colorScheme.onTertiary,
textStyle: TextStyle,
containerColor: Color = MaterialTheme.colorScheme.tertiary,
containerRadius: Float = 4f,
) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(containerRadius.dp))
.background(containerColor),
) {
Text(
text = text,
style = textStyle,
overflow = TextOverflow.Clip,
maxLines = 1,
color = textColor,
modifier = Modifier
.padding(horizontalTextPadding.dp, verticalTextPadding.dp),
)
}
}
13 changes: 2 additions & 11 deletions app/src/main/java/com/jerboa/ui/components/person/PersonProfileLink.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.*
import androidx.compose.material3.Badge
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand All @@ -22,6 +21,7 @@ import com.jerboa.datatypes.PersonSafe
import com.jerboa.datatypes.samplePersonSafe
import com.jerboa.personNameShown
import com.jerboa.ui.components.common.CircularIcon
import com.jerboa.ui.components.common.TextBadge
import com.jerboa.ui.theme.SMALL_PADDING

@Composable
Expand All @@ -34,16 +34,7 @@ fun PersonName(
val style = MaterialTheme.typography.bodyMedium

if (isPostCreator) {
Badge(
containerColor = MaterialTheme.colorScheme.tertiary,
) {
Text(
text = name,
style = style,
overflow = TextOverflow.Clip,
maxLines = 1,
)
}
TextBadge(text = name, textStyle = style)
} else {
Text(
text = name,
Expand Down