From 785df823e704dcfdcb34898e6b333999721ebf69 Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 18:58:52 +0900 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=EC=A7=88=EB=AC=B8=20Text=20"Q.=20"?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/PingPongDetail/View/QuestionPingPongView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) From 8aea2101939f3c881e0a828cd57d3c01ac7046cd Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 19:01:50 +0900 Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=EB=AC=B8=EB=8B=B5=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20top=20padding=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubViews/QuestionAndAnswer/QuestionAndAnswerView.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)) From a92fb771c97a6cb3c824cdb6a98d9f366d0493ef Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 19:04:22 +0900 Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=EB=8C=80=ED=99=94=EC=A4=91?= =?UTF-8?q?=EB=8B=A8=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20frame=20size=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Components/Card/Stop/StopCardView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) } } From a819858862c8ee9e552d512120014a94ba041924 Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 19:26:07 +0900 Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=EC=B5=9C=EC=A2=85=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EC=9D=B4=ED=9B=84=20=EB=A7=A4=EC=B9=AD=20=ED=83=AD?= =?UTF-8?q?=20=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubViews/QuestionAndAnswer/QuestionAndAnswerFeature.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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)) } From 6e5b4f6af247a7f359234c2f516859f7cdda1321 Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 19:32:03 +0900 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=EC=B9=B4=EC=B9=B4=EC=98=A4?= =?UTF-8?q?=ED=86=A1=20=EC=95=84=EC=9D=B4=EB=94=94=20Text=20vertical=20pad?= =?UTF-8?q?ding=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PingPongDetail/View/SubViews/Matching/MatchingView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..22594610 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 @@ -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) From 35c4590dc4e86da625151d7a9d7fe4a8a4172779 Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 19:40:19 +0900 Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=EB=A7=A4=EC=B9=AD=20=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20bottomButton=20=ED=95=98=EB=8B=A8=20=EA=B3=A0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/SubViews/Matching/MatchingView.swift | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) 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 22594610..0f067fda 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,25 @@ 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) } .background(to: ColorToken.background(.primary)) - .scrollIndicators(.hidden) } } } From 6e704bbbdceabfb7ac2a293ed5df8a2d248ea703 Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 19:55:59 +0900 Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=EB=A7=A4=EC=B9=AD=20=EC=8B=A4?= =?UTF-8?q?=ED=8C=A8=20image=20padding=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PingPongDetail/View/SubViews/Matching/MatchingView.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 0f067fda..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 @@ -38,6 +38,7 @@ public struct MatchingView: View { bottomButton .padding(.horizontal, .md) .padding(.bottom, 30) + .shadow(color: .white, radius: 15, y: -30) } .background(to: ColorToken.background(.primary)) } @@ -76,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( @@ -97,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( From 67b78944708eab779033e0740347c6eb40eecc0b Mon Sep 17 00:00:00 2001 From: leemhyungyu Date: Thu, 7 Nov 2024 19:57:09 +0900 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=EB=AC=B8=EB=8B=B5=20=EC=A4=91?= =?UTF-8?q?=EB=8B=A8=20Alert=20=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/PingPongDetail/PingPongDetailFeature.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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