[refactor] #133 Feature 내 Dependency 수정

YAPP-Github · Oct 2, 2024 · fbac2fe · fbac2fe
1 parent 9a5ea7d
commit fbac2fe
Show file tree

Hide file tree

Showing 22 changed files with 86 additions and 63 deletions.
diff --git a/Projects/App/Sources/AppDelegate/AppDelegateFeature.swift b/Projects/App/Sources/AppDelegate/AppDelegateFeature.swift
@@ -14,9 +14,9 @@ import KakaoSDKCommon
 
 @Reducer
 public struct AppDelegateFeature {
-    @Dependency(\.userNotifications) var userNotifications
-    @Dependency(\.remoteNotifications.register) var registerForRemoteNotifications
-    @Dependency(\.userDefaults) var userDefaults
+    @Dependency(UserNotificationClient.self) var userNotifications
+    @Dependency(RemoteNotificationsClient.self) var registerForRemoteNotifications
+    @Dependency(UserDefaultsClient.self) var userDefaults
 
     @ObservableState
     public struct State {
@@ -64,7 +64,7 @@ public struct AppDelegateFeature {
                                 else { return }
                             default: return
                             }
-                            await self.registerForRemoteNotifications()
+                            await self.registerForRemoteNotifications.register()
                         }
                     }
                 }

