felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 07:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into resilience-rc

Browse Source 
# Conflicts:
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
#	project.yml
This commit is contained in:
aringenbach
2022-11-07 15:05:25 +01:00
parent 1df5432fbf 775784150e
commit b7bf6353d0
138 changed files with 1484 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
View File

@@ -37,7 +37,7 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
private var heightConstraint: NSLayoutConstraint!
private var hostingViewController: VectorHostingController!
private var wysiwygViewModel = WysiwygComposerViewModel(textColor: ThemeService.shared().theme.colors.primaryContent)
private var viewModel: ComposerViewModelProtocol = ComposerViewModel(initialViewState: ComposerViewState())
private var viewModel: ComposerViewModelProtocol = ComposerViewModel(initialViewState: ComposerViewState(bindings: ComposerBindings(focused: false)))
// MARK: Public
@@ -70,8 +70,10 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
inputAccessoryViewForKeyboard = UIView(frame: .zero)
let composer = Composer(viewModel: viewModel.context,
let composer = Composer(
viewModel: viewModel.context,
wysiwygViewModel: wysiwygViewModel,
resizeAnimationDuration: Double(kResizeComposerAnimationDuration),
sendMessageAction: { [weak self] content in
guard let self = self else { return }
self.sendWysiwygMessage(content: content)
@@ -123,6 +125,10 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
self.backgroundColor = .clear
}
override func dismissKeyboard() {
self.viewModel.dismissKeyboard()
}
// MARK: - Private
private func updateToolbarHeight(wysiwygHeight: CGFloat) {