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

feat: design for role chips 

Signed-off-by: Infi <wingit@geist.ga>
This commit is contained in:
Infi 2023-06-18 15:53:07 +02:00
parent d26953dc23
commit 6a520eb138
2 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/chat/revolt/components/chat/RoleChip.kt Normal file
View File

@ -0,0 +1,40 @@
package chat.revolt.components.chat
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.LocalTextStyle
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.Brush
import androidx.compose.ui.unit.dp
@Composable
fun RoleChip(
label: String,
brush: Brush,
modifier: Modifier = Modifier,
) {
Box(
modifier = modifier
.clip(MaterialTheme.shapes.small)
.background(
brush = brush,
)
.background(
// darken the background a bit
color = MaterialTheme.colorScheme.background.copy(alpha = 0.8f)
)
.padding(vertical = 6.dp, horizontal = 8.dp)
) {
Text(
text = label,
style = LocalTextStyle.current.copy(
brush = brush
)
)
}
}

29
app/src/main/java/chat/revolt/sheets/UserContextSheet.kt
View File

@ -1,7 +1,5 @@
package chat.revolt.sheets package chat.revolt.sheets
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -13,7 +11,6 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalContentColor
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -34,6 +31,7 @@ import chat.revolt.api.internals.WebCompat
import chat.revolt.api.internals.solidColor import chat.revolt.api.internals.solidColor
import chat.revolt.api.routes.user.fetchUserProfile import chat.revolt.api.routes.user.fetchUserProfile
import chat.revolt.api.schemas.Profile import chat.revolt.api.schemas.Profile
import chat.revolt.components.chat.RoleChip
import chat.revolt.components.generic.UIMarkdown import chat.revolt.components.generic.UIMarkdown
import chat.revolt.components.screens.settings.RawUserOverview import chat.revolt.components.screens.settings.RawUserOverview
@ -89,26 +87,11 @@ fun UserContextSheet(
it.forEach { roleId -> it.forEach { roleId ->
val role = server?.roles?.get(roleId) val role = server?.roles?.get(roleId)
role?.let { role?.let {
Box( RoleChip(
modifier = Modifier label = role.name ?: roleId,
.border( brush = role.colour?.let { WebCompat.parseColour(it) }
border = BorderStroke( ?: Brush.solidColor(LocalContentColor.current)
width = 1.dp, )
brush = role.colour?.let { WebCompat.parseColour(it) }
?: Brush.solidColor(LocalContentColor.current),
),
shape = MaterialTheme.shapes.small
)
.padding(8.dp)
) {
Text(
text = role.name ?: roleId,
style = LocalTextStyle.current.copy(
brush = role.colour?.let { WebCompat.parseColour(it) }
?: Brush.solidColor(LocalContentColor.current)
)
)
}
} }
} }
} }