🔀 :: (#530) 보관함탭을 ReactorKit으로 리팩합니다.

Projects/App/Sources/Application/AppComponent+Auth.swift

@@ -4,6 +4,7 @@ import BaseFeature
 import SignInFeature
 import SignInFeatureInterface
 import StorageFeature
+import StorageFeatureInterface
 
 // MARK: 변수명 주의
 // AppComponent 내 변수 == Dependency 내 변수  이름 같아야함
@@ -13,14 +14,10 @@ public extension AppComponent {
         SignInComponent(parent: self)
     }
 
-    var storageComponent: StorageComponent {
+    var storageFactory: any StorageFactory {
         StorageComponent(parent: self)
     }
 
-    var afterLoginComponent: AfterLoginComponent {
-        AfterLoginComponent(parent: self)
-    }
-
     var requestComponent: RequestComponent {
         RequestComponent(parent: self)
     }

Projects/App/Sources/Application/NeedleGenerated.swift

@@ -39,6 +39,7 @@ import SignInFeatureInterface
 import SongsDomain
 import SongsDomainInterface
 import StorageFeature
+import StorageFeatureInterface
 import UIKit
 import UserDomain
 import UserDomainInterface
@@ -177,8 +178,8 @@ private class MainTabBarDependencycd05b79389a6a7a6c20fProvider: MainTabBarDepend
     var artistComponent: ArtistComponent {
         return appComponent.artistComponent
     }
-    var storageComponent: StorageComponent {
-        return appComponent.storageComponent
+    var storageFactory: any StorageFactory {
+        return appComponent.storageFactory
     }
     var myInfoComponent: MyInfoComponent {
         return appComponent.myInfoComponent
@@ -325,8 +326,17 @@ private class StorageDependency1447167c38e97ef97427Provider: StorageDependency {
     var signInFactory: any SignInFactory {
         return appComponent.signInFactory
     }
-    var afterLoginComponent: AfterLoginComponent {
-        return appComponent.afterLoginComponent
+    var myPlayListComponent: MyPlayListComponent {
+        return appComponent.myPlayListComponent
+    }
+    var multiPurposePopUpFactory: any MultiPurposePopUpFactory {
+        return appComponent.multiPurposePopUpFactory
+    }
+    var favoriteComponent: FavoriteComponent {
+        return appComponent.favoriteComponent
+    }
+    var textPopUpFactory: any TextPopUpFactory {
+        return appComponent.textPopUpFactory
     }
     private let appComponent: AppComponent
     init(appComponent: AppComponent) {
@@ -391,6 +401,9 @@ private class MyPlayListDependency067bbf42b28f80e413acProvider: MyPlayListDepend
     var textPopUpFactory: any TextPopUpFactory {
         return appComponent.textPopUpFactory
     }
+    var signInFactory: any SignInFactory {
+        return appComponent.signInFactory
+    }
     private let appComponent: AppComponent
     init(appComponent: AppComponent) {
         self.appComponent = appComponent
@@ -400,40 +413,6 @@ private class MyPlayListDependency067bbf42b28f80e413acProvider: MyPlayListDepend
 private func factory51a57a92f76af93a9ec2f47b58f8f304c97af4d5(_ component: NeedleFoundation.Scope) -> AnyObject {
     return MyPlayListDependency067bbf42b28f80e413acProvider(appComponent: parent1(component) as! AppComponent)
 }
-private class AfterLoginDependencya880b76858e0a77ed700Provider: AfterLoginDependency {
-    var fetchUserInfoUseCase: any FetchUserInfoUseCase {
-        return appComponent.fetchUserInfoUseCase
-    }
-    var logoutUseCase: any LogoutUseCase {
-        return appComponent.logoutUseCase
-    }
-    var requestComponent: RequestComponent {
-        return appComponent.requestComponent
-    }
-    var profilePopComponent: ProfilePopComponent {
-        return appComponent.profilePopComponent
-    }
-    var myPlayListComponent: MyPlayListComponent {
-        return appComponent.myPlayListComponent
-    }
-    var multiPurposePopUpFactory: any MultiPurposePopUpFactory {
-        return appComponent.multiPurposePopUpFactory
-    }
-    var favoriteComponent: FavoriteComponent {
-        return appComponent.favoriteComponent
-    }
-    var textPopUpFactory: any TextPopUpFactory {
-        return appComponent.textPopUpFactory
-    }
-    private let appComponent: AppComponent
-    init(appComponent: AppComponent) {
-        self.appComponent = appComponent
-    }
-}
-/// ^->AppComponent->AfterLoginComponent
-private func factory6cc9c8141e04494113b8f47b58f8f304c97af4d5(_ component: NeedleFoundation.Scope) -> AnyObject {
-    return AfterLoginDependencya880b76858e0a77ed700Provider(appComponent: parent1(component) as! AppComponent)
-}
 private class FavoriteDependency8f7fd37aeb6f0e5d0e30Provider: FavoriteDependency {
     var containSongsFactory: any ContainSongsFactory {
         return appComponent.containSongsFactory
@@ -798,8 +777,7 @@ extension AppComponent: Registration {
         localTable["fetchLyricsUseCase-any FetchLyricsUseCase"] = { [unowned self] in self.fetchLyricsUseCase as Any }
         localTable["fetchNewSongsUseCase-any FetchNewSongsUseCase"] = { [unowned self] in self.fetchNewSongsUseCase as Any }
         localTable["signInFactory-any SignInFactory"] = { [unowned self] in self.signInFactory as Any }
-        localTable["storageComponent-StorageComponent"] = { [unowned self] in self.storageComponent as Any }
-        localTable["afterLoginComponent-AfterLoginComponent"] = { [unowned self] in self.afterLoginComponent as Any }
+        localTable["storageFactory-any StorageFactory"] = { [unowned self] in self.storageFactory as Any }
         localTable["requestComponent-RequestComponent"] = { [unowned self] in self.requestComponent as Any }
         localTable["localAuthDataSource-any LocalAuthDataSource"] = { [unowned self] in self.localAuthDataSource as Any }
         localTable["remoteAuthDataSource-any RemoteAuthDataSource"] = { [unowned self] in self.remoteAuthDataSource as Any }
@@ -930,7 +908,7 @@ extension MainTabBarComponent: Registration {
         keyPathToName[\MainTabBarDependency.chartComponent] = "chartComponent-ChartComponent"
         keyPathToName[\MainTabBarDependency.searchFactory] = "searchFactory-any SearchFactory"
         keyPathToName[\MainTabBarDependency.artistComponent] = "artistComponent-ArtistComponent"
-        keyPathToName[\MainTabBarDependency.storageComponent] = "storageComponent-StorageComponent"
+        keyPathToName[\MainTabBarDependency.storageFactory] = "storageFactory-any StorageFactory"
         keyPathToName[\MainTabBarDependency.myInfoComponent] = "myInfoComponent-MyInfoComponent"
         keyPathToName[\MainTabBarDependency.noticePopupComponent] = "noticePopupComponent-NoticePopupComponent"
         keyPathToName[\MainTabBarDependency.noticeComponent] = "noticeComponent-NoticeComponent"
@@ -986,7 +964,10 @@ extension ServiceInfoComponent: Registration {
 extension StorageComponent: Registration {
     public func registerItems() {
         keyPathToName[\StorageDependency.signInFactory] = "signInFactory-any SignInFactory"
-        keyPathToName[\StorageDependency.afterLoginComponent] = "afterLoginComponent-AfterLoginComponent"
+        keyPathToName[\StorageDependency.myPlayListComponent] = "myPlayListComponent-MyPlayListComponent"
+        keyPathToName[\StorageDependency.multiPurposePopUpFactory] = "multiPurposePopUpFactory-any MultiPurposePopUpFactory"
+        keyPathToName[\StorageDependency.favoriteComponent] = "favoriteComponent-FavoriteComponent"
+        keyPathToName[\StorageDependency.textPopUpFactory] = "textPopUpFactory-any TextPopUpFactory"
     }
 }
 extension FaqComponent: Registration {
@@ -1010,18 +991,7 @@ extension MyPlayListComponent: Registration {
         keyPathToName[\MyPlayListDependency.deletePlayListUseCase] = "deletePlayListUseCase-any DeletePlayListUseCase"
         keyPathToName[\MyPlayListDependency.logoutUseCase] = "logoutUseCase-any LogoutUseCase"
         keyPathToName[\MyPlayListDependency.textPopUpFactory] = "textPopUpFactory-any TextPopUpFactory"
-    }
-}
-extension AfterLoginComponent: Registration {
-    public func registerItems() {
-        keyPathToName[\AfterLoginDependency.fetchUserInfoUseCase] = "fetchUserInfoUseCase-any FetchUserInfoUseCase"
-        keyPathToName[\AfterLoginDependency.logoutUseCase] = "logoutUseCase-any LogoutUseCase"
-        keyPathToName[\AfterLoginDependency.requestComponent] = "requestComponent-RequestComponent"
-        keyPathToName[\AfterLoginDependency.profilePopComponent] = "profilePopComponent-ProfilePopComponent"
-        keyPathToName[\AfterLoginDependency.myPlayListComponent] = "myPlayListComponent-MyPlayListComponent"
-        keyPathToName[\AfterLoginDependency.multiPurposePopUpFactory] = "multiPurposePopUpFactory-any MultiPurposePopUpFactory"
-        keyPathToName[\AfterLoginDependency.favoriteComponent] = "favoriteComponent-FavoriteComponent"
-        keyPathToName[\AfterLoginDependency.textPopUpFactory] = "textPopUpFactory-any TextPopUpFactory"
+        keyPathToName[\MyPlayListDependency.signInFactory] = "signInFactory-any SignInFactory"
     }
 }
 extension FavoriteComponent: Registration {
@@ -1205,7 +1175,6 @@ private func registerProviderFactory(_ componentPath: String, _ factory: @escapi
     registerProviderFactory("^->AppComponent->FaqComponent", factory4e13cc6545633ffc2ed5f47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->QuestionComponent", factoryedad1813a36115eec11ef47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->MyPlayListComponent", factory51a57a92f76af93a9ec2f47b58f8f304c97af4d5)
-    registerProviderFactory("^->AppComponent->AfterLoginComponent", factory6cc9c8141e04494113b8f47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->FavoriteComponent", factory8e4acb90bd0d9b48604af47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->RequestComponent", factory13954fb3ec537bab80bcf47b58f8f304c97af4d5)
     registerProviderFactory("^->AppComponent->NoticeDetailComponent", factory3db143c2f80d621d5a7fe3b0c44298fc1c149afb)

Projects/Features/MainTabFeature/Sources/Components/MainTabBarComponent.swift

@@ -9,14 +9,15 @@ import NoticeDomainInterface
 import SearchFeature
 import SearchFeatureInterface
 import StorageFeature
+import StorageFeatureInterface
 
 public protocol MainTabBarDependency: Dependency {
     var fetchNoticeUseCase: any FetchNoticeUseCase { get }
     var homeComponent: HomeComponent { get }
     var chartComponent: ChartComponent { get }
     var searchFactory: any SearchFactory { get }
     var artistComponent: ArtistComponent { get }
-    var storageComponent: StorageComponent { get }
+    var storageFactory: any StorageFactory { get }
     var myInfoComponent: MyInfoComponent { get }
     var noticePopupComponent: NoticePopupComponent { get }
     var noticeComponent: NoticeComponent { get }
@@ -33,7 +34,7 @@ public final class MainTabBarComponent: Component<MainTabBarDependency> {
             chartComponent: self.dependency.chartComponent,
             searchFactory: self.dependency.searchFactory,
             artistComponent: self.dependency.artistComponent,
-            storageCompoent: self.dependency.storageComponent,
+            storageFactory: self.dependency.storageFactory,
             myInfoComponent: self.dependency.myInfoComponent,
             noticePopupComponent: self.dependency.noticePopupComponent,
             noticeComponent: self.dependency.noticeComponent,

Projects/Features/MainTabFeature/Sources/ViewControllers/MainTabBarViewController.swift

@@ -11,6 +11,7 @@ import SearchFeature
 import SearchFeatureInterface
 import SnapKit
 import StorageFeature
+import StorageFeatureInterface
 import UIKit
 import Utility
 
@@ -23,7 +24,7 @@ public final class MainTabBarViewController: BaseViewController, ViewControllerF
             chartComponent.makeView().wrapNavigationController,
             searchFactory.makeView().wrapNavigationController,
             artistComponent.makeView().wrapNavigationController,
-            storageComponent.makeView().wrapNavigationController,
+            storageFactory.makeView().wrapNavigationController,
             myInfoComponent.makeView().wrapNavigationController
         ]
     }()
@@ -37,7 +38,7 @@ public final class MainTabBarViewController: BaseViewController, ViewControllerF
     private var chartComponent: ChartComponent!
     private var searchFactory: SearchFactory!
     private var artistComponent: ArtistComponent!
-    private var storageComponent: StorageComponent!
+    private var storageFactory: StorageFactory!
     private var myInfoComponent: MyInfoComponent!
     private var noticePopupComponent: NoticePopupComponent!
     private var noticeComponent: NoticeComponent!
@@ -65,7 +66,7 @@ public final class MainTabBarViewController: BaseViewController, ViewControllerF
         chartComponent: ChartComponent,
         searchFactory: SearchFactory,
         artistComponent: ArtistComponent,
-        storageCompoent: StorageComponent,
+        storageFactory: StorageFactory,
         myInfoComponent: MyInfoComponent,
         noticePopupComponent: NoticePopupComponent,
         noticeComponent: NoticeComponent,
@@ -77,7 +78,7 @@ public final class MainTabBarViewController: BaseViewController, ViewControllerF
         viewController.chartComponent = chartComponent
         viewController.searchFactory = searchFactory
         viewController.artistComponent = artistComponent
-        viewController.storageComponent = storageCompoent
+        viewController.storageFactory = storageFactory
         viewController.myInfoComponent = myInfoComponent
         viewController.noticePopupComponent = noticePopupComponent
         viewController.noticeComponent = noticeComponent

Projects/Features/PlaylistFeature/Sources/Reactors/PlaylistDetailReactor.swift

@@ -189,7 +189,10 @@ private extension PlaylistDetailReactor {
 
     /// 순서 변경
     func updateOrder(src: Int, dest: Int) -> Observable<Mutation> {
-        var tmp = (currentState.dataSource.first ?? PlayListDetailSectionModel(model: 0, items: [])).items
+        guard var tmp = currentState.dataSource.first?.items else {
+            LogManager.printError("playlist detail datasource is empty")
+            return .empty()
+        }
         let target = tmp[src]
         tmp.remove(at: src)
         tmp.insert(target, at: dest)

Projects/Features/SignInFeature/Sources/ViewControllers/LoginViewController.swift

@@ -106,6 +106,108 @@ extension LoginViewController {
     }
 }
 
+extension LoginViewController {
+    public func configureUI() {
+        appLogoImageView.image = DesignSystemAsset.Logo.applogo.image
+        scrollView.verticalScrollIndicatorInsets = UIEdgeInsets(top: 0, left: 0, bottom: 56, right: 0)
+        configureOAuthLogin()
+        configureService()
+    }
+
+    private func configureOAuthLogin() {
+        let loginAttributedString: [NSMutableAttributedString] = [
+            NSMutableAttributedString.init(string: "네이버로 로그인하기"),
+            NSMutableAttributedString.init(string: "구글로 로그인하기"),
+            NSMutableAttributedString.init(string: "애플로 로그인하기")
+        ]
+
+        for attr in loginAttributedString {
+            attr.addAttributes(
+                [
+                    .font: DesignSystemFontFamily.Pretendard.medium.font(size: 16),
+                    .foregroundColor: DesignSystemAsset.GrayColor.gray900.color,
+                    .kern: -0.5
+                ],
+                range: NSRange(location: 0, length: attr.string.count)
+            )
+        }
+
+        let superViewArr: [UIView] = [naverSuperView, googleSuperView, appleSuperView]
+        for sv in superViewArr {
+            sv.backgroundColor = .white.withAlphaComponent(0.4)
+            sv.layer.cornerRadius = 12
+            sv.layer.borderColor = DesignSystemAsset.GrayColor.gray200.color.cgColor
+            sv.layer.borderWidth = 1
+        }
+
+        naverImageVIew.image = DesignSystemAsset.Signup.naver.image
+        naverLoginButton.setAttributedTitle(loginAttributedString[0], for: .normal)
+        googleImageView.image = DesignSystemAsset.Signup.google.image
+        googleLoginButton.setAttributedTitle(loginAttributedString[1], for: .normal)
+        appleImageView.image = DesignSystemAsset.Signup.apple.image
+        appleLoginButton.setAttributedTitle(loginAttributedString[2], for: .normal)
+    }
+
+    private func configureService() {
+        let appAttributedString = NSMutableAttributedString
+            .init(string: "왁타버스 뮤직")
+
+        appAttributedString.addAttributes(
+            [
+                .font: DesignSystemFontFamily.Pretendard.medium.font(size: 20),
+                .foregroundColor: DesignSystemAsset.GrayColor.gray900.color,
+                .kern: -0.5
+            ],
+            range: NSRange(location: 0, length: appAttributedString.string.count)
+        )
+        appNameLabel.attributedText = appAttributedString
+
+        let descriptionAttributedString = NSMutableAttributedString
+            .init(string: "페이지를 이용하기 위해 로그인이 필요합니다.")
+
+        descriptionAttributedString.addAttributes(
+            [
+                .font: DesignSystemFontFamily.Pretendard.light.font(size: 14),
+                .foregroundColor: DesignSystemAsset.GrayColor.gray600.color,
+                .kern: -0.5
+            ],
+            range: NSRange(location: 0, length: descriptionAttributedString.string.count)
+        )
+        descriptionLabel.attributedText = descriptionAttributedString
+
+        let servicePrivacyButtons: [UIButton] = [serviceButton, privacyButton]
+        let termsAttributedString: [NSMutableAttributedString] = [
+            NSMutableAttributedString.init(string: "서비스 이용약관"),
+            NSMutableAttributedString.init(string: "개인정보처리방침")
+        ]
+        for attr in termsAttributedString {
+            attr.addAttributes(
+                [
+                    .font: DesignSystemFontFamily.Pretendard.medium.font(size: 14),
+                    .foregroundColor: DesignSystemAsset.GrayColor.gray600.color,
+                    .kern: -0.5
+                ],
+                range: NSRange(location: 0, length: attr.string.count)
+            )
+        }
+        servicePrivacyButtons[0].setAttributedTitle(termsAttributedString[0], for: .normal)
+        servicePrivacyButtons[1].setAttributedTitle(termsAttributedString[1], for: .normal)
+
+        for btn in servicePrivacyButtons {
+            btn.layer.cornerRadius = 8
+            btn.layer.borderColor = DesignSystemAsset.GrayColor.gray300.color.cgColor
+            btn.layer.borderWidth = 1
+            btn.clipsToBounds = true
+        }
+
+        versionLabel.text = "버전 정보 " + APP_VERSION()
+        versionLabel.textColor = DesignSystemAsset.GrayColor.gray400.color
+        versionLabel.font = DesignSystemFontFamily.Pretendard.light.font(size: 12)
+        versionLabel.setTextWithAttributes(kernValue: -0.5)
+        versionLabel.textAlignment = .center
+    }
+}
+
 public extension LoginViewController {
     func scrollToTop() {
         scrollView.setContentOffset(.zero, animated: true)