🕶️:: Merge pull request #43 from LookMonster/refactoring/#42-appRefac…

…toring 파일 정리
LookMonster · Oct 10, 2023 · 58cbe6c · 58cbe6c
2 parents d41c290 + 927a4b2
commit 58cbe6c
Show file tree

Hide file tree

Showing 54 changed files with 61 additions and 685 deletions.
diff --git a/App/Project.swift b/App/Project.swift
@@ -23,38 +23,20 @@ let project = Project(
             sources: ["Sources/**"],
             resources: ["Resources/**"],
             dependencies: [
-                //                .ResourceKit.Implement,
-
                 .ThirdParty.SPM.RIBs,
-                //                .ThirdParty.RxRelay,
-                //                .ThirdParty.RxSwift,
 
                 .LKNetwork.Implement,
                 .LKNetwork.Interface,
 
-//                .ThirdParty.SPM.Swinject,
-
-//                .Feature.Finance.Data.Interface,
-//                .Feature.Finance.Domain.Interface,
-//                .Feature.Finance.UserInterface.Interface,
-//                
-//                .Feature.Finance.Data.Implement,
-//                .Feature.Finance.Domain.Implement,
-//                .Feature.Finance.UserInterface.Implement,
-
                 .Features.User.Profile.UserProfile.UserInterface.Interface,
                 .Features.User.Profile.UserProfile.UserInterface.Implement,
                 .Features.User.Profile.UserProfile.UserInterface.Interface,
 
 
                 .Features.User.Main.Home.UserInterface.Interface,
-
-//                .Feature.Transport.UserInterface.Interface,
-
+
                 .Features.User.Main.Home.UserInterface.Implement,
-
-//                .Feature.Transport.UserInterface.Implement,
-
+
                 //style
                 .Features.User.Main.Style.Domain.Implement,
                 .Features.User.Main.Style.Data.Implement,

diff --git a/App/Sources/AppRoot/AppRootComponent.swift b/App/Sources/AppRoot/AppRootComponent.swift
@@ -5,24 +5,12 @@ import RIBs
 import HomeUserInterface
 import HomeUserInterfaceImpl
 
-import FinanceUserInterface
-import FinanceUserInterfaceImpl
-
 import UserProfileUserInterface
 import UserProfileUserInterfaceImpl
 
 import StyleUserInterface
 import StyleUserInterfaceImpl
 
-import TransportUserInterface
-import TransportUserInterfaceImpl
-
-import FinanceData
-import FinanceDataImpl
-
-import FinanceDomain
-import FinanceDomainImpl
-
 import LKNetwork
 import LKNetworkImpl
 
@@ -32,32 +20,9 @@ import CommunityUserInterfaceImpl
 import ShopUserInterface
 import ShopUserInterfaceImpl
 
-final class AppRootComponent: Component<AppRootDependency>, AppHomeDependency, FinanceHomeDependency, UserProfileHomeDependency, TransportHomeDependency, TopupDependency, AddPaymentMethodDependency, StyleHomeDependency, CommunityDependency, ShopHomeDependency  {
-
-    var fetchBalanceUseCase: FetchBalanceUseCase
-    var fetchCardsUseCase: FetchCardsUseCase
-    var topupBalanceUseCase: TopupBalanceUseCase
-
+final class AppRootComponent: Component<AppRootDependency>, AppHomeDependency, UserProfileHomeDependency, StyleHomeDependency, CommunityDependency, ShopHomeDependency  {
 
-    var cardsOnFileRepository: CardOnFileRepository
-
-    var addPaymentMethodUseCase: AddPaymentMethodUseCase
-
-    var superPayRepository: SuperPayRepository
-
-    lazy var transportHomeBuildable: TransportHomeBuildable = {
-        return TransportHomeBuilder(dependency: self)
-    }()
-
-    lazy var topupBuildable: TopupBuildable = {
-        return TopupBuilder(dependency: self)
-    }()
-
-    lazy var addPaymentMethodBuildable: AddPaymentMethodBuildable = {
-       return AddPaymentMethodBuilder(dependency: self)
-    }()
-
-    var topupBaseViewController: ViewControllable { rootViewcontroller.topViewControllable }
+//    var topupBaseViewController: ViewControllable { rootViewcontroller.topViewControllable }
 
     private let rootViewcontroller: ViewControllable
 
@@ -72,24 +37,6 @@ final class AppRootComponent: Component<AppRootDependency>, AppHomeDependency, F
 
         let network = NetworkImp(session: URLSession(configuration: config))
 
-        cardsOnFileRepository = CardOnFileRepositoryImpl(
-            network: network,
-            baseURL: BaseURL().mainURL
-        )
-
-        self.cardsOnFileRepository.fetch()
-
-        self.superPayRepository = SuperPayRepositoryImpl(
-            network: network,
-            baseURL: BaseURL().mainURL
-        )
-
-        self.addPaymentMethodUseCase = AddPaymentMethodUseCaseImpl(cardOnFileRepository: cardsOnFileRepository)
-
-        self.fetchBalanceUseCase = FetchBalanceUseCaseImpl(superPayRepository: superPayRepository)
-        self.fetchCardsUseCase = FetchCardsUseCaseImpl(cardOnFileRepository: cardsOnFileRepository)
-        self.topupBalanceUseCase = TopupBalanceUseCaseImpl(superPayRepository: superPayRepository)
-
         self.rootViewcontroller = rootViewcontroller
         super.init(dependency: dependency)
     }

diff --git a/App/Sources/AppRoot/AppRootInteractor.swift b/App/Sources/AppRoot/AppRootInteractor.swift
@@ -15,6 +15,14 @@ protocol AppRootListener: AnyObject {
 }
 
 final class AppRootInteractor: PresentableInteractor<AppRootPresentable>, AppRootInteractable, AppRootPresentableListener, URLHandler {
+    func searchButtonTap() {
+
+    }
+
+    func penButtonTap() {
+
+    }
+
 
     func homeBackground() {
         print("나중에 지워야함")

diff --git a/App/Sources/AppRoot/AppRootRouter.swift b/App/Sources/AppRoot/AppRootRouter.swift
@@ -1,6 +1,6 @@
 import RIBs
 import RIBsUtil
-import FinanceUserInterface
+//import FinanceUserInterface
 import HomeUserInterface
 import UserProfileUserInterface
 import StyleUserInterface

diff --git a/Core/Project.swift b/Core/Project.swift
@@ -16,16 +16,13 @@ let project = Project(name: "Core",
                         Project.makeTarget(
                             name: "SuperUI",
                             dependencies: [
-//                                .ThirdParty.SPM.RIBs,
-//                                .ThirdParty.RxSwift,
                                 .Core.RIBsUtil,
                                 .ThirdParty.SPM.RxCocoa,
                                 .ThirdParty.SPM.RxSwift,
                                 .ThirdParty.SPM.RxBlocking,
                                 .ThirdParty.SPM.RxRelay,
                                 .ThirdParty.SPM.SnapKit,
                                 .ThirdParty.SPM.Then,
-//                                .ThirdParty.SPM.Kingfisher,
                                 .DesignSystem.Implement,
                                 .ThirdParty.SPM.Swinject
                             ]
@@ -34,8 +31,6 @@ let project = Project(name: "Core",
                             name: "RIBsUtil",
                             dependencies: [
                                 .ThirdParty.SPM.RIBs,
-//                                .ThirdParty.RxSwift,
-//                                .ThirdParty.SPM.Swinject
                             ]
                         )
                       ])
diff --git a/DesignSystem/Project.swift b/DesignSystem/Project.swift
@@ -12,11 +12,6 @@ import UtilityPlugin
 
 let project = Project(
     name: "DesignSystem",
-//    organizationName: "com.monster.lookMonster",
-//    settings: .settings(configurations: [
-//        .debug(name: "Debug", xcconfig: .relativeToRoot("Config/Debug.xcconfig")),
-//        .release(name: "Release", xcconfig: .relativeToRoot("Config/Release.xcconfig")),
-//    ]),
     targets: [
         Target(
             name: "DesignSystem",
@@ -30,14 +25,11 @@ let project = Project(
             infoPlist: .default,
             sources: ["Sources/**"],
             dependencies: [
-//                .ThirdParty.SPM.SnapKit,
+                .ThirdParty.SPM.SnapKit,
                 .ThirdParty.SPM.Then,
                 .ResourceKit.Implement,
                 .ThirdParty.SPM.RxCocoa,
-                .ThirdParty.SPM.RxSwift,
-//                .ThirdParty.SPM.Kingfisher,
-//                .ThirdParty.SPM.Swinject,
-//                .ThirdParty.SPM.SkeletonView
+                .ThirdParty.SPM.RxSwift
             ]),
         Target(
             name: "DesignSystemDemoApp",
@@ -62,14 +54,11 @@ let project = Project(
             dependencies:
                 [
                     .target(name: "DesignSystem"),
-//                    .ThirdParty.SPM.SnapKit,
+                    .ThirdParty.SPM.SnapKit,
                     .ThirdParty.SPM.Then,
                     .ResourceKit.Implement,
                     .ThirdParty.SPM.RxCocoa,
-                    .ThirdParty.SPM.RxSwift,
-//                    .ThirdParty.SPM.Kingfisher,
-//                    .ThirdParty.SPM.Swinject,
-//                    .ThirdParty.SPM.SkeletonView
+                    .ThirdParty.SPM.RxSwift
                 ]
         )
 

diff --git a/DesignSystem/Sources/MonsterPhoto/Monster+PhotoView.swift b/DesignSystem/Sources/MonsterPhoto/Monster+PhotoView.swift
@@ -1,5 +1,4 @@
 import UIKit
-import Kingfisher
 import SnapKit
 import RxCocoa
 import RxSwift

diff --git a/DesignSystem/Sources/MonsterProfile/Monster+ProfileView.swift b/DesignSystem/Sources/MonsterProfile/Monster+ProfileView.swift
@@ -1,5 +1,4 @@
 import UIKit
-import Kingfisher
 import SnapKit
 import RxCocoa
 import RxSwift

diff --git a/Features/User/Auth/Login/LoginData/Project.swift b/Features/User/Auth/Login/LoginData/Project.swift
@@ -8,19 +8,8 @@ let project = Project.invertedDualTargetProject(
     iOSTargetVersion: "15.0.0",
     interfaceDependencies: [
         .LKNetwork.Interface,
-
-//        .ThirdParty.SPM.RxSwift,
-//        .ThirdParty.SPM.RxRelay,
-
-//        .Feature.Finance.Domain.Interface,
-
     ],
     implementDependencies: [
-        .LKNetwork.Interface,
-
-//        .ThirdParty.SPM.RxSwift,
-//        .ThirdParty.SPM.RxRelay,
-
-//        .Feature.Finance.Domain.Interface,
+        .LKNetwork.Interface
     ]
 )
diff --git a/Features/User/Auth/Login/LoginDomain/Project.swift b/Features/User/Auth/Login/LoginDomain/Project.swift
@@ -7,10 +7,8 @@ let project = Project.invertedDualTargetProject(
     platform: .iOS,
     iOSTargetVersion: "15.0.0",
     interfaceDependencies: [
-//        .ThirdParty.SPM.RxSwift,
     ],
     implementDependencies: [
-//        .ThirdParty.SPM.RxSwift,
         .TokenManager.Interface
     ]
 )
diff --git a/Features/User/Auth/Login/LoginUserInterface/Project.swift b/Features/User/Auth/Login/LoginUserInterface/Project.swift
@@ -7,28 +7,19 @@ let project = Project.invertedDualTargetProjectWithDemoApp(
     platform: .iOS,
     iOSTargetVersion: "15.0.0",
     interfaceDependencies: [
-//        .Feature.Finance.Domain.Interface,
-
         .Core.RIBsUtil,
         .TokenManager.Interface
     ],
     implementDependencies: [
-//        .Feature.Finance.Domain.Interface,
-//        .Feature.Finance.Data.Interface,
-
         .Core.SuperUI,
         .Core.DefaultsStore,
 
-//        .ThirdParty.SPM.RxSwift,
-//        .ThirdParty.SPM.RxRelay,
-//        .ThirdParty.SPM.SnapKit,
-//        .ThirdParty.SPM.Swinject,
         .DesignSystem.Implement
     ],
     demoAppDependencies: [
         .Features.User.Auth.Login.Data.Implement,
         .Features.User.Auth.Login.Domain.Implement,
-//        .ThirdParty.SPM.Swinject,
+
         .LKNetwork.Implement,
         .TokenManager.Implement
     ],

diff --git a/Features/User/Auth/SignUp/SignUpData/Project.swift b/Features/User/Auth/SignUp/SignUpData/Project.swift
@@ -7,20 +7,9 @@ let project = Project.invertedDualTargetProject(
     platform: .iOS,
     iOSTargetVersion: "15.0.0",
     interfaceDependencies: [
-        .LKNetwork.Interface,
-
-//        .ThirdParty.SPM.RxSwift,
-//        .ThirdParty.SPM.RxRelay,
-
-//        .Feature.Finance.Domain.Interface,
-
+        .LKNetwork.Interface
     ],
     implementDependencies: [
-        .LKNetwork.Interface,
-
-//        .ThirdParty.SPM.RxSwift,
-//        .ThirdParty.SPM.RxRelay,
-
-//        .Feature.Finance.Domain.Interface,
+        .LKNetwork.Interface
     ]
 )
diff --git a/Features/User/Auth/SignUp/SignUpDomain/Project.swift b/Features/User/Auth/SignUp/SignUpDomain/Project.swift
@@ -6,12 +6,8 @@ let project = Project.invertedDualTargetProject(
     name: "signUpDomain",
     platform: .iOS,
     iOSTargetVersion: "15.0.0",
-    interfaceDependencies: [
-//        .ThirdParty.SPM.RxSwift,
-    ],
+    interfaceDependencies: [],
     implementDependencies: [
-//        .ThirdParty.SPM.RxSwift,
-//        .Feature.Finance.Data.Interface,
         .TokenManager.Interface
     ]
 )
diff --git a/Features/User/Auth/SignUp/SignUpUserInterface/Project.swift b/Features/User/Auth/SignUp/SignUpUserInterface/Project.swift
@@ -7,20 +7,12 @@ let project = Project.invertedDualTargetProjectWithDemoApp(
     platform: .iOS,
     iOSTargetVersion: "15.0.0",
     interfaceDependencies: [
-//        .Feature.Finance.Domain.Interface,
-
         .Core.RIBsUtil,
         .TokenManager.Interface
     ],
     implementDependencies: [
-//        .Feature.Finance.Domain.Interface,
-//        .Feature.Finance.Data.Interface,
-
         .Core.SuperUI,
         .Core.DefaultsStore,
-//        .ThirdParty.SPM.RxSwift,
-//        .ThirdParty.SPM.RxRelay,
-//        .ThirdParty.SPM.SnapKit,
         .DesignSystem.Implement
     ]
 )

diff --git a/Features/User/Main/Community/CommunityData/Project.swift b/Features/User/Main/Community/CommunityData/Project.swift
@@ -6,9 +6,7 @@ let project = Project.invertedDualTargetProject(
     name: "CommunityData",
     platform: .iOS,
     iOSTargetVersion: "15.0.0",
-    interfaceDependencies: [
-    ],
-    implementDependencies: [
-    ]
+    interfaceDependencies: [],
+    implementDependencies: []
 )
 
diff --git a/Features/User/Main/Community/CommunityDomain/Project.swift b/Features/User/Main/Community/CommunityDomain/Project.swift
@@ -6,10 +6,7 @@ let project = Project.invertedDualTargetProject(
     name: "CommunityDomain",
     platform: .iOS,
     iOSTargetVersion: "15.0.0",
-    interfaceDependencies: [
-//        .ThirdParty.SPM.RxSwift,
-    ],
-    implementDependencies: [
-    ]
+    interfaceDependencies: [],
+    implementDependencies: []
 )
 
diff --git a/...ityUserInterface/Implement/AppCommunityImpl/Views/Community/CommunityViewController.swift b/...ityUserInterface/Implement/AppCommunityImpl/Views/Community/CommunityViewController.swift
@@ -5,7 +5,6 @@ import Then
 import RxCocoa
 import SuperUI
 import RxSwift
-import Kingfisher
 import SuperUI
 import DesignSystem
 import ResourceKit

diff --git a/...mmunityUserInterface/Implement/AppCommunityImpl/Views/Popular/PopularViewController.swift b/...mmunityUserInterface/Implement/AppCommunityImpl/Views/Popular/PopularViewController.swift
@@ -5,7 +5,6 @@ import CommunityUserInterface
 import RxSwift
 import RxCocoa
 import SuperUI
-import SkeletonView
 
 class PopularViewController: BaseViewController,
                              UICollectionViewDelegateFlowLayout,