refactor: iOS 17부터 지원하는 Observable 매크로를 채택하여 StateObject, EnvironmentObject 및 Published 대체

opficdev · opficdev · commit 415fdf1345a7 · 2026-03-03T21:05:36.000+09:00
diff --git a/DevLog/App/RootView.swift b/DevLog/App/RootView.swift
@@ -9,7 +9,7 @@ import SwiftUI
 
 struct RootView: View {
     @Environment(\.diContainer) var container: DIContainer
-    @StateObject var viewModel: RootViewModel
+    @State var viewModel: RootViewModel
 
     var body: some View {
         ZStack {
diff --git a/DevLog/Presentation/Protocol/Store.swift b/DevLog/Presentation/Protocol/Store.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 @MainActor
-protocol Store: ObservableObject {
+protocol Store: AnyObject {
     associatedtype State
     associatedtype Action
     associatedtype SideEffect
diff --git a/DevLog/Presentation/ViewModel/AccountViewModel.swift b/DevLog/Presentation/ViewModel/AccountViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class AccountViewModel: Store {
     struct State {
         var currentProvider: AuthProvider?
@@ -47,7 +48,7 @@ final class AccountViewModel: Store {
         case unlinkSuccess
     }
 
-    @Published private(set) var state: State = .init()
+    private(set) var state: State = .init()
     private let fetchProvidersUseCase: FetchAuthProvidersUseCase
     private let linkProviderUseCase: LinkAuthProviderUseCase
     private let unlinkProviderUseCase: UnlinkAuthProviderUseCase
diff --git a/DevLog/Presentation/ViewModel/HomeViewModel.swift b/DevLog/Presentation/ViewModel/HomeViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class HomeViewModel: Store {
     struct State: Equatable {
         var todoKindPreferences = TodoKind.allCases.map { TodoKindPreference(kind: $0, isVisible: true) }
@@ -81,7 +82,7 @@ final class HomeViewModel: Store {
         case urlInputAlert
     }
 
-    @Published private(set) var state = State()
+    private(set) var state = State()
     private let upsertTodoUseCase: UpsertTodoUseCase
     private let addWebPageUseCase: AddWebPageUseCase
     private let deleteWebPageUseCase: DeleteWebPageUseCase
diff --git a/DevLog/Presentation/ViewModel/LoginViewModel.swift b/DevLog/Presentation/ViewModel/LoginViewModel.swift
@@ -10,6 +10,7 @@ import Foundation
 import FirebaseAuth
 import GoogleSignIn
 
+@Observable
 final class LoginViewModel: Store {
     struct State {
         var signIn: Bool?
@@ -37,7 +38,7 @@ final class LoginViewModel: Store {
     private let signOutUseCase: SignOutUseCase
     private let sessionUseCase: AuthSessionUseCase
 
-    @Published private(set) var state = State()
+    private(set) var state = State()
     private var cancellables = Set<AnyCancellable>()
 
     init(
diff --git a/DevLog/Presentation/ViewModel/ProfileViewModel.swift b/DevLog/Presentation/ViewModel/ProfileViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class ProfileViewModel: Store {
     struct State {
         var name: String = ""
@@ -51,7 +52,7 @@ final class ProfileViewModel: Store {
         case updateHeatmapActivityTypes(Set<ProfileActivityType>)
     }
 
-    @Published private(set) var state = State()
+    private(set) var state = State()
     private let fetchUserDataUseCase: FetchUserDataUseCase
     private let fetchTodosUseCase: FetchTodosUseCase
     private let upsertStatusMessageUseCase: UpsertStatusMessageUseCase
diff --git a/DevLog/Presentation/ViewModel/PushNotificationListViewModel.swift b/DevLog/Presentation/ViewModel/PushNotificationListViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class PushNotificationListViewModel: Store {
     struct State {
         var notifications: [PushNotificationItem] = []
@@ -50,7 +51,7 @@ final class PushNotificationListViewModel: Store {
         case toggleRead(String)
     }
 
-    @Published private(set) var state: State
+    private(set) var state: State
     private let fetchUseCase: FetchPushNotificationsUseCase
     private let deleteUseCase: DeletePushNotificationUseCase
     private let toggleReadUseCase: TogglePushNotificationReadUseCase
diff --git a/DevLog/Presentation/ViewModel/PushNotificationSettingsViewModel.swift b/DevLog/Presentation/ViewModel/PushNotificationSettingsViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class PushNotificationSettingsViewModel: Store {
     struct State {
         var pushNotificationEnable: Bool = false
@@ -45,7 +46,7 @@ final class PushNotificationSettingsViewModel: Store {
         case updatePushNotificationSettings
     }
 
-    @Published private(set) var state: State = .init()
+    private(set) var state: State = .init()
     private let calendar = Calendar.current
     private let fetchPushSettingsUseCase: FetchPushSettingsUseCase
     private let updatePushSettingsUseCase: UpdatePushSettingsUseCase
diff --git a/DevLog/Presentation/ViewModel/RootViewModel.swift b/DevLog/Presentation/ViewModel/RootViewModel.swift
@@ -8,6 +8,7 @@
 import Foundation
 import Combine
 
+@Observable
 final class RootViewModel: Store {
     struct State {
         var showAlert: Bool = false
@@ -32,7 +33,7 @@ final class RootViewModel: Store {
         case signOut
     }
 
-    @Published private(set) var state: State
+    private(set) var state: State
     private let connectivityProvider = NWPathConnectivityProvider()
     private var cancellables = Set<AnyCancellable>()
     private let sessionUseCase: AuthSessionUseCase
diff --git a/DevLog/Presentation/ViewModel/SearchViewModel.swift b/DevLog/Presentation/ViewModel/SearchViewModel.swift
@@ -8,6 +8,7 @@
 import Foundation
 import OrderedCollections
 
+@Observable
 final class SearchViewModel: Store {
     struct State {
         var isLoading: Bool = false
@@ -42,7 +43,7 @@ final class SearchViewModel: Store {
         case fetch(String)
     }
 
-    @Published private(set) var state: State = .init()
+    private(set) var state: State = .init()
     private let fetchWebPagesUseCase: FetchWebPagesUseCase
     private let fetchTodosUseCase: FetchTodosUseCase
     private let fetchRecentSearchQueriesUseCase: FetchRecentSearchQueriesUseCase
diff --git a/DevLog/Presentation/ViewModel/SettingViewModel.swift b/DevLog/Presentation/ViewModel/SettingViewModel.swift
@@ -8,6 +8,7 @@
 import Foundation
 import Combine
 
+@Observable
 final class SettingViewModel: Store {
     struct State {
         var theme: SystemTheme = .automatic
@@ -41,7 +42,7 @@ final class SettingViewModel: Store {
         case signOut, deleteAuth, error, removeCache
     }
 
-    @Published private(set) var state = State()
+    private(set) var state = State()
     private let deleteAuthuseCase: DeleteAuthUseCase
     private let signOutUseCase: SignOutUseCase
     private let sessionUseCase: AuthSessionUseCase
diff --git a/DevLog/Presentation/ViewModel/TodoDetailViewModel.swift b/DevLog/Presentation/ViewModel/TodoDetailViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class TodoDetailViewModel: Store {
     struct State {
         var todo: Todo?
@@ -33,7 +34,7 @@ final class TodoDetailViewModel: Store {
         case upsertTodo(Todo)
     }
 
-    @Published private(set) var state: State = .init()
+    private(set) var state: State = .init()
     private let fetchUseCase: FetchTodoByIDUseCase
     private let upsertUseCase: UpsertTodoUseCase
     private let todoID: String
diff --git a/DevLog/Presentation/ViewModel/TodoEditorViewModel.swift b/DevLog/Presentation/ViewModel/TodoEditorViewModel.swift
@@ -8,6 +8,7 @@
 import Foundation
 import OrderedCollections
 
+@Observable
 final class TodoEditorViewModel: Store {
     struct State {
         var title: String = ""
@@ -41,7 +42,7 @@ final class TodoEditorViewModel: Store {
 
     enum SideEffect { }
 
-    @Published private(set) var state = State()
+    private(set) var state = State()
     private let calendar = Calendar.current
     let navigationTitle: String
     private let id: String
diff --git a/DevLog/Presentation/ViewModel/TodoListViewModel.swift b/DevLog/Presentation/ViewModel/TodoListViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class TodoListViewModel: Store {
     struct State {
         var todos: [TodoListItem] = []
@@ -74,7 +75,7 @@ final class TodoListViewModel: Store {
         case togglePinned(TodoListItem)
     }
 
-    @Published private(set) var state: State
+    private(set) var state: State
     private let searchDebounceDelay: Double = 0.4
     private var searchDebounceTask: Task<Void, Never>?
     private let fetchTodosUseCase: FetchTodosUseCase
diff --git a/DevLog/Presentation/ViewModel/TodoManageViewModel.swift b/DevLog/Presentation/ViewModel/TodoManageViewModel.swift
@@ -7,6 +7,7 @@
 
 import Foundation
 
+@Observable
 final class TodoManageViewModel: Store {
     struct State {
         var todoKindPreferences: [TodoKindPreference]
@@ -19,7 +20,7 @@ final class TodoManageViewModel: Store {
 
     enum SideEffect { }
 
-    @Published private(set) var state: State
+    private(set) var state: State
 
     init(_ todoKindPreferences: [TodoKindPreference]) {
         self.state = State(todoKindPreferences: todoKindPreferences)
diff --git a/DevLog/UI/Common/NavigationRouter.swift b/DevLog/UI/Common/NavigationRouter.swift
@@ -7,8 +7,9 @@
 
 import SwiftUI
 
-final class NavigationRouter: ObservableObject {
-    @Published var path = NavigationPath()
+@Observable
+final class NavigationRouter {
+    var path = NavigationPath()
 
     func push(_ element: any Hashable) {
         Task { @MainActor in
diff --git a/DevLog/UI/Home/HomeView.swift b/DevLog/UI/Home/HomeView.swift
@@ -10,8 +10,8 @@ import SwiftUI
 struct HomeView: View {
     @Environment(\.diContainer) var container: any DIContainer
     @Environment(\.sceneWidth) var sceneWidth: CGFloat
-    @StateObject private var router = NavigationRouter()
-    @StateObject var viewModel: HomeViewModel
+    @State private var router = NavigationRouter()
+    @State var viewModel: HomeViewModel
 
     var body: some View {
         NavigationStack(path: $router.path) {
@@ -32,7 +32,7 @@ struct HomeView: View {
                         deleteTodoUseCase: container.resolve(DeleteTodoUseCase.self),
                         kind: todoKind
                     ))
-                    .environmentObject(router)
+                    .environment(router)
                 case .detail(let todoID):
                     TodoDetailView(viewModel: TodoDetailViewModel(
                         fetchUseCase: container.resolve(FetchTodoByIDUseCase.self),
diff --git a/DevLog/UI/Home/TodoDetailView.swift b/DevLog/UI/Home/TodoDetailView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct TodoDetailView: View {
-    @StateObject var viewModel: TodoDetailViewModel
+    @State var viewModel: TodoDetailViewModel
 
     var body: some View {
         ZStack {
diff --git a/DevLog/UI/Home/TodoEditorView.swift b/DevLog/UI/Home/TodoEditorView.swift
@@ -10,7 +10,7 @@ import OrderedCollections
 import SwiftUI
 
 struct TodoEditorView: View {
-    @StateObject var viewModel: TodoEditorViewModel
+    @State var viewModel: TodoEditorViewModel
     @Environment(\.safeAreaInsets) private var safeAreaInsets
     @Environment(\.dismiss) private var dismiss
     @FocusState private var field: Field?
diff --git a/DevLog/UI/Home/TodoListView.swift b/DevLog/UI/Home/TodoListView.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct TodoListView: View {
-    @StateObject var viewModel: TodoListViewModel
-    @EnvironmentObject var router: NavigationRouter
+    @State var viewModel: TodoListViewModel
+    @Environment(NavigationRouter.self) var router
     @Environment(\.diContainer) var container: DIContainer
     @Environment(\.colorScheme) private var colorScheme
 
diff --git a/DevLog/UI/Home/TodoManageView.swift b/DevLog/UI/Home/TodoManageView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct TodoManageView: View {
-    @StateObject var viewModel: TodoManageViewModel
+    @State var viewModel: TodoManageViewModel
     var onDismiss: (([TodoKindPreference]) -> Void)?
 
     var body: some View {
diff --git a/DevLog/UI/Login/LoginView.swift b/DevLog/UI/Login/LoginView.swift
@@ -10,7 +10,7 @@ import SwiftUI
 struct LoginView: View {
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.sceneWidth) var sceneWidth
-    @StateObject var viewModel: LoginViewModel
+    @State var viewModel: LoginViewModel
 
     var body: some View {
         ZStack {
diff --git a/DevLog/UI/Profile/ProfileView.swift b/DevLog/UI/Profile/ProfileView.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct ProfileView: View {
-    @StateObject var viewModel: ProfileViewModel
-    @StateObject private var router = NavigationRouter()
+    @State var viewModel: ProfileViewModel
+    @State private var router = NavigationRouter()
     @Environment(\.diContainer) private var container
     @FocusState private var focusedOnStatusMessageTextField: Bool
 
@@ -97,7 +97,7 @@ struct ProfileView: View {
                         observeSystemThemeUseCase: container.resolve(ObserveSystemThemeUseCase.self),
                         updateSystemThemeUseCase: container.resolve(UpdateSystemThemeUseCase.self)
                     ))
-                    .environmentObject(router)
+                    .environment(router)
                 case .activity(let activity):
                     ProfileActivityTodoDetailView(activity: activity)
                 }
diff --git a/DevLog/UI/PushNotification/PushNotificationListView.swift b/DevLog/UI/PushNotification/PushNotificationListView.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct PushNotificationListView: View {
-    @StateObject private var router = NavigationRouter()
-    @StateObject var viewModel: PushNotificationListViewModel
+    @State private var router = NavigationRouter()
+    @State var viewModel: PushNotificationListViewModel
     @Environment(\.sceneWidth) private var sceneWidth
     @Environment(\.colorScheme) private var colorScheme
     @Environment(\.diContainer) private var container: DIContainer
diff --git a/DevLog/UI/Search/SearchView.swift b/DevLog/UI/Search/SearchView.swift
@@ -11,8 +11,8 @@ struct SearchView: View {
     @Environment(\.dismiss) private var dismiss
     @Environment(\.sceneWidth) private var sceneWidth
     @Environment(\.diContainer) private var container: DIContainer
-    @StateObject private var router = NavigationRouter()
-    @StateObject var viewModel: SearchViewModel
+    @State private var router = NavigationRouter()
+    @State var viewModel: SearchViewModel
 
     var body: some View {
         NavigationStack(path: $router.path) {
diff --git a/DevLog/UI/Setting/AccountView.swift b/DevLog/UI/Setting/AccountView.swift
@@ -9,7 +9,7 @@ import SwiftUI
 import FirebaseAuth
 
 struct AccountView: View {
-    @StateObject var viewModel: AccountViewModel
+    @State var viewModel: AccountViewModel
 
     var body: some View {
         List {
diff --git a/DevLog/UI/Setting/PushNotificationSettingsView.swift b/DevLog/UI/Setting/PushNotificationSettingsView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct PushNotificationSettingsView: View {
-    @StateObject var viewModel: PushNotificationSettingsViewModel
+    @State var viewModel: PushNotificationSettingsViewModel
 
     var body: some View {
         List {
diff --git a/DevLog/UI/Setting/SettingView.swift b/DevLog/UI/Setting/SettingView.swift
@@ -9,8 +9,8 @@ import SwiftUI
 
 struct SettingView: View {
     @Environment(\.diContainer) var container: DIContainer
-    @StateObject var viewModel: SettingViewModel
-    @EnvironmentObject var router: NavigationRouter
+    @State var viewModel: SettingViewModel
+    @Environment(NavigationRouter.self) var router
 
     var body: some View {
         Form {
