Add: 웹 뷰 Refactoring

News.xcodeproj/xcshareddata/xcschemes/News.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

News/Application/AppCoordinator.swift

@@ -0,0 +1,37 @@
+//
+//  AppCoordinator.swift
+//  News
+//
+//  Created by Sang hun Lee on 2022/07/08.
+//
+
+import UIKit
+
+final class AppCoordinator: Coordinator {
+    weak var delegate: CoordinatorDelegate?
+    var childCoordinators = [Coordinator]()
+    var navigationController: UINavigationController
+    var type: CoordinatorStyleCase = .app
+
+    init(_ navigationController: UINavigationController) {
+        self.navigationController = navigationController
+        navigationController.setNavigationBarHidden(true, animated: false)
+    }
+
+    func start() {
+        connectTabBarFlow()
+    }
+
+    private func connectTabBarFlow() {
+        let newsTabCoordinator = NewsTabCoordinator(self.navigationController)
+        newsTabCoordinator.delegate = self
+        newsTabCoordinator.start()
+        childCoordinators.append(newsTabCoordinator)
+    }
+}
+
+extension AppCoordinator: CoordinatorDelegate {
+    func didFinish(childCoordinator: Coordinator) {
+        finish()
+    }
+}

News/Application/AppDelegate.swift

@@ -9,15 +9,20 @@ import UIKit
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+    ) -> Bool {
         return true
     }
 
     // MARK: UISceneSession Lifecycle
 
-    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
-
+    func application(
+        _ application: UIApplication,
+        configurationForConnecting connectingSceneSession: UISceneSession,
+        options: UIScene.ConnectionOptions
+    ) -> UISceneConfiguration {
         return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
     }
 }

News/Application/SceneDelegate.swift

@@ -8,15 +8,18 @@
 import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
-
     var window: UIWindow?
+    var coordinator: AppCoordinator?
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
         window = UIWindow(windowScene: windowScene)
-        window?.backgroundColor = .systemBackground
+        let nav = UINavigationController()
+        coordinator = AppCoordinator(nav)
+        coordinator?.start()
         window?.tintColor = .systemOrange
-        window?.rootViewController = NewsTabViewController()
+        window?.backgroundColor = .systemBackground
+        window?.rootViewController = nav
         window?.makeKeyAndVisible()
     }
 }

News/Coordinator/Coordinator.swift

@@ -0,0 +1,38 @@
+//
+//  Coordinator.swift
+//  News
+//
+//  Created by Sang hun Lee on 2022/07/08.
+//
+
+import UIKit
+
+protocol Coordinator: AnyObject {
+    var delegate: CoordinatorDelegate? { get set }
+    var navigationController: UINavigationController { get set }
+    var childCoordinators: [Coordinator] { get set }
+    var type: CoordinatorStyleCase { get }
+
+    func start()
+    func finish()
+
+    init(_ navigationController: UINavigationController)
+}
+
+extension Coordinator {
+    func finish() {
+        childCoordinators.removeAll()
+        delegate?.didFinish(childCoordinator: self)
+    }
+
+    func changeAnimation() {
+        if let window = UIApplication.shared.windows.first {
+            UIView.transition(
+                with: window,
+                duration: 0.5,
+                options: .transitionCrossDissolve,
+                animations: nil
+            )
+        }
+    }
+}

News/Coordinator/CoordinatorDelegate.swift

@@ -0,0 +1,12 @@
+//
+//  CoordinatorDelegate.swift
+//  News
+//
+//  Created by Sang hun Lee on 2022/07/08.
+//
+
+import Foundation
+
+protocol CoordinatorDelegate: AnyObject {
+    func didFinish(childCoordinator: Coordinator)
+}

News/Coordinator/CoordinatorStyleCase.swift

@@ -0,0 +1,13 @@
+//
+//  CoordinatorStyleCase.swift
+//  News
+//
+//  Created by Sang hun Lee on 2022/07/08.
+//
+
+import Foundation
+
+enum CoordinatorStyleCase {
+    case app, tab
+    case news, bookmark
+}

News/Domain/Entity/NewsData.swift

@@ -14,11 +14,27 @@ struct NewsData {
     let display: Int
 }
 
-struct News {
+// TODO: 관리에 있어서 Identifiable 준수 필요
+struct News: Equatable {
     let title: String
     let originallink: String
     let link: String
     let desc: String
     let pubDate: String
     var isScraped: Bool
+
+    static func == (lhs: News, rhs: News) -> Bool {
+        return lhs.title == rhs.title
+    }
+}
+
+extension News {
+    init(scrapedNews: ScrapedNews) {
+        self.title = scrapedNews.title ?? ""
+        self.originallink = scrapedNews.title ?? ""
+        self.link = scrapedNews.link ?? ""
+        self.desc = scrapedNews.desc ?? ""
+        self.pubDate = scrapedNews.pubDate ?? ""
+        self.isScraped = scrapedNews.isScraped
+    }
 }

News/Extensions/String +.swift

@@ -35,4 +35,8 @@ extension String {
             return nil
         }
     }
