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 #2792 - Use the right room context in the plain composer

Browse Source
This commit is contained in:
Stefan Ceriu 2024-05-07 10:13:56 +03:00 committed by Stefan Ceriu
parent 4d0d150f2b
commit 3017100e5e
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/ComposerToolbar.swift
View File

@ -110,13 +110,6 @@ struct ComposerToolbar: View {
RoomAttachmentPicker(context: context)
}
messageComposer
.environmentObject(context)
.onTapGesture {
guard !composerFocused else { return }
composerFocused = true
}
.padding(.leading, context.composerActionsEnabled ? 7 : 0)
.padding(.trailing, context.composerActionsEnabled ? 4 : 0)
}
.opacity(context.viewState.isVoiceMessageModeActivated ? 0 : 1)
@ -177,7 +170,14 @@ struct ComposerToolbar: View {
} onAppearAction: {
context.send(viewAction: .composerAppeared)
}
.environmentObject(context)
.focused($composerFocused)
.padding(.leading, context.composerActionsEnabled ? 7 : 0)
.padding(.trailing, context.composerActionsEnabled ? 4 : 0)
.onTapGesture {
guard !composerFocused else { return }
composerFocused = true
}
.onChange(of: context.composerFocused) { newValue in
guard composerFocused != newValue else { return }

2
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
View File

@ -787,7 +787,7 @@ extension EnvironmentValues {
get { self[RoomContextKey.self] }
set { self[RoomContextKey.self] = newValue }
}
/// An event ID which will be non-nil when a timeline item should show as focussed.
var focussedEventID: String? {
get { self[FocussedEventID.self] }

2
ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
View File

@ -45,7 +45,7 @@ struct RoomScreen: View {
}
.padding(.top, 8)
.background(Color.compound.bgCanvasDefault.ignoresSafeArea())
.environmentObject(context)
.environment(\.roomContext, context)
}
.navigationTitle(L10n.screenRoomTitle) // Hidden but used for back button text.
.navigationBarTitleDisplayMode(.inline)

1
UnitTests/Sources/RoomPollsHistoryScreenViewModelTests.swift
View File

@ -27,7 +27,6 @@ class RoomPollsHistoryScreenViewModelTests: XCTestCase {
override func setUpWithError() throws {
interactionHandler = PollInteractionHandlerMock()
timelineController = MockRoomTimelineController()
let roomProxyMockConfiguration = RoomProxyMockConfiguration(name: "Polls")
viewModel = RoomPollsHistoryScreenViewModel(pollInteractionHandler: interactionHandler,
roomTimelineController: timelineController,
userIndicatorController: UserIndicatorControllerMock())