diff --git a/Projects/App/Sources/Intro/IntroFeature.swift b/Projects/App/Sources/Intro/IntroFeature.swift
@@ -11,7 +11,7 @@ import FeatureLogin
 @Reducer
 public struct IntroFeature {
     /// - Dependency
-    @Dependency(\.userDefaults) var userDefaults
+    @Dependency(UserDefaultsClient.self) var userDefaults
     /// - State
     @ObservableState
     public enum State {

diff --git a/Projects/App/Sources/MainTab/MainTabFeature.swift b/Projects/App/Sources/MainTab/MainTabFeature.swift
@@ -17,11 +17,11 @@ import CoreKit
 @Reducer
 public struct MainTabFeature {
     /// - Dependency
-    @Dependency(\.pasteboard)
+    @Dependency(PasteboardClient.self)
     private var pasteBoard
-    @Dependency(\.categoryClient)
+    @Dependency(CategoryClient.self)
     private var categoryClient
-    @Dependency(\.userDefaults)
+    @Dependency(UserDefaultsClient.self)
     private var userDefaults
     /// - State
     @ObservableState

diff --git a/Projects/App/Sources/Root/RootFeature.swift b/Projects/App/Sources/Root/RootFeature.swift
@@ -12,8 +12,8 @@ import CoreKit
 
 @Reducer
 public struct RootFeature {
-    @Dependency(\.userDefaults) var userDefaults
-    @Dependency(\.userClient) var userClient
+    @Dependency(UserDefaultsClient.self) var userDefaults
+    @Dependency(UserClient.self) var userClient
     @Reducer(state: .equatable)
     public enum Destination {
 

diff --git a/Projects/App/Sources/Splash/SplashFeature.swift b/Projects/App/Sources/Splash/SplashFeature.swift
@@ -13,10 +13,14 @@ import Util
 @Reducer
 public struct SplashFeature {
     /// - Dependency
-    @Dependency(\.continuousClock) var clock
-    @Dependency(\.userDefaults) var userDefaults
-    @Dependency(\.authClient) var authClient
-    @Dependency(\.keychain) var keychain
+    @Dependency(\.continuousClock) 
+    var clock
+    @Dependency(UserDefaultsClient.self) 
+    var userDefaults
+    @Dependency(AuthClient.self) 
+    var authClient
+    @Dependency(KeychainClient.self)
+    var keychain
     /// - State
     @ObservableState
     public struct State: Equatable {

diff --git a/Projects/CoreKit/Sources/CoreNetwork/TokenInterceptor.swift b/Projects/CoreKit/Sources/CoreNetwork/TokenInterceptor.swift
@@ -13,8 +13,8 @@ import Dependencies
 /// AccessToken값을 헤더에 넣어주거나, refreshToken으로 Intercept해주는 Interceptor
 public final class TokenInterceptor: RequestInterceptor {
 
-    @Dependency(\.keychain) var keychain
-    @Dependency(\.authClient) var authClient
+    @Dependency(KeychainClient.self) var keychain
+    @Dependency(AuthClient.self) var authClient
 
     static let shared = TokenInterceptor()
     private init() {}

diff --git a/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift b/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift
@@ -17,13 +17,13 @@ public struct CategoryDetailFeature {
     /// - Dependency
     @Dependency(\.dismiss)
     private var dismiss
-    @Dependency(\.pasteboard)
+    @Dependency(PasteboardClient.self)
     private var pasteboard
-    @Dependency(\.categoryClient)
+    @Dependency(CategoryClient.self)
     private var categoryClient
-    @Dependency(\.contentClient)
+    @Dependency(ContentClient.self)
     private var contentClient
-    @Dependency(\.kakaoShareClient)
+    @Dependency(KakaoShareClient.self)
     private var kakaoShareClient
     /// - State
     @ObservableState

diff --git a/Projects/Feature/FeatureCategorySetting/Sources/PokitCategorySettingFeature.swift b/Projects/Feature/FeatureCategorySetting/Sources/PokitCategorySettingFeature.swift
@@ -18,9 +18,12 @@ import Util
 @Reducer
 public struct PokitCategorySettingFeature {
     /// - Dependency
-    @Dependency(\.dismiss) var dismiss
-    @Dependency(\.pasteboard) var pasteboard
-    @Dependency(\.categoryClient) var categoryClient
+    @Dependency(\.dismiss) 
+    var dismiss
+    @Dependency(PasteboardClient.self) 
+    var pasteboard
+    @Dependency(CategoryClient.self) 
+    var categoryClient
     /// - State
     @ObservableState
     public struct State: Equatable {

diff --git a/Projects/Feature/FeatureCategorySharing/Sources/CategorySharing/CategorySharingFeature.swift b/Projects/Feature/FeatureCategorySharing/Sources/CategorySharing/CategorySharingFeature.swift
@@ -16,9 +16,9 @@ public struct CategorySharingFeature {
     /// - Dependency
     @Dependency(\.dismiss)
     private var dismiss
-    @Dependency(\.categoryClient)
+    @Dependency(CategoryClient.self)
     private var categoryClient
-    @Dependency(\.contentClient)
+    @Dependency(ContentClient.self)
     private var contentClient
 
     /// - State

diff --git a/Projects/Feature/FeatureContentDetail/Sources/ContentDetail/ContentDetailFeature.swift b/Projects/Feature/FeatureContentDetail/Sources/ContentDetail/ContentDetailFeature.swift
@@ -15,11 +15,11 @@ import DSKit
 @Reducer
 public struct ContentDetailFeature {
     /// - Dependency
-    @Dependency(\.swiftSoup)
-    private var swiftSoup
     @Dependency(\.dismiss)
     private var dismiss
-    @Dependency(\.contentClient)
+    @Dependency(SwiftSoupClient.self)
+    private var swiftSoup
+    @Dependency(ContentClient.self)
     private var contentClient
     /// - State
     @ObservableState

diff --git a/Projects/Feature/FeatureContentList/Sources/ContentList/ContentListFeature.swift b/Projects/Feature/FeatureContentList/Sources/ContentList/ContentListFeature.swift
@@ -17,11 +17,11 @@ public struct ContentListFeature {
     /// - Dependency
     @Dependency(\.dismiss)
     private var dismiss
-    @Dependency(\.pasteboard)
+    @Dependency(PasteboardClient.self)
     private var pasteBoard
-    @Dependency(\.remindClient)
+    @Dependency(RemindClient.self)
     private var remindClient
-    @Dependency(\.contentClient)
+    @Dependency(ContentClient.self)
     private var contentClient
     /// - State
     @ObservableState

diff --git a/Projects/Feature/FeatureContentSetting/Sources/ContentSetting/ContentSettingFeature.swift b/Projects/Feature/FeatureContentSetting/Sources/ContentSetting/ContentSettingFeature.swift
@@ -18,13 +18,13 @@ public struct ContentSettingFeature {
     /// - Dependency
     @Dependency(\.dismiss)
     private var dismiss
-    @Dependency(\.swiftSoup)
+    @Dependency(SwiftSoupClient.self)
     private var swiftSoup
-    @Dependency(\.pasteboard)
+    @Dependency(PasteboardClient.self)
     private var pasteboard
-    @Dependency(\.contentClient)
+    @Dependency(ContentClient.self)
     private var contentClient
-    @Dependency(\.categoryClient)
+    @Dependency(CategoryClient.self)
     private var categoryClient
     /// - State
     @ObservableState

diff --git a/Projects/Feature/FeatureLogin/Sources/Login/LoginFeature.swift b/Projects/Feature/FeatureLogin/Sources/Login/LoginFeature.swift
@@ -11,12 +11,18 @@ import Util
 @Reducer
 public struct LoginFeature {
     /// - Dependency
-    @Dependency(\.dismiss) var dismiss
-    @Dependency(\.socialLogin) var socialLogin
-    @Dependency(\.authClient) var authClient
-    @Dependency(\.userClient) var userClient
-    @Dependency(\.userDefaults) var userDefaults
-    @Dependency(\.keychain) var keychain
+    @Dependency(\.dismiss) 
+    var dismiss
+    @Dependency(SocialLoginClient.self) 
+    var socialLogin
+    @Dependency(AuthClient.self)
+    var authClient
+    @Dependency(UserClient.self) 
+    var userClient
+    @Dependency(UserDefaultsClient.self) 
+    var userDefaults
+    @Dependency(KeychainClient.self)
+    var keychain
     /// - State
     @ObservableState
     public struct State {

diff --git a/Projects/Feature/FeatureLogin/Sources/RegisterNickname/RegisterNicknameFeature.swift b/Projects/Feature/FeatureLogin/Sources/RegisterNickname/RegisterNicknameFeature.swift
@@ -14,8 +14,8 @@ import Util
 public struct RegisterNicknameFeature {
     /// - Dependency
     @Dependency(\.dismiss) var dismiss
-    @Dependency(\.userClient) var userClient
     @Dependency(\.mainQueue) var mainQueue
+    @Dependency(UserClient.self) var userClient
     /// - State
     @ObservableState
     public struct State: Equatable {

diff --git a/Projects/Feature/FeatureLogin/Sources/SelectField/SelectFieldFeature.swift b/Projects/Feature/FeatureLogin/Sources/SelectField/SelectFieldFeature.swift
@@ -13,7 +13,7 @@ import Util
 public struct SelectFieldFeature {
     /// - Dependency
     @Dependency(\.dismiss) var dismiss
-    @Dependency(\.userClient) var userClient
+    @Dependency(UserClient.self) var userClient
     /// - State
     @ObservableState
     public struct State: Equatable {

diff --git a/Projects/Feature/FeaturePokit/Sources/PokitRootFeature.swift b/Projects/Feature/FeaturePokit/Sources/PokitRootFeature.swift
@@ -15,11 +15,11 @@ import Util
 @Reducer
 public struct PokitRootFeature {
     /// - Dependency
-    @Dependency(\.categoryClient)
+    @Dependency(CategoryClient.self)
     private var categoryClient
-    @Dependency(\.contentClient)
+    @Dependency(ContentClient.self)
     private var contentClient
-    @Dependency(\.kakaoShareClient)
+    @Dependency(KakaoShareClient.self)
     private var kakaoShareClient
     /// - State
     @ObservableState

diff --git a/Projects/Feature/FeatureRemind/Sources/Remind/RemindFeature.swift b/Projects/Feature/FeatureRemind/Sources/Remind/RemindFeature.swift
@@ -17,9 +17,9 @@ public struct RemindFeature {
     /// - Dependency
     @Dependency(\.dismiss)
     private var dismiss
-    @Dependency(\.remindClient)
+    @Dependency(RemindClient.self)
     private var remindClient
-    @Dependency(\.contentClient)
+    @Dependency(ContentClient.self)
     private var contentClient
 
     /// - State

diff --git a/Projects/Feature/FeatureSetting/Sources/Alert/PokitAlertBoxFeature.swift b/Projects/Feature/FeatureSetting/Sources/Alert/PokitAlertBoxFeature.swift
@@ -14,9 +14,12 @@ import CoreKit
 @Reducer
 public struct PokitAlertBoxFeature {
     /// - Dependency
-    @Dependency(\.dismiss) var dismiss
-    @Dependency(\.pasteboard) var pasteboard
-    @Dependency(\.alertClient) var alertClient
+    @Dependency(\.dismiss) 
+    var dismiss
+    @Dependency(PasteboardClient.self) 
+    var pasteboard
+    @Dependency(AlertClient.self) 
+    var alertClient
     /// - State
     @ObservableState
     public struct State: Equatable {

diff --git a/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchFeature.swift b/Projects/Feature/FeatureSetting/Sources/Search/PokitSearchFeature.swift
@@ -19,11 +19,11 @@ public struct PokitSearchFeature {
     private var dismiss
     @Dependency(\.mainQueue)
     private var mainQueue
-    @Dependency(\.pasteboard)
+    @Dependency(PasteboardClient.self)
     private var pasteboard
-    @Dependency(\.userDefaults)
+    @Dependency(UserDefaultsClient.self)
     private var userDefaults
-    @Dependency(\.contentClient)
+    @Dependency(ContentClient.self)
     private var contentClient
     /// - State
     @ObservableState

diff --git a/Projects/Feature/FeatureSetting/Sources/Search/Sheet/FilterBottomFeature.swift b/Projects/Feature/FeatureSetting/Sources/Search/Sheet/FilterBottomFeature.swift
@@ -16,7 +16,7 @@ public struct FilterBottomFeature {
     /// - Dependency
     @Dependency(\.dismiss)
     private var dismiss
-    @Dependency(\.categoryClient)
+    @Dependency(CategoryClient.self)
     private var categoryClient
     /// - State
     @ObservableState

diff --git a/Projects/Feature/FeatureSetting/Sources/Setting/NickNameSetting/NickNameSettingFeature.swift b/Projects/Feature/FeatureSetting/Sources/Setting/NickNameSetting/NickNameSettingFeature.swift
@@ -14,8 +14,8 @@ import Util
 public struct NickNameSettingFeature {
     /// - Dependency
     @Dependency(\.dismiss) var dismiss
-    @Dependency(\.userClient) var userClient
     @Dependency(\.mainQueue) var mainQueue
+    @Dependency(UserClient.self) var userClient
     /// - State
     @ObservableState
     public struct State: Equatable {

diff --git a/Projects/Feature/FeatureSetting/Sources/Setting/PokitSettingFeature.swift b/Projects/Feature/FeatureSetting/Sources/Setting/PokitSettingFeature.swift
@@ -13,13 +13,20 @@ import Util
 @Reducer
 public struct PokitSettingFeature {
     /// - Dependency
-    @Dependency(\.dismiss) var dismiss
-    @Dependency(\.openSettings) var openSetting
-    @Dependency(\.pasteboard) var pasteboard
-    @Dependency(\.keychain) var keychain
-    @Dependency(\.userDefaults) var userDefaults
-    @Dependency(\.authClient) var authClient
-    @Dependency(\.openURL) var openURL
+    @Dependency(\.dismiss) 
+    var dismiss
+    @Dependency(\.openURL)
+    var openURL
+    @Dependency(\.openSettings)
+    var openSetting
+    @Dependency(PasteboardClient.self)
+    var pasteboard
+    @Dependency(KeychainClient.self)
+    var keychain
+    @Dependency(UserDefaultsClient.self) 
+    var userDefaults
+    @Dependency(AuthClient.self)
+    var authClient
     /// - State
     @ObservableState
     public struct State: Equatable {