Add additional text to beta view

Author: ismailgulek

Riot/Modules/Room/RoomViewController.m

@@ -6851,7 +6851,8 @@ - (void)showThreadsBetaForEvent:(MXEvent *)event
     }
 
     self.threadsBetaBridgePresenter = [[ThreadsBetaCoordinatorBridgePresenter alloc] initWithThreadId:event.eventId
-                                                                                             infoText:VectorL10n.threadsBetaInformation];
+                                                                                             infoText:VectorL10n.threadsBetaInformation
+                                                                                       additionalText:nil];
     self.threadsBetaBridgePresenter.delegate = self;
 
     [self.threadsBetaBridgePresenter presentFrom:self.presentedViewController?:self animated:YES];

Riot/Modules/Threads/Beta/ThreadsBetaCoordinator.swift

@@ -27,8 +27,9 @@ final class ThreadsBetaCoordinator: NSObject, ThreadsBetaCoordinatorProtocol {
 
     private let threadId: String
     private let infoText: String
+    private let additionalText: String?
     private lazy var viewController: ThreadsBetaViewController = {
-        let result = ThreadsBetaViewController.instantiate(infoText: infoText)
+        let result = ThreadsBetaViewController.instantiate(infoText: infoText, additionalText: additionalText)
         result.didTapEnableButton = { [weak self] in
             guard let self = self else { return }
             RiotSettings.shared.enableThreads = true
@@ -51,9 +52,10 @@ final class ThreadsBetaCoordinator: NSObject, ThreadsBetaCoordinatorProtocol {
 
     // MARK: - Setup
 
-    init(threadId: String, infoText: String) {
+    init(threadId: String, infoText: String, additionalText: String?) {
         self.threadId = threadId
         self.infoText = infoText
+        self.additionalText = additionalText
     }    
 
     // MARK: - Public

Riot/Modules/Threads/Beta/ThreadsBetaCoordinatorBridgePresenter.swift

@@ -39,6 +39,7 @@ final class ThreadsBetaCoordinatorBridgePresenter: NSObject {
 
     public let threadId: String
     public let infoText: String
+    public let additionalText: String?
     private let slidingModalPresenter = SlidingModalPresenter()
     private var coordinator: ThreadsBetaCoordinator?
 
@@ -48,17 +49,20 @@ final class ThreadsBetaCoordinatorBridgePresenter: NSObject {
 
     // MARK: - Setup
 
-    init(threadId: String, infoText: String) {
+    init(threadId: String, infoText: String, additionalText: String?) {
         self.threadId = threadId
         self.infoText = infoText
+        self.additionalText = additionalText
         super.init()
     }
 
     // MARK: - Public
 
     func present(from viewController: UIViewController, animated: Bool) {
 
-        let threadsBetaCoordinator = ThreadsBetaCoordinator(threadId: threadId, infoText: infoText)
+        let threadsBetaCoordinator = ThreadsBetaCoordinator(threadId: threadId,
+                                                            infoText: infoText,
+                                                            additionalText: additionalText)
         threadsBetaCoordinator.delegate = self
         guard let presentable = threadsBetaCoordinator.toPresentable() as? SlidingModalPresentable.ViewControllerType else {
             MXLog.error("[ThreadsBetaCoordinatorBridgePresenter] Presentable is not 'SlidingModalPresentable'")

Riot/Modules/Threads/Beta/ThreadsBetaViewController.swift

@@ -40,6 +40,7 @@ class ThreadsBetaViewController: UIViewController {
 
     private var theme: Theme!
     private var infoText: String!
+    private var additionalText: String?
 
     // MARK: Public
 
@@ -70,10 +71,11 @@ class ThreadsBetaViewController: UIViewController {
 
     // MARK: - Setup
 
-    @objc class func instantiate(infoText: String) -> ThreadsBetaViewController {
+    @objc class func instantiate(infoText: String, additionalText: String?) -> ThreadsBetaViewController {
         let viewController = StoryboardScene.ThreadsBetaViewController.initialScene.instantiate()
         viewController.theme = ThemeService.shared().theme
         viewController.infoText = infoText
+        viewController.additionalText = additionalText
         return viewController
     }
 
@@ -106,6 +108,11 @@ class ThreadsBetaViewController: UIViewController {
                                       attributes: [.link: Constants.learnMoreLink,
                                                    .font: font])
         attributedString.append(link)
+
+        if let additionalText = additionalText {
+            attributedString.append(NSAttributedString(string: additionalText,
+                                                       attributes: [.font: font]))
+        }
         self.informationTextView.attributedText = attributedString
     }