nativeapptemplate · dadachi · Jun 22, 2025 · Jun 22, 2025
diff --git a/NativeAppTemplate.xcodeproj/project.pbxproj b/NativeAppTemplate.xcodeproj/project.pbxproj
@@ -140,6 +140,10 @@
 		01D85AEB2E07CF3600A95798 /* ItemTagEditViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85AEA2E07CF3600A95798 /* ItemTagEditViewModel.swift */; };
 		01D85AEF2E07D20500A95798 /* ItemTagCreateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85AEE2E07D20500A95798 /* ItemTagCreateViewModel.swift */; };
 		01D85AF32E07D37E00A95798 /* ItemTagListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85AF22E07D37E00A95798 /* ItemTagListViewModel.swift */; };
+		01D85B442E07ED8700A95798 /* ShopDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85B432E07ED8700A95798 /* ShopDetailViewModel.swift */; };
+		01D85B462E07F15400A95798 /* PasswordEditViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85B452E07F15400A95798 /* PasswordEditViewModel.swift */; };
+		01D85B482E07F16100A95798 /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85B472E07F16100A95798 /* SettingsViewModel.swift */; };
+		01D85B4A2E07F16900A95798 /* ShopkeeperEditViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D85B492E07F16900A95798 /* ShopkeeperEditViewModel.swift */; };
 		01D8AE8B2AB453C1009AFFBA /* ShopBasicSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D8AE8A2AB453C1009AFFBA /* ShopBasicSettingsView.swift */; };
 		01DCE23F298FA3B300BA311D /* ShopListCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DCE23E298FA3B300BA311D /* ShopListCardView.swift */; };
 		01E0A59C25BD088600298D35 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A59125BD087E00298D35 /* SettingsView.swift */; };
@@ -304,6 +308,10 @@
 		01D85AEA2E07CF3600A95798 /* ItemTagEditViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagEditViewModel.swift; sourceTree = "<group>"; };
 		01D85AEE2E07D20500A95798 /* ItemTagCreateViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagCreateViewModel.swift; sourceTree = "<group>"; };
 		01D85AF22E07D37E00A95798 /* ItemTagListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTagListViewModel.swift; sourceTree = "<group>"; };
+		01D85B432E07ED8700A95798 /* ShopDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopDetailViewModel.swift; sourceTree = "<group>"; };
+		01D85B452E07F15400A95798 /* PasswordEditViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordEditViewModel.swift; sourceTree = "<group>"; };
+		01D85B472E07F16100A95798 /* SettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewModel.swift; sourceTree = "<group>"; };
+		01D85B492E07F16900A95798 /* ShopkeeperEditViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopkeeperEditViewModel.swift; sourceTree = "<group>"; };
 		01D8AE8A2AB453C1009AFFBA /* ShopBasicSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopBasicSettingsView.swift; sourceTree = "<group>"; };
 		01DCE23E298FA3B300BA311D /* ShopListCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopListCardView.swift; sourceTree = "<group>"; };
 		01E0A59125BD087E00298D35 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
@@ -356,6 +364,7 @@
 			children = (
 				0172787E2D7D933000CE424F /* ShopDetailCardView.swift */,
 				010F86AD2621A2A900B6C62A /* ShopDetailView.swift */,
+				01D85B432E07ED8700A95798 /* ShopDetailViewModel.swift */,
 			);
 			path = "Shop Detail";
 			sourceTree = "<group>";
@@ -787,8 +796,11 @@
 			isa = PBXGroup;
 			children = (
 				0106414329AA061100B46FED /* PasswordEditView.swift */,
+				01D85B452E07F15400A95798 /* PasswordEditViewModel.swift */,
 				01E0A59125BD087E00298D35 /* SettingsView.swift */,
+				01D85B472E07F16100A95798 /* SettingsViewModel.swift */,
 				01EE363D29A6DCEB009BCD9D /* ShopkeeperEditView.swift */,
+				01D85B492E07F16900A95798 /* ShopkeeperEditViewModel.swift */,
 			);
 			path = Settings;
 			sourceTree = "<group>";
