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

fix: include format in rqr cbor 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2024-12-01 15:32:39 +01:00
parent 2d76949644
commit c5c7f8e9da
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/chat/revolt/api/internals/UserQR.kt
View File

@ -9,7 +9,7 @@ import kotlin.io.encoding.ExperimentalEncodingApi
@Serializable @Serializable
data class UserQRContents( data class UserQRContents(
val format: String = "rqr\$user\$0", val format: String,
val avatar: String, val avatar: String,
val displayName: String, val displayName: String,
val username: String, val username: String,
@ -24,6 +24,7 @@ object UserQR {
RevoltCbor.encodeToByteArray( RevoltCbor.encodeToByteArray(
UserQRContents.serializer(), UserQRContents.serializer(),
UserQRContents( UserQRContents(
format = "rqr\$user\$0",
avatar = user.avatar?.id avatar = user.avatar?.id
?: "01JDZRBY95P8AY4CFVX16FFVWS", // Sentinel value for missing avatar ?: "01JDZRBY95P8AY4CFVX16FFVWS", // Sentinel value for missing avatar
displayName = user.displayName displayName = user.displayName

5
app/src/main/java/chat/revolt/components/profile/UserCard.kt
View File

@ -46,7 +46,6 @@ import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontVariation import androidx.compose.ui.text.font.FontVariation
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.rememberTextMeasurer
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.ConstraintLayout
@ -77,8 +76,6 @@ fun UserCard(
) { ) {
val context = LocalContext.current val context = LocalContext.current
val textMeasurer = rememberTextMeasurer()
var palette by remember { mutableStateOf<Palette?>(null) } var palette by remember { mutableStateOf<Palette?>(null) }
LaunchedEffect(user) { LaunchedEffect(user) {
val avatarUrl = ResourceLocations.userAvatarUrl(user) val avatarUrl = ResourceLocations.userAvatarUrl(user)
@ -196,7 +193,7 @@ fun UserCard(
?: Color(0xFFFF005C), shape = MaterialTheme.shapes.medium) ?: Color(0xFFFF005C), shape = MaterialTheme.shapes.medium)
.padding(16.dp) .padding(16.dp)
) { ) {
val (heading, nameLabel, name, usernameLabel, username, tagLabel, tag, joinDateLabel, joinDate, qrLabel, qr, photoLabel, photo, url) = createRefs() val (heading, nameLabel, name, usernameLabel, username, joinDateLabel, joinDate, qrLabel, qr, photoLabel, photo, url) = createRefs()
Image( Image(
painter = painterResource(R.drawable.usercard_heading), painter = painterResource(R.drawable.usercard_heading),