Complete rewrite of article parse & show system

Author: SubvertDev

ForPDA.xcodeproj/project.pbxproj

@@ -47,9 +47,15 @@ extension SceneDelegate {
             // Cold start deeplink
             handleDeeplinkUrl(url)
         } else {
-            // Handle 'try?' later (todo)
-//            handleDeeplinkUrl(URL(string: "forpda://article/2023/10/21/419630/")!)
-            try? DefaultRouter().navigate(to: RouteMap.newsScreen, with: nil)
+            // Handle all 'try?' on routers? (todo)
+            // Wrong link is not showing anything (todo)
+            let testLink = "" // format starts/ends with slash: /2023/../../....../
+            if testLink.isEmpty {
+                try? DefaultRouter().navigate(to: RouteMap.newsScreen, with: nil)
+            } else {
+                // Testing purposes only
+                handleDeeplinkUrl(URL(string: "forpda://article\(testLink)")!)
+            }
         }
     }
 
@@ -62,7 +68,7 @@ extension SceneDelegate {
             let id = url.absoluteString.components(separatedBy: "article/")[1]
             let url = URL.fourpda.absoluteString + id
             let article = Article(url: url, info: nil)
-            try? DefaultRouter().navigate(to: RouteMap.articleScreen, with: article)
+            try? DefaultRouter().navigate(to: RouteMap.newArticleScreen, with: article)
         }
     }
 

ForPDA.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -43,6 +43,15 @@ struct RouteMap: RouteMapProtocol {
         .assemble()
     }
 
+    static var newArticleScreen: DestinationStep<NewArticleVC, Article> {
+        StepAssembly(
+            finder: ClassFinder<NewArticleVC, Article>(),
+            factory: NewArticleFactory())
+        .using(UINavigationController.push())
+        .from(newsScreen.expectingContainer())
+        .assemble()
+    }
+    
     // MARK: - [Menu]
 
     static var menuScreen: DestinationStep<MenuVC, Any?> {

ForPDA/Sources/Application/SceneDelegate.swift

@@ -0,0 +1,29 @@
+//
+//  UICollectionView+Ext.swift
+//  ForPDA
+//
+//  Created by Ilia Lubianoi on 04.11.2023.
+//
+
+import UIKit
+
+extension UICollectionViewCell {
+    
+    static var reuseIdentifier: String {
+        String(describing: self)
+    }
+
+}
+
+extension UICollectionView {
+        
+    func register<T: UICollectionViewCell>(_ type: T.Type) {
+        register(T.self, forCellWithReuseIdentifier: T.reuseIdentifier)
+    }
+
+    func reuse<T: UICollectionViewCell>(_ type: T.Type, _ indexPath: IndexPath) -> T {
+        // swiftlint:disable force_cast
+        dequeueReusableCell(withReuseIdentifier: T.reuseIdentifier, for: indexPath) as! T
+        // swiftlint:enable force_cast
+    }
+}

ForPDA/Sources/Coordinator/RouteMap.swift

@@ -15,7 +15,7 @@ struct Article {
 struct ArticleInfo {
     let title: String
     let description: String
-    let imageUrl: String
+    let imageUrl: URL
     let author: String
     let date: String
     let isReview: Bool

ForPDA/Sources/Extensions/UICollectionView+Ext.swift

@@ -21,7 +21,7 @@ final class ArticleBuilder {
         if description.contains("Узнать подробнее") { description.removeLast(16) }
         return [
             TextElement(text: description),
-            ButtonElement(text: R.string.localizable.learnMore(), url: url)
+            ButtonElement(text: R.string.localizable.learnMore(), url: URL(string: url)!)
         ]
     }
 

ForPDA/Sources/Models/Article.swift

@@ -20,7 +20,7 @@ protocol ArticleVCProtocol: AnyObject {
     func showError()
 }
 
-final class ArticleVC: PDAViewController<ArticleView> {
+final class ArticleVC: PDAViewControllerWithView<ArticleView> {
 
     // MARK: - Properties
 
@@ -71,7 +71,7 @@ final class ArticleVC: PDAViewController<ArticleView> {
     }
 
     private func configureView() {
-        NukeExtensions.loadImage(with: URL(string: presenter.article.info?.imageUrl), into: myView.articleImage) { result in
+        NukeExtensions.loadImage(with: presenter.article.info?.imageUrl, into: myView.articleImage) { result in
             // Добавляем оверлей если открываем не через deeplink (?)
             if (try? result.get()) != nil { self.myView.articleImage.addoverlay() }
         }
@@ -133,16 +133,16 @@ final class ArticleVC: PDAViewController<ArticleView> {
                 )
 
             case let item as ImageElement:
-                articleElement = ArticleBuilder.addImage(url: item.url, description: item.description)
+                articleElement = ArticleBuilder.addImage(url: item.url.absoluteString, description: item.description)
 
             case let item as VideoElement:
                 articleElement = ArticleBuilder.addVideo(id: item.url)
 
             case let item as GifElement:
-                articleElement = ArticleBuilder.addGif(url: item.url)
+                articleElement = ArticleBuilder.addGif(url: item.url.absoluteString)
 
             case let item as ButtonElement:
-                articleElement = ArticleBuilder.addButton(text: item.text, url: item.url) { [weak self] link in
+                articleElement = ArticleBuilder.addButton(text: item.text, url: item.url.absoluteString) { [weak self] link in
                     self?.externalLinkButtonTapped(link)
                 }
 

ForPDA/Sources/Modules/Article/ArticleBuilder.swift

@@ -18,7 +18,7 @@ protocol LoginVCProtocol: AnyObject {
     func dismissLogin()
 }
 
-final class LoginVC: PDAViewController<LoginView> {
+final class LoginVC: PDAViewControllerWithView<LoginView> {
 
     // MARK: - Properties
 

ForPDA/Sources/Modules/Article/ArticleVC.swift

@@ -14,7 +14,7 @@ protocol MenuVCProtocol: AnyObject {
     func reloadData()
 }
 
-final class MenuVC: PDAViewController<MenuView> {
+final class MenuVC: PDAViewControllerWithView<MenuView> {
 
     // MARK: - Properties