fix/#90-soso onboarding modi

DeveloperAcademy-POSTECH · Nov 13, 2024 · 7c6bc5f · 7c6bc5f
1 parent 5bfc94a
commit 7c6bc5f
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 11 deletions.
diff --git a/hearo/hearo.xcodeproj/xcuserdata/pil_gaaang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/hearo/hearo.xcodeproj/xcuserdata/pil_gaaang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,4 +3,68 @@
    uuid = "E612D0C1-8F2A-42B7-B849-5689FA63B147"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "50EA202D-FC84-43A5-AA7B-F341B351D29C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "24"
+            endingLineNumber = "24"
+            landmarkName = "body"
+            landmarkType = "24">
+            <Locations>
+               <Location
+                  uuid = "50EA202D-FC84-43A5-AA7B-F341B351D29C - 1bf6563ce255de47"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 () -&gt; SwiftUI.TupleView&lt;(&lt;&lt;opaque return type of SwiftUI.View.ignoresSafeArea(_: SwiftUI.SafeAreaRegions, edges: SwiftUI.Edge.Set) -&gt; some&gt;&gt;.0, &lt;&lt;opaque return type of SwiftUI.View.padding(SwiftUI.Edge.Set, Swift.Optional&lt;CoreGraphics.CGFloat&gt;) -&gt; some&gt;&gt;.0)&gt; in hearo.StartOnboardingView.body.getter : some"
+                  moduleName = "hearo.debug.dylib"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/pil_gaaang/Desktop/ADA/MacC/hearo/hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "24"
+                  endingLineNumber = "24">
+               </Location>
+               <Location
+                  uuid = "50EA202D-FC84-43A5-AA7B-F341B351D29C - d6a431ca0dbecb53"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 () -&gt; SwiftUI.TupleView&lt;(&lt;&lt;opaque return type of SwiftUI.View.frame(width: Swift.Optional&lt;CoreGraphics.CGFloat&gt;, height: Swift.Optional&lt;CoreGraphics.CGFloat&gt;, alignment: SwiftUI.Alignment) -&gt; some&gt;&gt;.0, &lt;&lt;opaque return type of SwiftUI.View.padding(SwiftUI.Edge.Set, Swift.Optional&lt;CoreGraphics.CGFloat&gt;) -&gt; some&gt;&gt;.0, &lt;&lt;opaque return type of SwiftUI.View.animation&lt;&#x3c4;_0_0 where &#x3c4;_1_0: Swift.Equatable&gt;(_: Swift.Optional&lt;SwiftUI.Animation&gt;, value: &#x3c4;_1_0) -&gt; some&gt;&gt;.0)&gt; in closure #1 () -&gt; SwiftUI.TupleView&lt;(&lt;&lt;opaque return type of SwiftUI.View.ignoresSafeArea(_: SwiftUI.SafeAreaRegions, edges: SwiftUI.Edge.Set) -&gt; some&gt;&gt;.0, &lt;&lt;opaque return type of SwiftUI.View.padding(SwiftUI.Edge.Set, Swift.Optional&lt;CoreGraphics.CGFloat&gt;) -&gt; some&gt;&gt;.0)&gt; in hearo.StartOnboardingView.body.getter : some"
+                  moduleName = "hearo.debug.dylib"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/pil_gaaang/Desktop/ADA/MacC/hearo/hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "24"
+                  endingLineNumber = "24">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "D35847D3-F222-4262-8CAB-FD86F6323F1F"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "43"
+            endingLineNumber = "43"
+            landmarkName = "body"
+            landmarkType = "24">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
diff --git a/hearo/hearo/Resources/Assets.xcassets/Animation/phone.dataset/Contents.json b/hearo/hearo/Resources/Assets.xcassets/Animation/phone.dataset/Contents.json
@@ -1,7 +1,7 @@
 {
   "data" : [
     {
-      "filename" : "phone.json",
+      "filename" : "Phone (1).json",
       "idiom" : "universal"
     }
   ],

diff --git a/hearo/hearo/Resources/Assets.xcassets/Animation/phone.dataset/Phone (1).json b/hearo/hearo/Resources/Assets.xcassets/Animation/phone.dataset/Phone (1).json
diff --git a/hearo/hearo/Resources/Assets.xcassets/Animation/phone.dataset/phone.json b/hearo/hearo/Resources/Assets.xcassets/Animation/phone.dataset/phone.json
diff --git a/hearo/hearo/Resources/Assets.xcassets/Animation/watch.dataset/Contents.json b/hearo/hearo/Resources/Assets.xcassets/Animation/watch.dataset/Contents.json
@@ -1,7 +1,7 @@
 {
   "data" : [
     {
-      "filename" : "watch.json",
+      "filename" : "watch Lottie.json",
       "idiom" : "universal"
     }
   ],

diff --git a/hearo/hearo/Resources/Assets.xcassets/Animation/watch.dataset/watch Lottie.json b/hearo/hearo/Resources/Assets.xcassets/Animation/watch.dataset/watch Lottie.json
diff --git a/hearo/hearo/Resources/Assets.xcassets/Animation/watch.dataset/watch.json b/hearo/hearo/Resources/Assets.xcassets/Animation/watch.dataset/watch.json
diff --git a/hearo/hearo/Resources/Assets.xcassets/SVGIcon/privacy.imageset/Contents.json b/hearo/hearo/Resources/Assets.xcassets/SVGIcon/privacy.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "privacy.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/hearo/hearo/Resources/Assets.xcassets/SVGIcon/privacy.imageset/privacy.svg b/hearo/hearo/Resources/Assets.xcassets/SVGIcon/privacy.imageset/privacy.svg
diff --git a/hearo/hearo/Sources/Presentations/OnBoarding/View/OnboardingView.swift b/hearo/hearo/Sources/Presentations/OnBoarding/View/OnboardingView.swift
@@ -43,18 +43,18 @@ struct OnboardingView: View {
                 // Lottie 애니메이션 영역 - TabView로 슬라이드 가능
                 TabView(selection: $currentPage) {
 
-                    LottieView(animationName: "warning", animationScale: 1, loopMode: .playOnce)
+                   Image("AppCaution")
                     .frame(width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)
-
                         .tag(OnboardingPage.warning)
 
-                    LottieView(animationName: "phone", animationScale: 1, loopMode: .playOnce)
+                    Image("privacy")
+                        .frame(width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)
                         .tag(OnboardingPage.privacy)
 
-                    LottieView(animationName: "phone", animationScale: 1, loopMode: .playOnce)
+                    LottieView(animationName: "stand", animationScale: 1, loopMode: .playOnce)
                         .tag(OnboardingPage.stand)
 
-                    LottieView(animationName: "phone", animationScale: 1, loopMode: .playOnce)
+                    LottieView(animationName: "watch", animationScale: 1, loopMode: .playOnce)
                         .tag(OnboardingPage.watch)
                 }
                 .tabViewStyle(PageTabViewStyle(indexDisplayMode: .never))
@@ -86,7 +86,7 @@ struct OnboardingView: View {
                                 .foregroundStyle(Color("HPrimaryColor"))
                                 .clipShape(RoundedRectangle(cornerRadius: 10))
 
-                            Image("시작하기")
+                            Image("StartButton")
                         }
                     }
 

diff --git a/hearo/hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift b/hearo/hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift
@@ -41,12 +41,13 @@ struct StartOnboardingView: View {
           .opacity(showSubtitle ? 1 : 0)
           .animation(.easeIn(duration: 0.5).delay(0.5), value: showSubtitle) // 타이핑 애니메이션 효과
       }
+      .padding(.leading, 16)
+
     }
     .overlay{
       Image("MainCircle")
         .offset(y:300)
     }
-      .padding(.leading, 16)
       .onAppear {
         // 애니메이션 트리거
         showTitle = true