Fix two or more buttons open same link in article

Author: SubvertDev

ForPDA/Sources/Modules/Article/ArticleBuilder.swift

@@ -162,8 +162,8 @@ final class ArticleBuilder {
     // MARK: - Buttons
 
     /// Returns UIView container with UIButton inside
-    static func addButton(text: String, url: String, completion: @escaping () -> Void) -> UIView {
-        let action = UIAction { _ in completion() }
+    static func addButton(text: String, url: String, completion: @escaping (String) -> Void) -> UIView {
+        let action = UIAction { _ in completion(url) }
         let button = UIButton(type: .system, primaryAction: action)
         button.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
         button.setTitle(text, for: .normal)

ForPDA/Sources/Modules/Article/ArticleVC.swift

@@ -24,8 +24,6 @@ final class ArticleVC: PDAViewController<ArticleView> {
     @Injected(\.analyticsService) var analyticsService
 
     private let viewModel: ArticleVMProtocol
-
-    private var externalLinkUrl: String?
 
     // MARK: - Lifecycle
 
@@ -98,10 +96,10 @@ final class ArticleVC: PDAViewController<ArticleView> {
         }
     }
 
-    private func externalLinkButtonTapped() {
-        if let externalLinkUrl, let url = URL(string: externalLinkUrl), UIApplication.shared.canOpenURL(url) {
+    private func externalLinkButtonTapped(_ link: String) {
+        if let url = URL(string: link), UIApplication.shared.canOpenURL(url) {
             UIApplication.shared.open(url)
-            analyticsService.clickButtonInArticle(currentUrl: viewModel.article.url, targetUrl: externalLinkUrl)
+            analyticsService.clickButtonInArticle(currentUrl: viewModel.article.url, targetUrl: url.absoluteString)
         }
     }
 
@@ -133,9 +131,8 @@ final class ArticleVC: PDAViewController<ArticleView> {
                 articleElement = ArticleBuilder.addGif(url: item.url)
 
             case let item as ButtonElement:
-                externalLinkUrl = item.url
-                articleElement = ArticleBuilder.addButton(text: item.text, url: item.url) {
-                    self.externalLinkButtonTapped()
+                articleElement = ArticleBuilder.addButton(text: item.text, url: item.url) { [weak self] link in
+                    self?.externalLinkButtonTapped(link)
                 }
 
             case let item as BulletListParentElement:

ForPDA/Sources/Services/Parsing/ParsingService.swift

@@ -186,8 +186,8 @@ final class ParsingService {
                 let text = try! element.text()
                 articleElements.append(TextElement(text: text, isHeader: true))
             } else if try! element.iS("dl") {
-                let charters = parseCharters(element)
-                articleElements.append(BulletListParentElement(elements: charters))
+                let bulletList = parseBulletList(element)
+                articleElements.append(BulletListParentElement(elements: bulletList))
             } else if try! element.iS("ul") {
                 let galCont = try! element.select("a[data-lightbox]")
                 for gal in galCont {
@@ -228,19 +228,18 @@ final class ParsingService {
                     }
                 }
             } else if try! element.iS("dl") {
-                let charters = parseCharters(element)
+                let charters = parseBulletList(element)
                 articleElements.append(BulletListParentElement(elements: charters))
             } else if try! element.iS("a") {
                 let text = try! element.text()
                 let url = try! element.attr("href")
-                print("ADDING BUTTON 2")
                 articleElements.append(ButtonElement(text: text, url: url))
             }
         }
         return articleElements
     }
 
-    private func parseCharters(_ element: Element) -> [BulletListElement] {
+    private func parseBulletList(_ element: Element) -> [BulletListElement] {
         var charterElements: [BulletListElement] = []
         let elements = try! element.select("dd, dt")