diff --git a/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/PingPongDetail/PingPongDetailFeature.swift b/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/PingPongDetail/PingPongDetailFeature.swift index 9ee14df5..d7b914e8 100644 --- a/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/PingPongDetail/PingPongDetailFeature.swift +++ b/Projects/Feature/BottleStorage/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/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/QuestionPingPongView.swift b/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/QuestionPingPongView.swift index 69738fc5..2852222f 100644 --- a/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/QuestionPingPongView.swift +++ b/Projects/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/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/Matching/MatchingView.swift b/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/Matching/MatchingView.swift index 2515d20b..962c10c9 100644 --- a/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/Matching/MatchingView.swift +++ b/Projects/Feature/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/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerFeature.swift b/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerFeature.swift index 0f982c5f..ce722b95 100644 --- a/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerFeature.swift +++ b/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerFeature.swift @@ -84,7 +84,6 @@ extension QuestionAndAnswerFeature { } case let .finalSelectButtonDidTapped(willMatch: willMatch): - state.isShowLoadingIndicator = true return .run { [bottleID = state.bottleID] send in try await bottleClient.finalSelect( bottleID: bottleID, @@ -92,7 +91,7 @@ extension QuestionAndAnswerFeature { ) switch willMatch { case true: - await send(.refreshPingPongDidRequired) + await send(.delegate(.refreshPingPong)) case false: await send(.delegate(.popToRootDidRequired)) } diff --git a/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerView.swift b/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerView.swift index 94cf6c35..ef3d78ab 100644 --- a/Projects/Feature/BottleStorage/Interface/Sources/PingPongDetail/View/SubViews/QuestionAndAnswer/QuestionAndAnswerView.swift +++ b/Projects/Feature/BottleStorage/Interface/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 index 558957cb..8842ba97 100644 --- 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) } }