Merge pull request #236 from Team-Smeme/feat/#235-QA

[Feat] #235 - 코칭 일기 1차 QA
Team-Smeme · Dec 10, 2024 · 209b006 · 209b006
2 parents cbc8db2 + f7bdf58
commit 209b006
Show file tree

Hide file tree

Showing 15 changed files with 212 additions and 358 deletions.
diff --git a/.github/workflows/smeemDev.yml b/.github/workflows/smeemDev.yml
@@ -6,6 +6,8 @@ name: Swift
 on:
   push:
     branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
 
 jobs:
   build:

diff --git a/Smeem-iOS/Smeem-iOS.xcodeproj/project.pbxproj b/Smeem-iOS/Smeem-iOS.xcodeproj/project.pbxproj
@@ -446,23 +446,12 @@
 		A3D7ECB62A26566A009857D6 /* EditNicknameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditNicknameViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
-/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		370BD0B62CFB660C009560DB /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				CoachingComparisonView.swift,
-				CoachingCompletedView.swift,
-				CoachingExplanationView.swift,
-				CustomSegmentedControl.swift,
-				SwiftUINavigationView.swift,
-			);
-			target = 4A8FFA4B29C9E1FD00FB76C0 /* Smeem-iOS */;
-		};
-/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
-
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		377B3BF12CF618B90086E0BC /* SwiftUI */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = SwiftUI; sourceTree = "<group>"; };
-		4AB3494D2CF229D10047C484 /* UIViewConponent */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (370BD0B62CFB660C009560DB /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = UIViewConponent; sourceTree = "<group>"; };
+		4A17370E2D05C02E00B772C3 /* Toast */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Toast; sourceTree = "<group>"; };
+		4A17370F2D05C03600B772C3 /* LoadingView */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = LoadingView; sourceTree = "<group>"; };
+		4A1737152D05C06E00B772C3 /* Components */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Components; sourceTree = "<group>"; };
+		4A1737192D05C07100B772C3 /* Store */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Store; sourceTree = "<group>"; };
 		4AB3494E2CF22A070047C484 /* Global */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Global; sourceTree = "<group>"; };
 		4AB3494F2CF22A250047C484 /* Button */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Button; sourceTree = "<group>"; };
 		4AB349502CF22A2E0047C484 /* TextView */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = TextView; sourceTree = "<group>"; };
@@ -473,7 +462,6 @@
 		4AB349BA2CF23B770047C484 /* Coaching */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Coaching; sourceTree = "<group>"; };
 		4AB349BC2CF23D210047C484 /* Coaching */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Coaching; sourceTree = "<group>"; };
 		4AF050CE2CE9DE010055BC3F /* Coaching */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Coaching; sourceTree = "<group>"; };
-		4AF050D72CEA01E20055BC3F /* DiaryComplete */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = DiaryComplete; sourceTree = "<group>"; };
 		4AF050D82CEA01EA0055BC3F /* Coaching */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Coaching; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
@@ -574,6 +562,7 @@
 		373D29912CBFE16B00A559A3 /* SwiftUI */ = {
 			isa = PBXGroup;
 			children = (
+				377B3BEF2CF613710086E0BC /* HighlightModifier.swift */,
 				373D29922CBFE17B00A559A3 /* View+.swift */,
 			);
 			path = SwiftUI;
@@ -618,7 +607,6 @@
 				37A574B929FE209F00312453 /* Resources */,
 				4AC4B82B2A2F9F5300E147AA /* Constants */,
 				37EB69E42A4B3B6B00075E4E /* Protocols */,
-				377B3BEF2CF613710086E0BC /* HighlightModifier.swift */,
 			);
 			path = Global;
 			sourceTree = "<group>";
