Merge pull request #148 from DeveloperAcademy-POSTECH/feature/#52

#52/�테스트 파일 추가
DeveloperAcademy-POSTECH · Apr 29, 2024 · 2441de9 · 2441de9
2 parents 4b44e12 + 4cc3f06
commit 2441de9
Show file tree

Hide file tree

Showing 15 changed files with 187 additions and 24 deletions.
diff --git a/Projects/App/Tests/AppTests.swift b/Projects/App/Tests/AppTests.swift
@@ -0,0 +1,8 @@
+//
+//  AppTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/Core/Sources/Common/Extensions/View+.swift b/Projects/Core/Sources/Common/Extensions/View+.swift
@@ -8,9 +8,77 @@
 
 import SwiftUI
 
-extension View {
-	public func hideKeyboard() {
-		UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder),
-										to: nil, from: nil, for: nil)
+public extension View {
+	dynamic func dismissKeyboard(on gestures: [Gestures] = Gestures.allCases,
+															 onDismiss: (() -> Void)? = nil) -> some View {
+		return ModifiedContent(content: self,
+													 modifier: DismissingKeyboard(gestures: gestures,
+																												onDismiss: onDismiss))
+	}
+}
+
+// MARK: - DismissingKeyboard
+
+private struct DismissingKeyboard: ViewModifier {
+	var gestures: [Gestures] = Gestures.allCases
+	var onDismiss: (() -> Void)?
+
+	private func action() {
+		let forcing = true
+		let keyWindow = UIApplication.shared.connectedScenes
+			.filter({$0.activationState == .foregroundActive})
+			.map({$0 as? UIWindowScene})
+			.compactMap({$0})
+			.first?.windows
+			.filter({$0.isKeyWindow}).first
+		keyWindow?.endEditing(forcing)
+	}
+
+	private func handleOnDismiss() {
+		action()
+		onDismiss?()
+	}
+
+	dynamic func body(content: Content) -> some View {
+		return gestures.reduce(AnyView(content)) { $1.apply(to: $0, perform: handleOnDismiss) }
+	}
+}
+
+public enum Gestures: Hashable, CaseIterable {
+	case tap, longPress, drag, magnification, rotation
+}
+
+public protocol ValueGesture: Gesture where Value: Equatable {
+	func onChanged(_ action: @escaping (Value) -> Void) -> _ChangedGesture<Self>
+}
+
+extension LongPressGesture: ValueGesture {}
+extension DragGesture: ValueGesture {}
+extension MagnificationGesture: ValueGesture {}
+extension RotationGesture: ValueGesture {}
+
+public extension Gestures {
+	@discardableResult
+	func apply<V>(to view: V, perform voidAction: @escaping () -> Void) -> AnyView where V: View {
+
+		func highPrio<G>(
+			gesture: G
+		) -> AnyView where G: ValueGesture {
+			AnyView(view.highPriorityGesture(
+				gesture.onChanged { value in
+					_ = value
+					voidAction()
+				}
+			))
+		}
+
+		switch self {
+		case .tap:
+			return AnyView(view.gesture(TapGesture().onEnded(voidAction)))
+		case .longPress: return highPrio(gesture: LongPressGesture())
+		case .drag: return highPrio(gesture: DragGesture())
+		case .magnification: return highPrio(gesture: MagnificationGesture())
+		case .rotation: return highPrio(gesture: RotationGesture())
+		}
 	}
 }
