[Feat/#118] 뒤로가기 버튼 구현

Team-HMH · Nov 24, 2024 · afcebd1 · afcebd1
1 parent b557d04
commit afcebd1
Show file tree

Hide file tree

Showing 20 changed files with 78 additions and 7 deletions.
diff --git a/HMH_Tuist_iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/InfoPlist.swift b/HMH_Tuist_iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/InfoPlist.swift
@@ -24,7 +24,8 @@ public extension Project {
         "NSAppTransportSecurity": [
             "NSAllowsArbitraryLoads": true
         ],
-        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"]
+        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"],
+        "UILaunchStoryboardName": "LaunchScreen"
     ]
 
 
@@ -42,7 +43,8 @@ public extension Project {
         "NSAppTransportSecurity": [
             "NSAllowsArbitraryLoads": true
         ],
-        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"]
+        "UIAppFonts": ["Pretendard-Regular.otf", "Pretendard-SemiBold.otf", "Pretendard-Medium.otf"],
+        "UILaunchStoryboardName": "LaunchScreen"
     ]
 
     static let deviceActivityMonitorInfoPlist: [String: Plist.Value] = [

diff --git a/HMH_Tuist_iOS/Projects/App/Derived/InfoPlists/HMH-iOS-Info.plist b/HMH_Tuist_iOS/Projects/App/Derived/InfoPlists/HMH-iOS-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Core/Derived/InfoPlists/CoreDemo-Info.plist b/HMH_Tuist_iOS/Projects/Core/Derived/InfoPlists/CoreDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataDemo-Info.plist b/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/...iOS/Projects/Features/ChallengeFeature/Derived/InfoPlists/ChallengeFeatureDemo-Info.plist b/...iOS/Projects/Features/ChallengeFeature/Derived/InfoPlists/ChallengeFeatureDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Features/HomeFeature/Derived/InfoPlists/HomeFeatureDemo-Info.plist b/HMH_Tuist_iOS/Projects/Features/HomeFeature/Derived/InfoPlists/HomeFeatureDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Features/LoginFeature/Derived/InfoPlists/LoginFeatureDemo-Info.plist b/HMH_Tuist_iOS/Projects/Features/LoginFeature/Derived/InfoPlists/LoginFeatureDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/...Tuist_iOS/Projects/Features/MyPageFeature/Derived/InfoPlists/MyPageFeatureDemo-Info.plist b/...Tuist_iOS/Projects/Features/MyPageFeature/Derived/InfoPlists/MyPageFeatureDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/...S/Projects/Features/OnboardingFeature/Derived/InfoPlists/OnboardingFeatureDemo-Info.plist b/...S/Projects/Features/OnboardingFeature/Derived/InfoPlists/OnboardingFeatureDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Features/RootFeature/Derived/InfoPlists/RootFeatureDemo-Info.plist b/HMH_Tuist_iOS/Projects/Features/RootFeature/Derived/InfoPlists/RootFeatureDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/HMH_Tuist_iOS/Projects/Modules/DSKit/Derived/InfoPlists/DSKitDemo-Info.plist b/HMH_Tuist_iOS/Projects/Modules/DSKit/Derived/InfoPlists/DSKitDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/.../Projects/Modules/Networks/Demo/Sources/ServiceTest/AuthServiceTest/AuthServiceView.swift b/.../Projects/Modules/Networks/Demo/Sources/ServiceTest/AuthServiceTest/AuthServiceView.swift
@@ -19,7 +19,7 @@ struct AuthServiceView: View {
         VStack {
             HStack {
                 Button {
-                    print("뒤로 가기")
+                    viewModel.send(action: .backButtonDidTap)
                 } label: {
                     Image(systemName: "chevron.backward")
                         .resizable()

diff --git a/...ects/Modules/Networks/Demo/Sources/ServiceTest/AuthServiceTest/AuthServiceViewModel.swift b/...ects/Modules/Networks/Demo/Sources/ServiceTest/AuthServiceTest/AuthServiceViewModel.swift
@@ -16,6 +16,7 @@ class AuthServiceViewModel: ObservableObject {
     //MARK: Action, State
 
     enum Action {
+        case backButtonDidTap
         case serviceButtonDidTap(Int)
     }
 
@@ -50,6 +51,8 @@ class AuthServiceViewModel: ObservableObject {
             switch index {
             case 0:
                 service.signUp(request: .stub)
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -62,6 +65,8 @@ class AuthServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 1:
                 service.socialLogin(request: .init(socialPlatform: "KAKAO"))
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -75,6 +80,8 @@ class AuthServiceViewModel: ObservableObject {
             default:
                 break
             }
+        case .backButtonDidTap:
+            navigationRouter.pop()
         }
     }
 }

diff --git a/...Modules/Networks/Demo/Sources/ServiceTest/ChallengeServiceTest/ChallengeServiceView.swift b/...Modules/Networks/Demo/Sources/ServiceTest/ChallengeServiceTest/ChallengeServiceView.swift
@@ -19,7 +19,7 @@ struct ChallengeServiceView: View {
         VStack {
             HStack {
                 Button {
-                    print("뒤로 가기")
+                    viewModel.send(action: .backButtonDidTap)
                 } label: {
                     Image(systemName: "chevron.backward")
                         .resizable()

diff --git a/...es/Networks/Demo/Sources/ServiceTest/ChallengeServiceTest/ChallengeServiceViewModel.swift b/...es/Networks/Demo/Sources/ServiceTest/ChallengeServiceTest/ChallengeServiceViewModel.swift
@@ -16,6 +16,7 @@ class ChallengeServiceViewModel: ObservableObject {
     //MARK: Action, State
 
     enum Action {
+        case backButtonDidTap
         case serviceButtonDidTap(Int)
     }
 
@@ -53,6 +54,8 @@ class ChallengeServiceViewModel: ObservableObject {
             switch index {
             case 0:
                 service.getDailyChallenge()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -65,6 +68,8 @@ class ChallengeServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 1:
                 service.getSuccesChallenge()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -77,6 +82,8 @@ class ChallengeServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 2:
                 service.createChallenge(request: .stub)
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -89,6 +96,8 @@ class ChallengeServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 3:
                 service.postLockChallenge()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -101,6 +110,8 @@ class ChallengeServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 4:
                 service.deleteApp(request: .stub)
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -114,6 +125,8 @@ class ChallengeServiceViewModel: ObservableObject {
 
             case 5:
                 service.addApp(request: .stub)
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -127,6 +140,8 @@ class ChallengeServiceViewModel: ObservableObject {
 
             case 6:
                 service.getChallenge()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -140,6 +155,8 @@ class ChallengeServiceViewModel: ObservableObject {
             default:
                 break
             }
+        case .backButtonDidTap:
+            navigationRouter.pop()
         }
     }
 }
diff --git a/...rojects/Modules/Networks/Demo/Sources/ServiceTest/PointServiceTest/PointServiceView.swift b/...rojects/Modules/Networks/Demo/Sources/ServiceTest/PointServiceTest/PointServiceView.swift
@@ -19,7 +19,7 @@ struct PointServiceView: View {
         VStack {
             HStack {
                 Button {
-                    print("뒤로 가기")
+                    viewModel.send(action: .backButtonDidTap)
                 } label: {
                     Image(systemName: "chevron.backward")
                         .resizable()

diff --git a/...ts/Modules/Networks/Demo/Sources/ServiceTest/PointServiceTest/PointServiceViewModel.swift b/...ts/Modules/Networks/Demo/Sources/ServiceTest/PointServiceTest/PointServiceViewModel.swift
@@ -16,6 +16,7 @@ class PointServiceViewModel: ObservableObject {
     //MARK: Action, State
 
     enum Action {
+        case backButtonDidTap
         case serviceButtonDidTap(Int)
     }
 
@@ -50,10 +51,11 @@ class PointServiceViewModel: ObservableObject {
     func send(action: Action) {
         switch action {
         case .serviceButtonDidTap(let index):
-            let requestPublisher: AnyPublisher<Any, Error>
             switch index {
             case 0:
                 service.patchPointUse()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -66,6 +68,8 @@ class PointServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 1:
                 service.getEarnPoint()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -78,6 +82,8 @@ class PointServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 2:
                 service.getUsagePoint()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -90,6 +96,8 @@ class PointServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 3:
                 service.patchEarnPoint(request: .stub)
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -102,6 +110,8 @@ class PointServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 4:
                 service.getPointList()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -115,6 +125,8 @@ class PointServiceViewModel: ObservableObject {
             default:
                 break
             }
+        case .backButtonDidTap:
+            navigationRouter.pop()
         }
     }
 }

diff --git a/.../Projects/Modules/Networks/Demo/Sources/ServiceTest/UserServiceTest/UserServiceView.swift b/.../Projects/Modules/Networks/Demo/Sources/ServiceTest/UserServiceTest/UserServiceView.swift
@@ -19,7 +19,7 @@ struct UserServiceView: View {
         VStack {
             HStack {
                 Button {
-                    print("뒤로 가기")
+                    viewModel.send(action: .backButtonDidTap)
                 } label: {
                     Image(systemName: "chevron.backward")
                         .resizable()

diff --git a/...ects/Modules/Networks/Demo/Sources/ServiceTest/UserServiceTest/UserServiceViewModel.swift b/...ects/Modules/Networks/Demo/Sources/ServiceTest/UserServiceTest/UserServiceViewModel.swift
@@ -16,6 +16,7 @@ class UserServiceViewModel: ObservableObject {
     //MARK: Action, State
 
     enum Action {
+        case backButtonDidTap
         case serviceButtonDidTap(Int)
     }
 
@@ -50,6 +51,8 @@ class UserServiceViewModel: ObservableObject {
             switch index {
             case 0:
                 service.logout()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -62,6 +65,8 @@ class UserServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 1:
                 service.deleteAccount()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -74,6 +79,8 @@ class UserServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 2:
                 service.getUserData()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -86,6 +93,8 @@ class UserServiceViewModel: ObservableObject {
                     .store(in: cancelBag)
             case 3:
                 service.getCurrentPoint()
+                    .subscribe(on: DispatchQueue.global())
+                    .receive(on: DispatchQueue.main)
                     .sink(receiveCompletion: { [weak self] completion in
                         if case let .failure(error) = completion {
                             self?.state.networkLoggingText = error.description
@@ -99,6 +108,8 @@ class UserServiceViewModel: ObservableObject {
             default:
                 break
             }
+        case .backButtonDidTap:
+            navigationRouter.pop()
         }
     }
 }

diff --git a/HMH_Tuist_iOS/Projects/Modules/Networks/Derived/InfoPlists/NetworksDemo-Info.plist b/HMH_Tuist_iOS/Projects/Modules/Networks/Derived/InfoPlists/NetworksDemo-Info.plist
@@ -62,6 +62,8 @@
 		<key>UISceneConfigurations</key>
 		<dict/>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>