[MERGE] Coordinator Pattern 적용 (#139)

[REFACTOR] Coordinator Pattern 적용 (#139)

LionHeart-iOS/LionHeart-iOS/Application/SceneDelegate.swift

@@ -13,6 +13,7 @@ import KakaoSDKAuth
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
+    var appCoordinator: AppCoordinator?
 
     func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
         if let url = URLContexts.first?.url {
@@ -31,8 +32,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         self.window = UIWindow(windowScene: windowScene)
         /// 폰트등록
         Font.registerFonts()
-        let splashViewController = SplashViewController(manager: SplashManagerImpl(authService: AuthServiceImpl(apiService: APIService())))
-        let navigationController = UINavigationController(rootViewController: splashViewController)
+
+        let navigationController = UINavigationController()
+        appCoordinator = AppCoordinator(navigationController: navigationController)
+        appCoordinator?.start()
         self.window?.rootViewController = navigationController
         self.window?.makeKeyAndVisible()
     }

LionHeart-iOS/LionHeart-iOS/Global/Enums/TokenState.swift

@@ -0,0 +1,13 @@
+//
+//  TokenState.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+enum TokenState {
+    case valid
+    case expired
+}

LionHeart-iOS/LionHeart-iOS/Global/Enums/UserState.swift

@@ -0,0 +1,13 @@
+//
+//  UserState.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+enum UserState {
+    case verified
+    case nonVerified
+}

LionHeart-iOS/LionHeart-iOS/Global/Extensions/UIViewController+.swift

@@ -94,5 +94,6 @@ extension UIViewController {
         articleDetailViewController.isModalInPresentation = true
         articleDetailViewController.modalPresentationStyle = .fullScreen
         self.present(articleDetailViewController, animated: true)
+
     }
 }

LionHeart-iOS/LionHeart-iOS/Global/Protocols/Coordinator.swift

@@ -0,0 +1,31 @@
+//
+//  Coordinator.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/13.
+//
+
+import UIKit
+
+protocol Coordinator : AnyObject {
+    var parentCoordinator: Coordinator? { get set }
+    var children: [Coordinator] { get set }
+    var navigationController : UINavigationController { get set }
+
+    func start()
+}
+
+extension Coordinator {
+
+    /// Removing a coordinator inside a children. This call is important to prevent memory leak.
+    /// - Parameter coordinator: Coordinator that finished.
+    func childDidFinish(_ coordinator : Coordinator){
+        // Call this if a coordinator is done.
+        for (index, child) in children.enumerated() {
+            if child === coordinator {
+                children.remove(at: index)
+                break
+            }
+        }
+    }
+}

LionHeart-iOS/LionHeart-iOS/Global/UIComponents/LHNavigationBarView.swift