@@ -627,7 +615,8 @@
 			isa = PBXGroup;
 			children = (
 				4AF050D82CEA01EA0055BC3F /* Coaching */,
-				4AF050D72CEA01E20055BC3F /* DiaryComplete */,
+				4A1737192D05C07100B772C3 /* Store */,
+				4A1737152D05C06E00B772C3 /* Components */,
 				4AC047232A8FCA9700EBDC0E /* AuthManagement */,
 				4AA6FEE72C3ABD7C00E588E9 /* ResignSummray */,
 				4AA5E4B52BF24CEB00F308C8 /* BadgeBottomSheet */,
@@ -674,7 +663,6 @@
 			isa = PBXGroup;
 			children = (
 				377B3BF12CF618B90086E0BC /* SwiftUI */,
-				4AB3494D2CF229D10047C484 /* UIViewConponent */,
 				371107DB2ACAB4E3007A4AC2 /* Base */,
 				4A1EE9552A4DFB86007BFEF3 /* SmeemComponent */,
 			);
@@ -1018,6 +1006,8 @@
 		4A1EE9552A4DFB86007BFEF3 /* SmeemComponent */ = {
 			isa = PBXGroup;
 			children = (
+				4A17370F2D05C03600B772C3 /* LoadingView */,
+				4A17370E2D05C02E00B772C3 /* Toast */,
 				4AB349502CF22A2E0047C484 /* TextView */,
 				4AB3494F2CF22A250047C484 /* Button */,
 				4AB3494E2CF22A070047C484 /* Global */,
@@ -1752,7 +1742,10 @@
 			);
 			fileSystemSynchronizedGroups = (
 				377B3BF12CF618B90086E0BC /* SwiftUI */,
-				4AB3494D2CF229D10047C484 /* UIViewConponent */,
+				4A17370E2D05C02E00B772C3 /* Toast */,
+				4A17370F2D05C03600B772C3 /* LoadingView */,
+				4A1737152D05C06E00B772C3 /* Components */,
+				4A1737192D05C07100B772C3 /* Store */,
 				4AB3494E2CF22A070047C484 /* Global */,
 				4AB3494F2CF22A250047C484 /* Button */,
 				4AB349502CF22A2E0047C484 /* TextView */,
@@ -1762,7 +1755,6 @@
 				4AB349562CF22BFF0047C484 /* EditUser */,
 				4AB349BA2CF23B770047C484 /* Coaching */,
 				4AF050CE2CE9DE010055BC3F /* Coaching */,
-				4AF050D72CEA01E20055BC3F /* DiaryComplete */,
 				4AF050D82CEA01EA0055BC3F /* Coaching */,
 			);
 			name = "Smeem-iOS";

diff --git a/.../Smeem-iOS/Global/HighlightModifier.swift → ...xtensions/SwiftUI/HighlightModifier.swift b/.../Smeem-iOS/Global/HighlightModifier.swift → ...xtensions/SwiftUI/HighlightModifier.swift
diff --git a/Smeem-iOS/Smeem-iOS/Global/UIComponents/SmeemComponent/LoadingView/SmemeLoadingView.swift b/Smeem-iOS/Smeem-iOS/Global/UIComponents/SmeemComponent/LoadingView/SmemeLoadingView.swift
@@ -0,0 +1,36 @@
+//
+//  SmemeLoadingView.swift
+//  Smeem-iOS
+//
+//  Created by 황찬미 on 11/26/24.
+//
+
+import SwiftUI
+
+struct SmemeLoadingView: View {
+
+    var body: some View {
+        HStack {
+            Spacer()
+            VStack {
+                Spacer()
+                ProgressView()
+                Spacer()
+            }
+            Spacer()
+        }
+        .ignoresSafeArea()
+        .background(Color.white.opacity(0.1)) // 반투명 배경
+        .allowsHitTesting(true) // 로딩 중 터치 차단
+    }
+}
+
+struct SmemeEmptyView: View {
+
+    var body: some View {
+        ZStack {
+            Color.white.ignoresSafeArea()
+        }
+        .animation(.easeInOut(duration: 0.5), value: true) // 0.5초 뒤에 서서히 사라짐
+    }
+}
diff --git a/...tation/DiaryComplete/SmemeToastView.swift → ...SmeemComponent/Toast/SmemeToastView.swift b/...tation/DiaryComplete/SmemeToastView.swift → ...SmeemComponent/Toast/SmemeToastView.swift
diff --git a/Smeem-iOS/Smeem-iOS/Global/UIComponents/SwiftUI/CoachingComparisonView.swift b/Smeem-iOS/Smeem-iOS/Global/UIComponents/SwiftUI/CoachingComparisonView.swift
@@ -7,28 +7,28 @@
 
 import SwiftUI
 
+import SwiftUI
+
 struct CoachingComparisonView: View {
     @Binding var coachingResponse: CoachingResponse
-    @State private var textHeight: CGFloat = 0 // Text의 높이를 저장할 변수
 
     var body: some View {
         VStack(spacing: 20) {
             VStack(alignment: .leading, spacing: 8) {
-                HStack {
-                    Rectangle()
-                        .frame(width: 2, height: textHeight)
-                        .foregroundStyle(Color(UIColor.black))
+                HStack(spacing: 8) {
+
+                    GeometryReader { geomerty in
+                        Rectangle()
+                            .frame(height: geomerty.size.height)
+                            .foregroundStyle(Color(UIColor.black))
+                    }
+                    .frame(width: 2)
 
                     Text("나의 일기")
                         .font(Font.custom("Pretendard", size: 16).weight(.medium))
                         .foregroundColor(Color(UIColor.black))
-                        .background(GeometryReader { geometry in
-                            Color.clear
-                                .preference(key: TextHeightPreferenceKey.self, value: geometry.size.height)
-                        })
-                }
-                .onPreferenceChange(TextHeightPreferenceKey.self) { value in
-                    textHeight = value
+
+                    Spacer()
                 }
 
                 Text(coachingResponse.originalSentence)
@@ -39,14 +39,19 @@ struct CoachingComparisonView: View {
             .padding(.trailing, 18)
 
             VStack(alignment: .leading, spacing: 8) {
-                HStack {
-                    Rectangle()
-                        .frame(width: 2, height: textHeight)
-                        .foregroundStyle(Color(UIColor.point))
+                HStack(spacing: 8) {
+                    GeometryReader { geomerty in
+                        Rectangle()
+                            .frame(height: geomerty.size.height)
+                            .foregroundStyle(Color(UIColor.point))
+                    }
+                    .frame(width: 2)
 
                     Text("고친 문장")
                         .font(Font.custom("Pretendard", size: 16).weight(.medium))
                         .foregroundColor(Color(UIColor.point))
+
+                    Spacer()
                 }
 
                 Text(coachingResponse.correctedSentence)
@@ -59,14 +64,3 @@ struct CoachingComparisonView: View {
         }
     }
 }
-
-struct TextHeightPreferenceKey: PreferenceKey {
-    static var defaultValue: CGFloat = 0
-    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = nextValue()
-    }
-}
-
-//#Preview {
-//    CoachingComparisonView()
-//}
diff --git a/Smeem-iOS/Smeem-iOS/Global/UIComponents/UIViewConponent/CoachingCompletedView.swift b/Smeem-iOS/Smeem-iOS/Global/UIComponents/UIViewConponent/CoachingCompletedView.swift
diff --git a/Smeem-iOS/Smeem-iOS/Global/UIComponents/UIViewConponent/CoachingExplanationView.swift b/Smeem-iOS/Smeem-iOS/Global/UIComponents/UIViewConponent/CoachingExplanationView.swift
diff --git a/Smeem-iOS/Smeem-iOS/Global/UIComponents/UIViewConponent/CustomSegmentedControl.swift b/Smeem-iOS/Smeem-iOS/Global/UIComponents/UIViewConponent/CustomSegmentedControl.swift
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ name: Swift @@
     on:
       push:
         branches: [ "develop" ]
+      pull_request:
+        branches: [ "develop" ]
     jobs:
       build:
@@ Expand Down @@