Enable WYSIWYG plain text support

Riot/Modules/Room/RoomViewController.m

@@ -5115,7 +5115,9 @@ static CGSize kThreadListBarButtonItemImageSize;
         [actionItems addObject:@(ComposerCreateActionCamera)];
     }
     
-    self.composerCreateActionListBridgePresenter = [[ComposerCreateActionListBridgePresenter alloc] initWithActions:actionItems];
+    self.composerCreateActionListBridgePresenter = [[ComposerCreateActionListBridgePresenter alloc] initWithActions:actionItems
+                                                                                                     wysiwygEnabled:RiotSettings.shared.enableWysiwygComposer
+                                                                                              textFormattingEnabled:RiotSettings.shared.enableWysiwygTextFormatting];
     self.composerCreateActionListBridgePresenter.delegate = self;
     [self.composerCreateActionListBridgePresenter presentFrom:self animated:YES];
 }
@@ -8056,6 +8058,11 @@ static CGSize kThreadListBarButtonItemImageSize;
     }];
 }
 
+- (void)composerCreateActionListBridgePresenterDelegateDidToggleTextFormatting:(ComposerCreateActionListBridgePresenter *)coordinatorBridgePresenter enabled:(BOOL)enabled
+{
+    [self togglePlainTextMode];
+}
+
 - (void)composerCreateActionListBridgePresenterDidDismissInteractively:(ComposerCreateActionListBridgePresenter *)coordinatorBridgePresenter
 {
     self.composerCreateActionListBridgePresenter = nil;

Riot/Modules/Room/RoomViewController.swift

@@ -149,6 +149,11 @@ extension RoomViewController {
             }
         }
     }
+
+    @objc func togglePlainTextMode() {
+        RiotSettings.shared.enableWysiwygTextFormatting.toggle()
+        wysiwygInputToolbar?.textFormattingEnabled.toggle()
+    }
 }
 
 // MARK: - Private Helpers

Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift

@@ -66,6 +66,7 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
         viewModel.callback = { [weak self] result in
             self?.handleViewModelResult(result)
         }
+        wysiwygViewModel.plainTextMode = !RiotSettings.shared.enableWysiwygTextFormatting
         
         inputAccessoryViewForKeyboard = UIView(frame: .zero)
         
@@ -130,7 +131,8 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
     }
     
     private func sendWysiwygMessage(content: WysiwygComposerContent) {
-        delegate?.roomInputToolbarView?(self, sendFormattedTextMessage: content.html, withRawText: content.plainText)
+        let html = content.html.isEmpty ? content.plainText : content.html
+        delegate?.roomInputToolbarView?(self, sendFormattedTextMessage: html, withRawText: content.plainText)
     }
     
     private func showSendMediaActions() {
@@ -207,6 +209,20 @@ class WysiwygInputToolbarView: MXKRoomInputToolbarView, NibLoadable, HtmlRoomInp
             updatePlaceholderText()
         }
     }
+
+    /// Whether text formatting is currently enabled in the composer.
+    var textFormattingEnabled: Bool {
+        get {
+            self.viewModel.textFormattingEnabled
+        }
+        set {
+            self.viewModel.textFormattingEnabled = newValue
+            self.wysiwygViewModel.plainTextMode = !newValue
+            if !newValue {
+                self.wysiwygViewModel.maximised = false
+            }
+        }
+    }
     
     /// Add the voice message toolbar to the composer
     /// - Parameter voiceMessageToolbarView: the voice message toolbar UIView