+
+    var isBlank: Bool {
+        return self.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+    }
 }

News/Extensions/UIViewController + Rx.swift

@@ -0,0 +1,37 @@
+//
+//  UIViewController + Rx.swift
+//  News
+//
+//  Created by Sang hun Lee on 2022/07/11.
+//
+
+import UIKit
+import RxCocoa
+import RxSwift
+
+extension Reactive where Base: UIViewController {
+    var viewDidLoad: ControlEvent<Void> {
+        let source = self.methodInvoked(#selector(Base.viewDidLoad)).map { _ in }
+        return ControlEvent(events: source)
+    }
+
+    var viewWillAppear: ControlEvent<Void> {
+        let source = self.methodInvoked(#selector(Base.viewWillAppear)).map { _ in }
+        return ControlEvent(events: source)
+    }
+
+    var viewDidAppear: ControlEvent<Bool> {
+        let source = self.methodInvoked(#selector(Base.viewDidAppear)).map { $0.first as? Bool ?? false }
+        return ControlEvent(events: source)
+    }
+
+    var viewWillDisappear: ControlEvent<Bool> {
+        let source = self.methodInvoked(#selector(Base.viewWillDisappear)).map { $0.first as? Bool ?? false }
+        return ControlEvent(events: source)
+    }
+
+    var viewDidDisappear: ControlEvent<Void> {
+        let source = self.methodInvoked(#selector(Base.viewDidDisappear)).map { _ in () }
+        return ControlEvent(events: source)
+    }
+}

News/Network/NetworkError.swift

@@ -16,9 +16,9 @@ enum SearchError: Int, Error {
 extension SearchError {
     var errorDescription: String {
         switch self {
-        case .badRequest: return "검색 API 요청에 오류가 있습니다. 요청 URL, 필수 요청 변수가 정확한지 확인 바랍니다"
+        case .badRequest: return "검색 API 요청에 오류가 있습니다.\n요청 URL, 변수가 정확한지 확인 바랍니다"
         case .invalidSearchApi: return "검색 API 대상에 오타가 없는지 확인해 보세요."
-        case .systemError: return "서버 내부 에러가 발생하였습니다. 포럼에 올려주시면 신속히 조치하겠습니다."
+        case .systemError: return "서버 내부 에러가 발생하였습니다.\n포럼에 올려주시면 신속히 조치하겠습니다."
         }
     }
 }

News/Presentations/NewsList/Coordinator/NewsListCoordinator.swift

@@ -0,0 +1,67 @@
+//
+//  NewsListCoordinator.swift
+//  News
+//
+//  Created by Sang hun Lee on 2022/07/08.
+//
+
+import UIKit
+
+final class NewsListCoordinator: Coordinator {
+    var delegate: CoordinatorDelegate?
+    var navigationController: UINavigationController
+    var childCoordinators = [Coordinator]()
+    var type: CoordinatorStyleCase = .news
+
+    init(_ navigationController: UINavigationController) {
+        self.navigationController = navigationController
+    }
+
+    func start() {
+        let vc = NewsListViewController(
+            viewModel: NewsListViewModel(
+                coordinator: self,
+                searchUseCase: SearchUseCase(
+                    repository: NewsSearchManager()
+                )
+            )
+        )
+        navigationController.pushViewController(vc, animated: true)
+    }
+
+    func pushNewsWebViewController(news: News, scrapedNews: ScrapedNews?) {
+        let vc = NewsWebViewController(
+            viewModel: NewsWebViewModel(
+                coordinator: self,
+                news: news,
+                scrapedNews: scrapedNews
+            )
+        )
+        vc.hidesBottomBarWhenPushed = true
+        navigationController.pushViewController(vc, animated: true)
+    }
+
+    func presentNewsTagmakerViewController(
+        tags: [String], newsTagmakerDelegate: NewsTagmakerDelegate
+    ) {
+        let vc = UINavigationController(
+            rootViewController: NewsTagmakerViewController(
+                viewModel: NewsTagmakerViewModel(
+                    coordinator: self,
+                    newsTagmakerDelegate: newsTagmakerDelegate,
+                    tags: tags
+                )
+            )
+        )
+        vc.modalPresentationStyle = .fullScreen
+        navigationController.present(vc, animated: true)
+    }
+
+    func dismissToNewsListViewController(message: String? = nil) {
+        navigationController.dismiss(animated: true) {
+            if let message = message {
+                self.navigationController.view.makeToast(message, position: .bottom)
+            }
+        }
+    }
+}