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

More tweaks for User Status. (#6051)

Browse Source 
* Make sure user profiles are up to date when mentioning.

* Automatically focus the custom status text field.

* Make sure to clear the previous custom status text before input.

* Attempt to fix the user status sheet sometimes disappearing.
This commit is contained in:
Doug
2026-08-21 11:23:33 +01:00
committed by GitHub
parent dd84da15b0
commit 0d222e8ac0
4 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
+7 -7
View File
@@ -46,6 +46,13 @@ struct SettingsScreen: View {
.navigationBarTitleDisplayMode(.inline)
.toolbarVisibility(context.viewState.navigationBarVisibility, for: .navigationBar)
.toolbar { toolbar }
.sheet(isPresented: $context.isPresentingStatusPicker) {
SettingsScreenUserStatusPickerView { action in
context.send(viewAction: .userStatus(action))
}
.presentationDetents([.medium])
.presentationBackground(.compound.bgCanvasDefault)
}
}
private var userSection: some View {
@@ -94,13 +101,6 @@ struct SettingsScreen: View {
SettingsScreenUserStatusRow(mode: context.viewState.userStatusRowMode) { action in
context.send(viewAction: .userStatus(action))
}
.sheet(isPresented: $context.isPresentingStatusPicker) {
SettingsScreenUserStatusPickerView { action in
context.send(viewAction: .userStatus(action))
}
.presentationDetents([.medium]) // Stop using a List and calculate the exact height?
.presentationBackground(.compound.bgCanvasDefault)
}
}
}
ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreenUserStatusRow.swift
+23 -1
View File
@@ -9,13 +9,33 @@ import Compound
import SwiftUI
struct SettingsScreenUserStatusRow: View {
enum Mode: Equatable { case pickStatusButton, customStatusInput(emoji: Character), showingStatus(UserStatus.Displayed) }
enum Mode: Equatable {
case pickStatusButton, customStatusInput(emoji: Character), showingStatus(UserStatus.Displayed)
var isCustomStatusInput: Bool {
switch self {
case .customStatusInput: true
default: false
}
}
}
let mode: Mode
let action: (SettingsScreenViewAction.UserStatusAction) -> Void
@State private var customText = ""
@FocusState private var isCustomFieldFocused: Bool
var body: some View {
rowContent
.onChange(of: mode.isCustomStatusInput) { _, newValue in
guard newValue else { return }
customText = ""
}
}
@ViewBuilder
var rowContent: some View {
switch mode {
case .pickStatusButton:
ListRow(label: .default(title: L10n.screenSettingsUserStatusPlaceholder, icon: \.reaction),
@@ -34,6 +54,8 @@ struct SettingsScreenUserStatusRow: View {
TextField(L10n.screenSettingsUserStatusCustomHint, text: $customText)
.textFieldStyle(.compound(.raised))
.focused($isCustomFieldFocused)
.onAppear { isCustomFieldFocused = true }
.accessibilityLabel(L10n.screenSettingsUserStatusCustomHint)
.padding(.vertical, 3)