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

Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_and_reply

Browse Source 
# Conflicts:
#	Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
This commit is contained in:
Mauro Romito
2022-10-10 12:51:48 +02:00
parent ea73b2c2ff 094073a4ce
commit 3fcb480c70
876 changed files with 13165 additions and 4520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,14 +41,13 @@ class SelfSizingHostingController<Content>: UIHostingController<Content> where C
@objc func setHtml(content: String)
}
@available(iOS 16.0, *)
@available(iOS 15.0, *)
class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInputToolbarViewProtocol {
override class func instantiate() -> MXKRoomInputToolbarView! {
return loadFromNib()
}
@objc var startModuleAction: ((ComposerModule) -> Void)?
private weak var toolbarViewDelegate: RoomInputToolbarViewDelegate? {
return (delegate as? RoomInputToolbarViewDelegate) ?? nil
}
@@ -65,9 +64,9 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
let composer = Composer(viewModel: viewModel, sendMessageAction: { [weak self] content in
guard let self = self else { return }
self.sendWysiwygMessage(content: content)
}, startModuleAction: { [weak self] module in
}, showSendMediaActions: { [weak self] in
guard let self = self else { return }
self.startModuleAction?(module)
self.showSendMediaActions()
})
hostingViewController = SelfSizingHostingController(rootView: composer)
@@ -94,6 +93,8 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
})
]
update(theme: ThemeService.shared().theme)
registerThemeServiceDidChangeThemeNotification()
}
override func customizeRendering() {
@@ -122,4 +123,20 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
delegate?.roomInputToolbarView?(self, sendFormattedTextMessage: content.html, withRawText: content.plainText)
}
private func showSendMediaActions() {
delegate?.roomInputToolbarViewShowSendMediaActions?(self)
}
private func registerThemeServiceDidChangeThemeNotification() {
NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeServiceDidChangeTheme, object: nil)
}
@objc private func themeDidChange() {
self.update(theme: ThemeService.shared().theme)
}
private func update(theme: Theme) {
hostingViewController.view.backgroundColor = theme.colors.background
}
}