swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #2790 - Reorder available composer menu actions

Browse Source
This commit is contained in:
Stefan Ceriu 2024-05-07 17:04:25 +03:00 committed by Stefan Ceriu
parent bd4fae6086
commit a08b4842d1
6 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/RoomAttachmentPicker.swift
View File

@ -37,29 +37,23 @@ struct RoomAttachmentPicker: View {
var menuContent: some View { var menuContent: some View {
VStack(alignment: .leading, spacing: 0.0) { VStack(alignment: .leading, spacing: 0.0) {
if ServiceLocator.shared.settings.richTextEditorEnabled {
Button { Button {
context.send(viewAction: .attach(.photoLibrary)) context.send(viewAction: .enableTextFormatting)
} label: { } label: {
Label(L10n.screenRoomAttachmentSourceGallery, icon: \.image) Label(L10n.screenRoomAttachmentTextFormatting, icon: \.textFormatting)
.labelStyle(.menuSheet) .labelStyle(.menuSheet)
} }
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPhotoLibrary) .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerTextFormatting)
}
Button { Button {
context.send(viewAction: .attach(.file)) context.send(viewAction: .attach(.poll))
} label: { } label: {
Label(L10n.screenRoomAttachmentSourceFiles, icon: \.attachment) Label(L10n.screenRoomAttachmentSourcePoll, icon: \.polls)
.labelStyle(.menuSheet) .labelStyle(.menuSheet)
} }
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerDocuments) .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPoll)
Button {
context.send(viewAction: .attach(.camera))
} label: {
Label(L10n.screenRoomAttachmentSourceCamera, icon: \.takePhoto)
.labelStyle(.menuSheet)
}
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerCamera)
Button { Button {
context.send(viewAction: .attach(.location)) context.send(viewAction: .attach(.location))
@ -70,22 +64,28 @@ struct RoomAttachmentPicker: View {
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerLocation) .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerLocation)
Button { Button {
context.send(viewAction: .attach(.poll)) context.send(viewAction: .attach(.file))
} label: { } label: {
Label(L10n.screenRoomAttachmentSourcePoll, icon: \.polls) Label(L10n.screenRoomAttachmentSourceFiles, icon: \.attachment)
.labelStyle(.menuSheet) .labelStyle(.menuSheet)
} }
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPoll) .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerDocuments)
if ServiceLocator.shared.settings.richTextEditorEnabled {
Button { Button {
context.send(viewAction: .enableTextFormatting) context.send(viewAction: .attach(.photoLibrary))
} label: { } label: {
Label(L10n.screenRoomAttachmentTextFormatting, icon: \.textFormatting) Label(L10n.screenRoomAttachmentSourceGallery, icon: \.image)
.labelStyle(.menuSheet) .labelStyle(.menuSheet)
} }
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerTextFormatting) .accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerPhotoLibrary)
Button {
context.send(viewAction: .attach(.camera))
} label: {
Label(L10n.screenRoomAttachmentSourceCamera, icon: \.takePhoto)
.labelStyle(.menuSheet)
} }
.accessibilityIdentifier(A11yIdentifiers.roomScreen.attachmentPickerCamera)
} }
} }
} }

BIN
UITests/Sources/__Snapshots__/Application/userSessionScreen-3-iPad-10th-generation-en-GB.UI.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
UITests/Sources/__Snapshots__/Application/userSessionScreen-3-iPhone-15-en-GB.UI.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
UITests/Sources/__Snapshots__/Application/userSessionScreenRTE-1-iPad-10th-generation-en-GB.UI.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
UITests/Sources/__Snapshots__/Application/userSessionScreenRTE-1-iPhone-15-en-GB.UI.png (Stored with Git LFS)
View File

Binary file not shown.

1
changelog.d/2790.change Normal file
View File

@ -0,0 +1 @@
Reorder available composer menu actions