ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the status emoji placement on the home screen. (#6260)

Browse Source 
* Minor tweaks to User Status.

- Change the layout of the status emoji on the Setting button.
- Remove the status emoji from the Settings screen (it's shown directly below in the status row).
This commit is contained in:
Doug
2026-10-05 10:18:23 +01:00
committed by GitHub
parent 57f5498da0
commit 9ce3bd97d8
23 changed files with 66 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+2 -4
View File
@@ -98,11 +98,9 @@ struct HomeScreen: View {
}
private var settingsButton: some View {
Button {
AvatarSettingsButton(userProfile: context.viewState.userProfile,
mediaProvider: context.mediaProvider) {
context.send(viewAction: .showSettings)
} label: {
AvatarSettingsButtonLabel(userProfile: context.viewState.userProfile,
mediaProvider: context.mediaProvider)
}
.accessibilityLabel(L10n.commonSettings)
.accessibilityIdentifier(A11yIdentifiers.homeScreen.userAvatar)
ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
+3 -9
View File
@@ -70,15 +70,9 @@ struct SettingsScreen: View {
.accessibilityHidden(true)
VStack(alignment: .leading, spacing: 2) {
HStack(spacing: 6) {
Text(context.viewState.userProfile.displayName ?? "")
if let statusEmoji = context.viewState.userProfile.status.displayed?.emoji {
Text(String(statusEmoji))
}
}
.font(.compound.headingMD)
.foregroundColor(.compound.textPrimary)
Text(context.viewState.userProfile.displayName ?? "")
.font(.compound.headingMD)
.foregroundColor(.compound.textPrimary)
Text(context.viewState.userProfile.id)
.font(.compound.bodySM)
ElementX/Sources/Screens/Spaces/SpacesScreen/View/SpacesScreen.swift
+2 -4
View File
@@ -95,11 +95,9 @@ struct SpacesScreen: View {
private var toolbar: some ToolbarContent {
// Use the title placement on iOS 26 to match the chats tab and fix a weird animation.
ToolbarItem(placement: Compound.supportsGlass ? .title : .navigationBarLeading) {
Button {
AvatarSettingsButton(userProfile: context.viewState.userProfile,
mediaProvider: context.mediaProvider) {
context.send(viewAction: .showSettings)
} label: {
AvatarSettingsButtonLabel(userProfile: context.viewState.userProfile,
mediaProvider: context.mediaProvider)
}
.buttonStyle(.borderless)
.accessibilityLabel(L10n.commonSettings)