mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
Tweak some things, fix some things, delete some things
This commit is contained in:
@@ -157,8 +157,6 @@ enum A11yIdentifiers {
|
|||||||
let attachmentPickerTextFormatting = "room-attachment_picker_text_formatting"
|
let attachmentPickerTextFormatting = "room-attachment_picker_text_formatting"
|
||||||
let timelineItemActionMenu = "room-timeline_item_action_menu"
|
let timelineItemActionMenu = "room-timeline_item_action_menu"
|
||||||
let joinCall = "room-join_call"
|
let joinCall = "room-join_call"
|
||||||
let startVoiceCall = "room-start_voice_call"
|
|
||||||
let startVideoCall = "room-start_video_call"
|
|
||||||
let scrollToBottom = "room-scroll_to_bottom"
|
let scrollToBottom = "room-scroll_to_bottom"
|
||||||
|
|
||||||
let messageComposer = "room-message_composer"
|
let messageComposer = "room-message_composer"
|
||||||
|
|||||||
@@ -25,26 +25,21 @@ struct RoomCallControlsToolbar: ToolbarContent {
|
|||||||
if viewState.isDirectOneToOneRoom {
|
if viewState.isDirectOneToOneRoom {
|
||||||
ToolbarItem(placement: .primaryAction) {
|
ToolbarItem(placement: .primaryAction) {
|
||||||
Menu {
|
Menu {
|
||||||
Button(action: { onCallTap(true) }) {
|
Button {
|
||||||
Label("Audio call", systemImage: "phone.fill")
|
onCallTap(true)
|
||||||
|
} label: {
|
||||||
|
Label(L10n.a11yStartVoiceCall, icon: \.voiceCallSolid)
|
||||||
}
|
}
|
||||||
.accessibilityIdentifier(A11yIdentifiers.roomScreen.startVoiceCall)
|
|
||||||
.disabled(!viewState.canJoinCall)
|
Button {
|
||||||
|
onCallTap(false)
|
||||||
Button(action: { onCallTap(false) }) {
|
} label: {
|
||||||
Label("Video call", systemImage: "video.fill")
|
Label(L10n.a11yStartVideoCall, icon: \.videoCallSolid)
|
||||||
}
|
}
|
||||||
.accessibilityIdentifier(A11yIdentifiers.roomScreen.startVideoCall)
|
|
||||||
.disabled(!viewState.canJoinCall)
|
|
||||||
} label: {
|
} label: {
|
||||||
CompoundIcon(\.voiceCallSolid)
|
CompoundIcon(\.voiceCallSolid)
|
||||||
.frame(width: 28, height: 28)
|
|
||||||
.contentShape(Rectangle())
|
|
||||||
}
|
}
|
||||||
.menuIndicator(.hidden)
|
.accessibilityLabel(L10n.a11yStartCall)
|
||||||
.buttonStyle(.plain)
|
|
||||||
.accessibilityLabel(L10n.a11yStartVoiceCall)
|
|
||||||
.accessibilityIdentifier(A11yIdentifiers.roomScreen.startVoiceCall)
|
|
||||||
.disabled(!viewState.canJoinCall)
|
.disabled(!viewState.canJoinCall)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -53,7 +48,6 @@ struct RoomCallControlsToolbar: ToolbarContent {
|
|||||||
CompoundIcon(\.videoCallSolid)
|
CompoundIcon(\.videoCallSolid)
|
||||||
}
|
}
|
||||||
.accessibilityLabel(L10n.a11yStartVideoCall)
|
.accessibilityLabel(L10n.a11yStartVideoCall)
|
||||||
.accessibilityIdentifier(A11yIdentifiers.roomScreen.startVideoCall)
|
|
||||||
.disabled(!viewState.canJoinCall)
|
.disabled(!viewState.canJoinCall)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user