diff --git a/Projects/Core/Tests/CoreTests.swift b/Projects/Core/Tests/CoreTests.swift
@@ -0,0 +1,8 @@
+//
+//  CoreTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/DesignSystem/Tests/DesignSystemTests.swift b/Projects/DesignSystem/Tests/DesignSystemTests.swift
@@ -0,0 +1,8 @@
+//
+//  DesignSystemTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/Feature/Tests/FetureTests.swift b/Projects/Feature/Tests/FetureTests.swift
@@ -0,0 +1,8 @@
+//
+//  FetureTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/FeatureCategory/Tests/FeatureCategoryTests.swift b/Projects/FeatureCategory/Tests/FeatureCategoryTests.swift
@@ -0,0 +1,8 @@
+//
+//  FeatureCategoryTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/FeatureEncyclopedia/Tests/FeatureEncyclopediaTests.swift b/Projects/FeatureEncyclopedia/Tests/FeatureEncyclopediaTests.swift
@@ -0,0 +1,8 @@
+//
+//  FeatureEncyclopediaTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/FeatureHome/Tests/FeatureHomeTests.swift b/Projects/FeatureHome/Tests/FeatureHomeTests.swift
@@ -0,0 +1,8 @@
+//
+//  FeatureHomeTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/FeatureInformation/Scene/InformationView.swift b/Projects/FeatureInformation/Scene/InformationView.swift
@@ -15,10 +15,11 @@ public struct InformationView: View {
 	@StateObject var viewModel: InformationViewModel
 
 	public init(makHolyId: Int, mpParamters: MPInfoClosedEventParameters) {
-		self._viewModel = StateObject(wrappedValue: InformationViewModel(makHolyId: makHolyId, 
-																		 maHolyRepo: DefaultMakgeolliRepository(),
-																		 userRepo: DefaultUserRepository(),
-																		 mpParameters: mpParamters))
+		self._viewModel = StateObject(
+			wrappedValue: InformationViewModel(makHolyId: makHolyId,
+																				 maHolyRepo: DefaultMakgeolliRepository(),
+																				 userRepo: DefaultUserRepository(),
+																				 mpParameters: mpParamters))
 	}
 
 	public var body: some View {
@@ -31,19 +32,18 @@ public struct InformationView: View {
 							InformationCardView(viewModel: viewModel)
 								.padding(.top, 28.5)
 							InformationDetailView(viewModel: viewModel)
-
 						}
 						.alert(isPresented: $viewModel.showDeleteAlert) {
 							Alert(title: Text("코멘트 삭제"), message: Text("코멘트를 삭제하시겠어요?"),
-								  primaryButton: .cancel(
-									Text("취소"),
-									action: {}
-								  ), secondaryButton: .destructive(
-									Text("삭제하기"),
-									action: {
-										viewModel.deleteComment()
-									}
-								  ))
+										primaryButton: .cancel(
+											Text("취소"),
+											action: {}
+										), secondaryButton: .destructive(
+											Text("삭제하기"),
+											action: {
+												viewModel.deleteComment()
+											}
+										))
 						}
 						HStack {
 							InfoBookMarkButton(viewModel: viewModel)
@@ -52,7 +52,7 @@ public struct InformationView: View {
 						.padding(.horizontal, 16)
 						.alert(isPresented: $viewModel.errorState) {
 							Alert(title: Text("네트워크 에러"), message: Text("인터넷 연결상태를 확인해주세요."),
-								  dismissButton: .default(Text("확인")))
+										dismissButton: .default(Text("확인")))
 						}
 					}
 				}
@@ -70,14 +70,16 @@ public struct InformationView: View {
 			}
 			.padding(.horizontal, 16)
 		}
+		.dismissKeyboard(on: [.tap, .drag])
 		.statusBarHidden(true)
 		.onAppear(perform: {
 			viewModel.fetchDatas()
 			MixpanelManager.shared.informationViewAppeared()
 		})
 		//코멘트 상세 Modal 화면
 		.sheet(isPresented: $viewModel.showDetailCommentListSheet, content: {
-			InfoLikeCommentDetailView(isPresented: $viewModel.showDetailCommentListSheet, comments: viewModel.comments, makHolyName: viewModel.makHoly.name)
+			InfoLikeCommentDetailView(isPresented: $viewModel.showDetailCommentListSheet,
+																comments: viewModel.comments, makHolyName: viewModel.makHoly.name)
 		})
 		// 코멘트 수정 ActionSheet
 		.confirmationDialog("", isPresented: $viewModel.showActionSheet, titleVisibility: .hidden) {
@@ -114,9 +116,6 @@ public struct InformationView: View {
 						viewModel.insertComment(myComment: myComment)
 					})
 			}
-
 		})
 	}
 }
-
-
diff --git a/Projects/FeatureInformation/Tests/FeatureInformationTests.swift b/Projects/FeatureInformation/Tests/FeatureInformationTests.swift
@@ -0,0 +1,8 @@
+//
+//  FeatureInformationTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/FeatureOnboarding/Tests/FeatureOnboardingTests.swift b/Projects/FeatureOnboarding/Tests/FeatureOnboardingTests.swift
@@ -0,0 +1,8 @@
+//
+//  FeatureOnboardingTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/FeatureProfile/Tests/FeatureProfileTests.swift b/Projects/FeatureProfile/Tests/FeatureProfileTests.swift
@@ -0,0 +1,8 @@
+//
+//  FeatureProfileTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/FeatureSearch/Tests/FeatureSearchTests.swift b/Projects/FeatureSearch/Tests/FeatureSearchTests.swift
@@ -0,0 +1,8 @@
+//
+//  FeatureSearchTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Projects/Utils/Tests/UtilsTests.swift b/Projects/Utils/Tests/UtilsTests.swift
@@ -0,0 +1,8 @@
+//
+//  UtilsTests.swift
+//  ProjectDescriptionHelpers
+//
+//  Created by Kim SungHun on 4/27/24.
+//
+
+import Foundation
diff --git a/Tuist/ProjectDescriptionHelpers/Project+Templates.swift b/Tuist/ProjectDescriptionHelpers/Project+Templates.swift
@@ -38,7 +38,7 @@ public extension Project {
 			bundleId: "\(organizationName).\(name)Tests",
 			deploymentTarget: deploymentTarget,
 			infoPlist: .default,
-			//			sources: ["Tests/**"],
+			sources: ["Tests/**"],
 			dependencies: [.target(name: name)]
 		)