vaultwarden/keyguard-app-Bitwarden-Vaultwarden
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improvement: A slightly better visual of the Passkey with empty RP name

Browse Source
This commit is contained in:
Artem Chepurnyi 2024-05-25 13:35:31 +03:00
parent d2df9687c9
commit d7d4dd8f80
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/commonMain/kotlin/com/artemchep/keyguard/feature/add/AddScreen.kt
View File

@ -9,7 +9,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
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
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
@ -73,6 +72,7 @@ import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.artemchep.keyguard.common.model.UsernameVariationIcon import com.artemchep.keyguard.common.model.UsernameVariationIcon
import com.artemchep.keyguard.common.model.titleH import com.artemchep.keyguard.common.model.titleH
@ -757,13 +757,24 @@ private fun PasskeyField(
if (passkey != null) { if (passkey != null) {
FlatItemTextContent( FlatItemTextContent(
title = { title = {
Text( val userName = passkey.userDisplayName
text = passkey.userDisplayName.orEmpty(), if (userName != null) {
) Text(
text = userName,
)
}
}, },
text = { text = {
val rpName = passkey.rpName
Text( Text(
text = passkey.rpName ?: "", text = rpName
?: stringResource(Res.string.empty_value),
color = if (rpName != null) {
LocalContentColor.current
} else {
LocalContentColor.current
.combineAlpha(DisabledEmphasisAlpha)
},
) )
}, },
) )

9
common/src/commonMain/kotlin/com/artemchep/keyguard/feature/passkeys/PasskeysCredentialViewScreen.kt
View File

@ -212,7 +212,14 @@ private fun ColumnScope.ContentOk(
val rpId = state.model.rpId val rpId = state.model.rpId
Column { Column {
Text( Text(
text = rpName ?: "", text = rpName
?: stringResource(Res.string.empty_value),
color = if (rpName != null) {
LocalContentColor.current
} else {
LocalContentColor.current
.combineAlpha(DisabledEmphasisAlpha)
},
) )
Text( Text(
text = rpId, text = rpId,