Skip to content

fix: focus order in user profile screen (WPB-14780) #4836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbakhtiarov merged 1 commit into from
May 20, 2026
+68 −90
Merged

fix: focus order in user profile screen (WPB-14780) #4836

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 68 additions & 90 deletions app/src/main/kotlin/com/wire/android/ui/userprofile/self/SelfUserProfileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,16 @@ import com.wire.android.navigation.annotation.app.WireRootDestination
import android.annotation.SuppressLint
import android.content.Context
import android.widget.Toast
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Divider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -202,7 +198,6 @@ fun SelfUserProfileScreen(
}
}

@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun SelfUserProfileContent(
state: SelfUserProfileState,
Expand Down Expand Up @@ -255,110 +250,93 @@ private fun SelfUserProfileContent(
val context = LocalContext.current
Column(
modifier = Modifier
.fillMaxWidth()
.scrollable(state = scrollState, orientation = Orientation.Vertical)
.fillMaxSize()
.background(MaterialTheme.colorScheme.background)
.padding(internalPadding)
) {
val selectLabel = stringResource(R.string.content_description_select_label)
LazyColumn(
Column(
modifier = Modifier
.weight(1F)
.fillMaxWidth()
.fillMaxHeight()
.scrollable(state = scrollState, orientation = Orientation.Vertical)
.verticalScroll(scrollState)
) {
if (state.isAbleToMigrateToTeamAccount) {
stickyHeader {
Column(
modifier = Modifier
.padding(
top = dimensions().spacing16x,
start = dimensions().spacing16x,
end = dimensions().spacing16x
)
) {
CreateTeamInfoCard(onCreateAccount)
}
Column(
modifier = Modifier
.padding(
top = dimensions().spacing16x,
start = dimensions().spacing16x,
end = dimensions().spacing16x
)
) {
CreateTeamInfoCard(onCreateAccount)
}
}
stickyHeader {
UserProfileInfo(
userId = state.userId,
isLoading = state.isAvatarLoading,
avatarAsset = state.avatarAsset,
fullName = fullName,
userName = userName,
teamName = teamName,
onUserProfileClick = onChangeUserProfilePicture,
editableState = EditableState.IsEditable(onEditClick),
onQrCodeClick = onQrCodeClick,
accentId = accentId,
showQrCode = state.showQrCode,
)
}
UserProfileInfo(
userId = state.userId,
isLoading = state.isAvatarLoading,
avatarAsset = state.avatarAsset,
fullName = fullName,
userName = userName,
teamName = teamName,
onUserProfileClick = onChangeUserProfilePicture,
editableState = EditableState.IsEditable(onEditClick),
onQrCodeClick = onQrCodeClick,
accentId = accentId,
showQrCode = state.showQrCode,
)
if (state.legalHoldStatus != LegalHoldUIState.None) {
stickyHeader {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.fillMaxWidth()
.padding(top = dimensions().spacing8x)
) {
when (state.legalHoldStatus) {
LegalHoldUIState.Active -> LegalHoldSubjectBanner(onClick = onLegalHoldLearnMoreClick)
LegalHoldUIState.Pending -> LegalHoldPendingBanner(onClick = onLegalHoldAcceptClick)
LegalHoldUIState.None -> {
/* no banner */
}
Box(
contentAlignment = Alignment.Center,
modifier = Modifier
.fillMaxWidth()
.padding(top = dimensions().spacing8x)
) {
when (state.legalHoldStatus) {
LegalHoldUIState.Active -> LegalHoldSubjectBanner(onClick = onLegalHoldLearnMoreClick)
LegalHoldUIState.Pending -> LegalHoldPendingBanner(onClick = onLegalHoldAcceptClick)
LegalHoldUIState.None -> {
/* no banner */
}
}
}
}
if (!state.teamName.isNullOrBlank()) {
stickyHeader {
CurrentSelfUserStatus(
userStatus = status,
onStatusClicked = onStatusClicked,
)
}
CurrentSelfUserStatus(
userStatus = status,
onStatusClicked = onStatusClicked,
)
}
stickyHeader {
VerticalSpace.x8()
Box(modifier = Modifier.padding(horizontal = MaterialTheme.wireDimensions.spacing16x)) {
AccountDetailButton(onAccountDetailsClick = onAccountDetailsClick)
}
VerticalSpace.x8()
Box(modifier = Modifier.padding(horizontal = MaterialTheme.wireDimensions.spacing16x)) {
AccountDetailButton(onAccountDetailsClick = onAccountDetailsClick)
}
if (state.otherAccounts.isNotEmpty()) {
stickyHeader {
VerticalSpace.x16()
OtherAccountsHeader()
}
items(
items = otherAccounts,
itemContent = { account ->
OtherAccountItem(
account = account,
clickable = remember {
Clickable(
enabled = true,
onClickDescription = selectLabel,
onClick = {
if (isUserInCall()) {
Toast.makeText(
context,
R.string.cant_switch_account_in_call,
Toast.LENGTH_SHORT
).show()
} else {
onOtherAccountClick(account.id)
}
VerticalSpace.x16()
OtherAccountsHeader()
otherAccounts.forEach { account ->
OtherAccountItem(
account = account,
clickable = remember(account.id) {
Clickable(
enabled = true,
onClickDescription = selectLabel,
onClick = {
if (isUserInCall()) {
Toast.makeText(
context,
R.string.cant_switch_account_in_call,
Toast.LENGTH_SHORT
).show()
} else {
onOtherAccountClick(account.id)
}
)
}
)
}
)
}
)
}
)
}
}
}

Expand Down
Loading