feat: Add username field to AccountInfo and update display logic in SelectAccountScreen
This commit is contained in:
@@ -161,6 +161,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
AccountInfo(
|
AccountInfo(
|
||||||
id = account.publicKey,
|
id = account.publicKey,
|
||||||
name = displayName,
|
name = displayName,
|
||||||
|
username = account.username,
|
||||||
initials = initials,
|
initials = initials,
|
||||||
publicKey = account.publicKey
|
publicKey = account.publicKey
|
||||||
)
|
)
|
||||||
@@ -270,6 +271,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
AccountInfo(
|
AccountInfo(
|
||||||
id = acc.publicKey,
|
id = acc.publicKey,
|
||||||
name = displayName,
|
name = displayName,
|
||||||
|
username = acc.username,
|
||||||
initials = initials,
|
initials = initials,
|
||||||
publicKey = acc.publicKey
|
publicKey = acc.publicKey
|
||||||
)
|
)
|
||||||
@@ -333,6 +335,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
AccountInfo(
|
AccountInfo(
|
||||||
id = acc.publicKey,
|
id = acc.publicKey,
|
||||||
name = displayName,
|
name = displayName,
|
||||||
|
username = acc.username,
|
||||||
initials = initials,
|
initials = initials,
|
||||||
publicKey = acc.publicKey
|
publicKey = acc.publicKey
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import com.rosetta.messenger.ui.onboarding.PrimaryBlue
|
|||||||
data class AccountInfo(
|
data class AccountInfo(
|
||||||
val id: String,
|
val id: String,
|
||||||
val name: String,
|
val name: String,
|
||||||
|
val username: String,
|
||||||
val initials: String,
|
val initials: String,
|
||||||
val publicKey: String
|
val publicKey: String
|
||||||
)
|
)
|
||||||
@@ -318,7 +319,7 @@ private fun AccountListItem(
|
|||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(4.dp))
|
Spacer(modifier = Modifier.height(4.dp))
|
||||||
Text(
|
Text(
|
||||||
text = "${account.publicKey.take(8)}...${account.publicKey.takeLast(6)}",
|
text = if (account.username.isNotEmpty()) "@${account.username}" else "${account.publicKey.take(8)}...${account.publicKey.takeLast(6)}",
|
||||||
fontSize = 13.sp,
|
fontSize = 13.sp,
|
||||||
color = secondaryTextColor,
|
color = secondaryTextColor,
|
||||||
maxLines = 1,
|
maxLines = 1,
|
||||||
|
|||||||
Reference in New Issue
Block a user