@@ -9,10 +9,8 @@ import UIKit
 
 final class LHNavigationBarView: UIView {
 
-    // MARK: - UI Components
     private let titleLabel = LHLabel(type: .head4, color: .white)
 
-
     private let leftBarItem: UIButton = {
         let button = UIButton()
         button.tintColor = .designSystem(.white)
@@ -49,8 +47,6 @@ final class LHNavigationBarView: UIView {
         return stackView
     }()
 
-    // MARK: - Properties
-
     private let type: LHNavigationType
 
     private weak var viewController: UIViewController?
@@ -77,15 +73,13 @@ final class LHNavigationBarView: UIView {
         self.backgroundColor = type.backgroundColor
     }
 
-    // MARK: - addsubView
     private func setHierarchy() {
         self.addSubviews(leftBarItem,
                          titleLabel,
                          rightBarItemsStackView,
                          graySepartorLine)
     }
 
-    // MARK: - autolayout설정
     private func setLayout() {
         self.snp.makeConstraints { make in
             make.height.equalTo(ScreenUtils.getHeight(60))
@@ -123,20 +117,11 @@ final class LHNavigationBarView: UIView {
         }
     }
 
-    // MARK: - Helpers
-
     private func setBackButtonWithTitle() {
         self.titleLabel.text = type.title
         self.leftBarItem.setImage(UIImage(systemName: "arrow.backward"), for: .normal)
-        if type == .onboarding {
-            self.leftBarItem.addButtonAction { _ in
-                self.backButtonActionHandler?()
-            }
-            return
-        }
-        self.leftBarItem.addButtonAction { [weak self] _ in
-            guard let self else { return }
-            self.viewController?.navigationController?.popViewController(animated: true)
+        self.leftBarItem.addButtonAction { _ in
+            self.backButtonActionHandler?()
         }
     }
 
@@ -165,10 +150,9 @@ final class LHNavigationBarView: UIView {
         self.leftBarItem.setImage(UIImage(systemName: "xmark"), for: .normal)
         self.leftBarItem.addButtonAction { [weak self] _ in
             guard let self else { return }
-            self.viewController?.dismiss(animated: true)
+            self.backButtonActionHandler?()
         }
     }
-
 }
 
 extension LHNavigationBarView {

LionHeart-iOS/LionHeart-iOS/Network/Manager/BookmarkMangerImpl.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-final class BookmarkMangerImpl: BookmarkManger {
+final class BookmarkMangerImpl: BookmarkManager {
 
     private let bookmarkService: BookmarkService
 

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/ArticleDetailManager.swift

@@ -0,0 +1,13 @@
+//
+//  ArticleDetailManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol ArticleDetailManager {
+    func getArticleDetail(articleId: Int) async throws -> [BlockTypeAppData]
+    func postBookmark(model: BookmarkRequest) async throws
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/ArticleListByCategoryManager.swift

@@ -0,0 +1,13 @@
+//
+//  ArticleListByCategoryManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol ArticleListByCategoryManager {
+    func getArticleListByCategory(categoryString: String) async throws -> CurriculumWeekData
+    func postBookmark(model: BookmarkRequest) async throws
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/BookmarkManager.swift

@@ -0,0 +1,13 @@
+//
+//  BookmarkManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol BookmarkManager {
+    func getBookmark() async throws -> BookmarkAppData
+    func postBookmark(model: BookmarkRequest) async throws
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/ChallengeManager.swift

@@ -0,0 +1,12 @@
+//
+//  ChallengeManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol ChallengeManager {
+    func inquireChallengeInfo() async throws -> ChallengeData
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/CurriculumListManager.swift

@@ -0,0 +1,13 @@
+//
+//  CurriculumListManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol CurriculumListManager {
+    func postBookmark(model: BookmarkRequest) async throws
+    func getArticleListByWeekInfo(week: Int) async throws -> CurriculumWeekData
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/CurriculumManager.swift

@@ -0,0 +1,12 @@
+//
+//  CurriculumManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol CurriculumManager {
+    func getCurriculumServiceInfo() async throws -> UserInfoData
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/LoginManager.swift

@@ -0,0 +1,12 @@
+//
+//  LoginManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol LoginManager {
+    func login(type: LoginType, kakaoToken: String) async throws
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/MyPageManager.swift

@@ -0,0 +1,14 @@
+//
+//  MyPageManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol MyPageManager {
+    func getMyPage() async throws -> BadgeProfileAppData
+    func resignUser() async throws
+    func logout(token: UserDefaultToken) async throws
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/OnboardingManager.swift

@@ -0,0 +1,12 @@
+//
+//  OnboardingManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol OnboardingManager {
+    func signUp(type: LoginType, onboardingModel: UserOnboardingModel) async throws
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/SplashManager.swift

@@ -0,0 +1,13 @@
+//
+//  SplashManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol SplashManager {
+    func reissueToken(token: Token) async throws -> Token?
+    func logout(token: UserDefaultToken) async throws
+}

LionHeart-iOS/LionHeart-iOS/Network/Manager/MangerInterface/TodayManager.swift

@@ -0,0 +1,12 @@
+//
+//  TodayManager.swift
+//  LionHeart-iOS
+//
+//  Created by uiskim on 2023/10/14.
+//
+
+import Foundation
+
+protocol TodayManager {
+    func inquiryTodayArticle() async throws -> TodayArticle
+}

LionHeart-iOS/LionHeart-iOS/Scenes/Article/ArticleCategory/ViewControllers/ArticleCategoryViewController.swift

@@ -10,7 +10,11 @@ import UIKit
 
 import SnapKit
 
+
+
 final class ArticleCategoryViewController: UIViewController {
+
+    weak var coordinator: ArticleCategoryNavigation?
 
     private lazy var navigationBar = LHNavigationBarView(type: .explore, viewController: self)
     private lazy var titleLabel = LHLabel(type: .head2, color: .white, lines: 2, basicText: "카테고리별\n아티클 모아보기")
@@ -67,13 +71,11 @@ private extension ArticleCategoryViewController {
 
     func setAddTarget() {
         navigationBar.rightFirstBarItemAction {
-            let bookmarkViewController = BookmarkViewController(manager: BookmarkMangerImpl(bookmarkService: BookmarkServiceImpl(apiService: APIService())))
-            self.navigationController?.pushViewController(bookmarkViewController, animated: true)
+            self.coordinator?.navigationLeftButtonTapped()
         }
 
         navigationBar.rightSecondBarItemAction {
-            let mypageViewController = MyPageViewController(manager: MyPageManagerImpl(mypageService: MyPageServiceImpl(apiService: APIService()), authService: AuthServiceImpl(apiService: APIService())))
-            self.navigationController?.pushViewController(mypageViewController, animated: true)
+            self.coordinator?.navigationRightButtonTapped()
         }
     }
 
@@ -108,9 +110,7 @@ extension ArticleCategoryViewController: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        let articleListbyCategoryViewController = ArticleListByCategoryViewController(manager: ArticleListByCategoryMangerImpl(articleService: ArticleServiceImpl(apiService: APIService()), bookmarkService: BookmarkServiceImpl(apiService: APIService())))
-        articleListbyCategoryViewController.categoryString = dummyCase[indexPath.item].categoryString
-        self.navigationController?.pushViewController(articleListbyCategoryViewController, animated: true)
+        coordinator?.articleListCellTapped(categoryName: dummyCase[indexPath.item].categoryString)
     }
 }
 

LionHeart-iOS/LionHeart-iOS/Scenes/Article/ArticleDetail/Cells/CopyRightTableViewCell.swift

@@ -16,7 +16,7 @@ final class CopyRightTableViewCell: UITableViewCell, TableViewCellRegisterDequeu
     private let copyrightLabel = LHLabel(type: .body4, color: .gray600, basicText: "모든 콘텐츠는 제공자와 라이온하트에 저작권이 있습니다.\n저작권법에 의거 무단 전재 및 재배포를 금지합니다.")
 
     //TODO: - inputData가 없는 경우..
-    var inputData: DummyModel?
+//    var inputData: DummyModel?
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)