Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ extension PingPongDetailFeature {
action: .confirmStopTalk,
label: { TextState("중단하기") })
},
message: { TextState("중단 시 모든 핑퐁 내용이 사라져요. 정말 중단하시겠어요?") }
message: { TextState("중단 시 모든 내용이 사라져요. 정말 중단하시겠어요?") }
))
return .none

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private extension QuestionPingPongView {
var questionText: some View {
HStack(spacing: 0) {
WantedSansStyleText(
questionContent,
"Q. " + questionContent,
style: .subTitle1,
color: .focusePrimary
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}