[Feature/#349] 보틀 보관함 디자인 qa 반영 (#350)

* feat: 질문 Text "Q. " 추가 * feat: 문답화면 top padding 추가 * feat: 대화중단 이미지 frame size 수정 * feat: 최종 선택 이후 매칭 탭 활성화 * feat: 카카오톡 아이디 Text vertical padding 수정 * feat: 매칭 결과 bottomButton 하단 고정 * feat: 매칭 실패 image padding 수정 * feat: 문답 중단 Alert 내용 수정
Nexters · Nov 7, 2024 · 1146d85 · 1146d85
1 parent 19eac8e
commit 1146d85
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/...eStorage/Interface/Sources/PingPongDetail/View/PingPongDetail/PingPongDetailFeature.swift b/...eStorage/Interface/Sources/PingPongDetail/View/PingPongDetail/PingPongDetailFeature.swift
@@ -57,7 +57,7 @@ extension PingPongDetailFeature {
               action: .confirmStopTalk,
               label: { TextState("중단하기") })
           },
-          message: { TextState("중단 시 모든 핑퐁 내용이 사라져요. 정말 중단하시겠어요?") }
+          message: { TextState("중단 시 모든 내용이 사라져요. 정말 중단하시겠어요?") }
         ))
         return .none
 

diff --git a/...ts/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/QuestionPingPongView.swift b/...ts/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/QuestionPingPongView.swift
@@ -97,7 +97,7 @@ private extension QuestionPingPongView {
   var questionText: some View {
     HStack(spacing: 0) {
       WantedSansStyleText(
-        questionContent,
+        "Q. " + questionContent,
         style: .subTitle1,
         color: .focusePrimary
       )

diff --git a/.../BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/Matching/MatchingView.swift b/.../BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/Matching/MatchingView.swift
@@ -21,26 +21,26 @@ public struct MatchingView: View {
 
   public var body: some View {
     WithPerceptionTracking {
-      ScrollView {
-        VStack(alignment: .leading, spacing: 0.0) {
-          title
-            .padding(.vertical, 32)
-
-          matchingInfo
+      ZStack(alignment: .bottom) {
+        ScrollView {
+          VStack(alignment: .leading, spacing: 0.0) {
+            title
+              .padding(.vertical, 32)
 
-          Spacer()
-
-          bottomButton
-
-          Spacer()
-            .frame(height: 30)
+            matchingInfo
+          }
+          .padding(.horizontal, .md)
+          .frame(maxWidth: .infinity)
         }
-        .padding(.horizontal, .md)
-        .frame(maxHeight: .infinity)
         .background(to: ColorToken.background(.primary))
+        .scrollIndicators(.hidden)
+
+        bottomButton
+          .padding(.horizontal, .md)
+          .padding(.bottom, 30)
+          .shadow(color: .white, radius: 15, y: -30)
       }
       .background(to: ColorToken.background(.primary))
-      .scrollIndicators(.hidden)
     }
   }
 }
@@ -77,7 +77,7 @@ private extension MatchingView {
     case .waitingOtherAnswer:
       GeometryReader { geometryProxy in
         WithPerceptionTracking {
-          let width = geometryProxy.size.width - 60.0
+          let width = geometryProxy.size.width - 120.0
           HStack(spacing: 0 ) {
             Spacer()
             BottleImageView(
@@ -98,7 +98,7 @@ private extension MatchingView {
     case .matchFailed:
       GeometryReader { geometryProxy in
         WithPerceptionTracking {
-          let width = geometryProxy.size.width - 50
+          let width = geometryProxy.size.width - 120.0
           HStack(spacing: 0 ) {
             Spacer()
             BottleImageView(
@@ -125,7 +125,7 @@ private extension MatchingView {
         style: .body,
         color: .quinary
       )
-      .padding(.vertical, 2)
+      .padding(.vertical, 5)
       .padding(.horizontal, .xs)
       .background {
         RoundedRectangle(cornerRadius: BottleRadiusType.xs.value)

diff --git a/...ace/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerFeature.swift b/...ace/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerFeature.swift
@@ -84,15 +84,14 @@ extension QuestionAndAnswerFeature {
         }
 
       case let .finalSelectButtonDidTapped(willMatch: willMatch):
-        state.isShowLoadingIndicator = true
         return .run { [bottleID = state.bottleID] send in
           try await bottleClient.finalSelect(
             bottleID: bottleID,
             willMatch: willMatch
           )
           switch willMatch {
           case true:
-            await send(.refreshPingPongDidRequired)
+            await send(.delegate(.refreshPingPong))
           case false:
             await send(.delegate(.popToRootDidRequired))
           }

diff --git a/...erface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerView.swift b/...erface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerView.swift
@@ -114,7 +114,8 @@ public struct QuestionAndAnswerView: View {
           Spacer()
             .frame(height: 14)
         }
-        .padding(.md)
+        .padding(.horizontal, .md)
+        .padding(.top, 32)
         .frame(maxWidth: .infinity)
         .onChange(of: focusedField) { field in
           store.send(.focusedFieldDidChanged(field))

diff --git a/Projects/Shared/DesignSystem/Sources/Components/Card/Stop/StopCardView.swift b/Projects/Shared/DesignSystem/Sources/Components/Card/Stop/StopCardView.swift
@@ -63,7 +63,7 @@ private extension StopCardView {
   // TODO: - 아직 디자인 안나옴 나오면 수정
   var image: some View {
     LocalImageView(.illustraition(.loudspeark))
-      .frame(width: 120)
-      .frame(height: 120)
+      .frame(width: 200)
+      .frame(height: 200)
   }
 }