From 28bdc532a2b4678f1a98492116f848c107a52b75 Mon Sep 17 00:00:00 2001 From: Infi Date: Thu, 31 Oct 2024 22:08:22 +0100 Subject: [PATCH] feat: see status text in user sheet Signed-off-by: Infi --- .../chat/revolt/api/internals/SpecialUsers.kt | 31 +++++++------------ .../java/chat/revolt/sheets/UserInfoSheet.kt | 23 ++++++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt b/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt index 8cd16f30..5ca9eb88 100644 --- a/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt +++ b/app/src/main/java/chat/revolt/api/internals/SpecialUsers.kt @@ -6,6 +6,7 @@ import android.os.Build import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ShaderBrush +import androidx.compose.ui.graphics.SolidColor import org.intellij.lang.annotations.Language import androidx.compose.ui.graphics.Brush as AndroidBrush @@ -48,6 +49,17 @@ object SpecialUsers { end = Offset.Infinite ) ), // jen + "01FN54E7AD80NVTXF3VPF789NV" to TeamMemberFlair.Brush( + SolidColor(Color(0xfff34848)) + ), // jack + "01FDVES092RQR3YTY4JBGA0VCA" to TeamMemberFlair.Brush( + AndroidBrush.verticalGradient( + listOf( + Color(0xFFBB4681), + Color(0xFF9CA87F) + ) + ) + ), // tom "01EX2NCWQ0CHS3QJF0FEQS1GR4" to TeamMemberFlair.AGSLShader( INSERT_SHADER, AndroidBrush.linearGradient( @@ -59,17 +71,6 @@ object SpecialUsers { end = Offset.Infinite ) ), // insert - "01EXAF3KX65608AJ4NG27YG1HM" to TeamMemberFlair.Brush( - AndroidBrush.solidColor(Color(0xFFFFC1F1)) - ), // lea - "01FEEFJCKY5C4DMMJYZ20ACWWC" to TeamMemberFlair.Brush( - AndroidBrush.linearGradient( - listOf( - Color(0xFF0BA39F), - Color(0xFFCD1414) - ) - ) - ), // sophie "01FD58YK5W7QRV5H3D64KTQYX3" to TeamMemberFlair.Brush( AndroidBrush.verticalGradient( listOf( @@ -78,14 +79,6 @@ object SpecialUsers { ) ) ), // zomatree - "01FDVES092RQR3YTY4JBGA0VCA" to TeamMemberFlair.Brush( - AndroidBrush.verticalGradient( - listOf( - Color(0xFFBB4681), - Color(0xFF9CA87F) - ) - ) - ) // tom ) fun teamFlairAsBrush(context: Context, id: String): AndroidBrush? { diff --git a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt index f2b7ea3e..7badf739 100644 --- a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt +++ b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt @@ -246,6 +246,29 @@ fun UserInfoSheet( } } + if (user.status?.text != null) { + item(key = "status") { + SheetTile( + header = { + Text(stringResource(R.string.user_info_sheet_category_status)) + }, + contentPreview = { + Text( + text = user.status.text, + fontSize = 14.sp, + maxLines = 5, + overflow = TextOverflow.Ellipsis + ) + } + ) { + Text( + text = user.status.text, + style = MaterialTheme.typography.bodyMedium + ) + } + } + } + if (user.bot != null) { val resolvedOwner = user.bot.owner?.let { RevoltAPI.userCache[it] } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1742fb6c..81030b6d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -375,6 +375,7 @@ Could not open DM with this user. This is a bot. This is a bot. It has a plan. + Status Open member options Remove from %1$s