Merge pull request #75 from DeveloperAcademy-POSTECH/fix/#66-SoundDet…

…ectingError [fix] OnboardingView 수정
DeveloperAcademy-POSTECH · Nov 11, 2024 · 2f62f49 · 2f62f49
2 parents 37e768c + a5e0b50
commit 2f62f49
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 40 deletions.
diff --git a/hearo/hearo/Resources/Assets.xcassets/SVGIcon/Icon.imageset/Contents.json b/hearo/hearo/Resources/Assets.xcassets/SVGIcon/Icon.imageset/Contents.json
@@ -1,7 +1,9 @@
 {
   "images" : [
     {
-      "filename" : "Icon 오후 9.05.06 1.png",
+
+      "filename" : "Icon 오후 9.05.06.png",
+
       "idiom" : "universal",
       "scale" : "1x"
     },

diff --git a/hearo/hearo/Sources/Presentations/OnBoarding/View/OnboardingView.swift b/hearo/hearo/Sources/Presentations/OnBoarding/View/OnboardingView.swift
@@ -6,6 +6,7 @@
 //
 import SwiftUI
 import AVFoundation // AVAudioSession을 사용하기 위해 추가
+import Lottie
 
 struct OnboardingView: View {
     @StateObject var viewModel: OnboardingViewModel
@@ -42,6 +43,7 @@ struct OnboardingView: View {
                 // Lottie 애니메이션 영역 - TabView로 슬라이드 가능
                 TabView(selection: $currentPage) {
                     LottieView(animationName: "warning", animationScale: 1, loopMode: .playOnce)
+                    .frame(width: UIScreen.main.bounds.width, height: UIScreen.main.bounds.height)
                         .tag(OnboardingPage.warning)
 
                     LottieView(animationName: "privacy", animationScale: 1, loopMode: .playOnce)

diff --git a/hearo/hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift b/hearo/hearo/Sources/Presentations/OnBoarding/View/StartOnboardingView.swift
@@ -16,28 +16,13 @@ struct StartOnboardingView: View {
   var body: some View {
 
 
-    ZStack(alignment: .top) {
+    ZStack(alignment: .topLeading) {
 
       Color("Radish")
         .ignoresSafeArea(.all)
 
-      //      VStack {
-      //        Spacer().frame(height: 230.67)
-
-        Image("MainCircle")
-          .offset(y: 225.67)
-          .clipped()
-
-
-
-      //      }
-
-      // 글씨
-      //      HStack {
-      //        Spacer().frame(width: 16)
-
       VStack(alignment: .leading,spacing: 0) {
-        Spacer().frame(height: 52)
+        Spacer().frame(height: 45)
 
         Text("당신을 위한 소리 감지 앱\n히어로드에 오신 걸 환영합니다!")
           .font(.mainTitle)
@@ -49,28 +34,19 @@ struct StartOnboardingView: View {
 
 
 
-        Text("히어로드는 주행 중 경적과 사이렌 소리를 감지해 주행자의 안전을 돕는 앱입니다.")
+        Text("히어로드는 주행 중 경적과 사이렌 소리를 감지해\n 주행자의 안전을 돕는 앱입니다.")
           .font(.regular)
           .foregroundStyle(Color("SubFontColor"))
           .frame(maxWidth: 323, minHeight: 42, alignment: .leading)
           .opacity(showSubtitle ? 1 : 0)
           .animation(.easeIn(duration: 0.5).delay(0.5), value: showSubtitle) // 타이핑 애니메이션 효과
-        //            .border(.black)
-
-
-        //          Spacer()
-
       }
-
-      //        .border(.red)
-      //        .ignoresSafeArea()
-      //              .padding(.top, 45)
-
-      //        Spacer()
-      //      }
+    }
+    .overlay{
+      Image("MainCircle")
+        .offset(y:300)
+    }
       .padding(.leading, 16)
-      //      .border(.red)
-
       .onAppear {
         // 애니메이션 트리거
         showTitle = true
@@ -81,13 +57,6 @@ struct StartOnboardingView: View {
           appRootManager.currentRoot = .onboarding
         }
       }
-
-
-    }
-    //    .ignoresSafeArea()
-
-
-
   }
 }