@@ -945,6 +957,7 @@
 				"",
 				"",
 				"",
+				"",
 			);
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -955,6 +968,7 @@
 			files = (
 				0172047925AA8335008FD63B /* UIFont+Extensions.swift in Sources */,
 				01E2477029A570D300D4B00D /* SignUp.swift in Sources */,
+				01D85B4A2E07F16900A95798 /* ShopkeeperEditViewModel.swift in Sources */,
 				0172785A2D7D83B600CE424F /* NFCManager.swift in Sources */,
 				0172785B2D7D83B600CE424F /* AppSingletons.swift in Sources */,
 				017278732D7D87EB00CE424F /* UIImage+Extentions.swift in Sources */,
@@ -1051,13 +1065,15 @@
 				018E21CD2B36377800FFD1F6 /* MeService.swift in Sources */,
 				0106414029A9F2EC00B46FED /* AccountPasswordService.swift in Sources */,
 				01482FA42B351E4100A56D43 /* AcceptPrivacyView.swift in Sources */,
+				01D85B462E07F15400A95798 /* PasswordEditViewModel.swift in Sources */,
 				0172046325AA82BF008FD63B /* OnboardingView.swift in Sources */,
 				013DE735284E99DF00528CC5 /* ShopCreateView.swift in Sources */,
 				01D85AE72E07CD4400A95798 /* ItemTagDetailViewModel.swift in Sources */,
 				017203B625A96FD6008FD63B /* View+Extensions.swift in Sources */,
 				0106414229A9F51700B46FED /* AccountPasswordRepository.swift in Sources */,
 				0172033A25A9642E008FD63B /* JSONAPIDocument.swift in Sources */,
 				01B526542AF4E36400655131 /* MainTab.swift in Sources */,
+				01D85B442E07ED8700A95798 /* ShopDetailViewModel.swift in Sources */,
 				017203CB25A97090008FD63B /* SessionController.swift in Sources */,
 				0106413E29A9F1C300B46FED /* UpdatePassword.swift in Sources */,
 				0172787B2D7D903500CE424F /* ItemTagAdapter.swift in Sources */,
@@ -1094,6 +1110,7 @@
 				01E2477229A5E30400D4B00D /* Utility.swift in Sources */,
 				0172046725AA82BF008FD63B /* MainView.swift in Sources */,
 				0172033825A9642E008FD63B /* JSONAPIError.swift in Sources */,
+				01D85B482E07F16100A95798 /* SettingsViewModel.swift in Sources */,
 			);
 		};
 		01D19B3F2D4DE33500BDEAB7 /* Sources */ = {

diff --git a/NativeAppTemplate/UI/App Root/MainView.swift b/NativeAppTemplate/UI/App Root/MainView.swift
@@ -166,7 +166,14 @@ private extension MainView {
   }
 
   func settingsView() -> SettingsView {
-    .init(accountPasswordRepository: dataManager.accountPasswordRepository)
+    .init(
+      viewModel: SettingsViewModel(
+        sessionController: sessionController,
+        tabViewModel: tabViewModel,
+        messageBus: messageBus
+      ),
+      accountPasswordRepository: dataManager.accountPasswordRepository
+    )
   }
 
   func handleBackgroundTagReading(_ userActivity: NSUserActivity) {

diff --git a/NativeAppTemplate/UI/Settings/PasswordEditView.swift b/NativeAppTemplate/UI/Settings/PasswordEditView.swift
@@ -8,48 +8,20 @@
 import SwiftUI
 
 struct PasswordEditView: View {
-  @Environment(MessageBus.self) private var messageBus
   @Environment(\.dismiss) private var dismiss
-  @State private var isUpdating = false
-  @State private var currentPassword: String = ""
-  @State private var password: String = ""
-  @State private var passwordConfirmation: String = ""
-  private var accountPasswordRepository: AccountPasswordRepositoryProtocol
+  @State private var viewModel: PasswordEditViewModel
 
-  init(
-    accountPasswordRepository: AccountPasswordRepositoryProtocol
-  ) {
-    self.accountPasswordRepository = accountPasswordRepository
-  }
-
-  private var hasInvalidData: Bool {
-    if Utility.isBlank(currentPassword) ||
-        Utility.isBlank(password) ||
-        Utility.isBlank(passwordConfirmation) {
-      return true
-    }
-
-    if hasInvalidDataPassword {
-      return true
-    }
-
-    return false
-  }
-
-  private var hasInvalidDataPassword: Bool {
-    if Utility.isBlank(password) {
-      return true
-    }
-
-    if password.count < .minimumPasswordLength {
-      return true
-    }
-
-    return false
+  init(viewModel: PasswordEditViewModel) {
+    self._viewModel = State(wrappedValue: viewModel)
   }
 
   var body: some View {
     contentView
+      .onChange(of: viewModel.shouldDismiss) { _, shouldDismiss in
+        if shouldDismiss {
+          dismiss()
+        }
+      }
   }
 }
 
@@ -58,7 +30,7 @@ private extension PasswordEditView {
   var contentView: some View {
 
     @ViewBuilder var contentView: some View {
-      if isUpdating {
+      if viewModel.isBusy {
         LoadingView()
       } else {
         passwordEditView
@@ -71,7 +43,7 @@ private extension PasswordEditView {
   var passwordEditView: some View {
     Form {
       Section {
-        SecureField(String.currentPassword, text: $currentPassword)
+        SecureField(String.currentPassword, text: $viewModel.currentPassword)
           .textContentType(.password)
           .autocapitalization(.none)
           .autocorrectionDisabled(true)
@@ -82,35 +54,35 @@ private extension PasswordEditView {
           Text(String.weNeedYourCurrentPassword)
             .font(.uiFootnote)
           Text(String.currentPasswordIsRequired)
-            .foregroundStyle(Utility.isBlank(currentPassword) ? .red : .clear)
+            .foregroundStyle(Utility.isBlank(viewModel.currentPassword) ? .red : .clear)
             .font(.uiFootnote)
         }
       }
       Section {
-        SecureField(String.newPassword, text: $password)
+        SecureField(String.newPassword, text: $viewModel.password)
           .textContentType(.password)
           .autocapitalization(.none)
           .autocorrectionDisabled(true)
       } header: {
         Text(String.newPassword)
       } footer: {
         VStack(alignment: .leading) {
-          Text("\(Int.minimumPasswordLength) characters minimum.")
+          Text("\(viewModel.minimumPasswordLength) characters minimum.")
             .font(.uiFootnote)
 
-          if Utility.isBlank(password) {
+          if Utility.isBlank(viewModel.password) {
             Text(String.newPasswordIsRequired)
               .foregroundStyle(.red)
               .font(.uiFootnote)
-          } else if hasInvalidDataPassword {
+          } else if viewModel.hasInvalidDataPassword {
             Text(String.passwordIsInvalid)
               .foregroundStyle(.red)
               .font(.uiFootnote)
           }
         }
       }
       Section {
-        SecureField(String.confirmNewPassword, text: $passwordConfirmation)
+        SecureField(String.confirmNewPassword, text: $viewModel.passwordConfirmation)
           .textContentType(.password)
           .autocapitalization(.none)
           .autocorrectionDisabled(true)
@@ -119,46 +91,19 @@ private extension PasswordEditView {
       } footer: {
         Text(String.confirmNewPasswordIsRequired)
           .font(.uiFootnote)
-          .foregroundStyle(Utility.isBlank(passwordConfirmation) ? .red : .clear)
+          .foregroundStyle(Utility.isBlank(viewModel.passwordConfirmation) ? .red : .clear)
       }
     }
    .navigationTitle(String.updatePassword)
     .toolbar {
       ToolbarItem(placement: .navigationBarTrailing) {
         Button {
-          updatePassword()
+          viewModel.updatePassword()
         } label: {
           Text(String.save)
         }
-        .disabled(hasInvalidData)
-      }
-    }
-  }
-
-  func updatePassword() {
-    let whitespacesAndNewlines = CharacterSet.whitespacesAndNewlines
-    let theCurrentPassword = currentPassword.trimmingCharacters(in: whitespacesAndNewlines)
-    let thePassword = password.trimmingCharacters(in: whitespacesAndNewlines)
-    let thePasswordConfirmation = passwordConfirmation.trimmingCharacters(in: whitespacesAndNewlines)
-
-    Task { @MainActor in
-      isUpdating = true
-
-      do {
-        let updatePassword = UpdatePassword(
-          currentPassword: theCurrentPassword,
-          password: thePassword,
-          passwordConfirmation: thePasswordConfirmation
-        )
-
-        try await accountPasswordRepository.update(updatePassword: updatePassword)
-        messageBus.post(message: Message(level: .success, message: .passwordUpdated))
-        dismiss()
-      } catch {
-        messageBus.post(message: Message(level: .error, message: error.localizedDescription, autoDismiss: false))
+        .disabled(viewModel.hasInvalidData)
       }
-
-      isUpdating = false
     }
   }
 }
diff --git a/NativeAppTemplate/UI/Settings/PasswordEditViewModel.swift b/NativeAppTemplate/UI/Settings/PasswordEditViewModel.swift
@@ -0,0 +1,91 @@
+//
+//  PasswordEditViewModel.swift
+//  NativeAppTemplate
+//
+//  Created by Daisuke Adachi on 2025/06/15.
+//
+
+import SwiftUI
+import Observation
+
+@Observable
+@MainActor
+final class PasswordEditViewModel {
+  var currentPassword = ""
+  var password = ""
+  var passwordConfirmation = ""
+  var isUpdating = false
+  var shouldDismiss = false
+
+  private let accountPasswordRepository: AccountPasswordRepositoryProtocol
+  private let messageBus: MessageBus
+
+  init(
+    accountPasswordRepository: AccountPasswordRepositoryProtocol,
+    messageBus: MessageBus
+  ) {
+    self.accountPasswordRepository = accountPasswordRepository
+    self.messageBus = messageBus
+  }
+
+  var isBusy: Bool {
+    isUpdating
+  }
+
+  var hasInvalidData: Bool {
+    if Utility.isBlank(currentPassword) ||
+        Utility.isBlank(password) ||
+        Utility.isBlank(passwordConfirmation) {
+      return true
+    }
+
+    if hasInvalidDataPassword {
+      return true
+    }
+
+    return false
+  }
+
+  var hasInvalidDataPassword: Bool {
+    if Utility.isBlank(password) {
+      return true
+    }
+
+    if password.count < .minimumPasswordLength {
+      return true
+    }
+
+    return false
+  }
+
+  var minimumPasswordLength: Int {
+    .minimumPasswordLength
+  }
+
+  func updatePassword() {
+    let whitespacesAndNewlines = CharacterSet.whitespacesAndNewlines
+    let theCurrentPassword = currentPassword.trimmingCharacters(in: whitespacesAndNewlines)
+    let thePassword = password.trimmingCharacters(in: whitespacesAndNewlines)
+    let thePasswordConfirmation = passwordConfirmation.trimmingCharacters(in: whitespacesAndNewlines)
+
+    Task {
+      isUpdating = true
+
+      do {
+        let updatePassword = UpdatePassword(
+          currentPassword: theCurrentPassword,
+          password: thePassword,
+          passwordConfirmation: thePasswordConfirmation
+        )
+
+        try await accountPasswordRepository.update(updatePassword: updatePassword)
+        messageBus.post(message: Message(level: .success, message: .passwordUpdated))
+        shouldDismiss = true
+      } catch {
+        messageBus.post(message: Message(level: .error, message: error.localizedDescription, autoDismiss: false))
+      }
+
+      isUpdating = false
+    }
+  }
+}