From 12b2d3ce7fe5f44dea0a68ce1156a365c0a4c274 Mon Sep 17 00:00:00 2001 From: YoungBin Lee Date: Sun, 5 Nov 2023 21:54:32 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20=EB=B0=8F=20=EC=95=B1=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Button/SegmentControlView.swift | 3 +-- .../Model/CirclePack/CharacterScore.swift | 4 +++- .../DailyTestList/DailyTestListView.swift | 2 +- .../MyPage/ImageExport/MyPageExportView.swift | 22 ++++++++++++++----- .../Features/Sources/MyPage/MyPageView.swift | 22 +++++++++++++++---- .../MyPage/ScoreList/ScoreListView.swift | 4 +++- .../Registration/RegistrationView.swift | 5 ++++- 7 files changed, 47 insertions(+), 15 deletions(-) diff --git a/Projects/DSKit/Sources/Button/SegmentControlView.swift b/Projects/DSKit/Sources/Button/SegmentControlView.swift index 6bb1c59c..56314a4c 100644 --- a/Projects/DSKit/Sources/Button/SegmentControlView.swift +++ b/Projects/DSKit/Sources/Button/SegmentControlView.swift @@ -54,7 +54,6 @@ public struct SegmentControlView: View .animation(Animation.customInteractiveSpring(), value: selected) } .padding(4) - .background { BackgroundBlurringView(style: .systemChromeMaterialDark) .cornerRadius(16) @@ -95,7 +94,7 @@ extension SegmentControlView { @ViewBuilder private var buttonBackground: some View { if selectedId.id == id.id { - RoundedRectangle(cornerRadius: 16, style: .continuous) + RoundedRectangle(cornerRadius: 13, style: .continuous) .fill(bgColor) .matchedGeometryEffect(id: "SelectedTab", in: namespace) } diff --git a/Projects/Domain/Sources/Model/CirclePack/CharacterScore.swift b/Projects/Domain/Sources/Model/CirclePack/CharacterScore.swift index 45869bfb..210a4d73 100644 --- a/Projects/Domain/Sources/Model/CirclePack/CharacterScore.swift +++ b/Projects/Domain/Sources/Model/CirclePack/CharacterScore.swift @@ -18,7 +18,9 @@ public struct CharacterScore: Identifiable, Equatable { public init(score: Int, date: String) { globalDateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss" - globalDateFormatter.timeZone = TimeZone(secondsFromGMT: 0) + + let kstTimeZone = TimeZone(identifier: "Asia/Seoul") + globalDateFormatter.timeZone = kstTimeZone self.score = score self.date = globalDateFormatter.date(from: date) ?? Date() diff --git a/Projects/Features/Sources/Home/DailyTestList/DailyTestListView.swift b/Projects/Features/Sources/Home/DailyTestList/DailyTestListView.swift index d9e219cd..6e74b3b6 100644 --- a/Projects/Features/Sources/Home/DailyTestList/DailyTestListView.swift +++ b/Projects/Features/Sources/Home/DailyTestList/DailyTestListView.swift @@ -120,7 +120,7 @@ struct DailyTestListView: View { .frame(width: 40, height: 40) Text.keyme("\(nickname)\(questionsStat.title)", font: .body3Semibold) - .lineHeight(140, forFont: .body3Semibold) + .lineHeight(120, forFont: .body3Semibold) .frame(maxWidth: .infinity, alignment: .leading) .truncationMode(.tail) .foregroundColor(.white) diff --git a/Projects/Features/Sources/MyPage/ImageExport/MyPageExportView.swift b/Projects/Features/Sources/MyPage/ImageExport/MyPageExportView.swift index 4559e457..6f9f7dc9 100644 --- a/Projects/Features/Sources/MyPage/ImageExport/MyPageExportView.swift +++ b/Projects/Features/Sources/MyPage/ImageExport/MyPageExportView.swift @@ -187,11 +187,23 @@ public struct MyPageImageExportView: View { content VStack(alignment: .leading, spacing: 8) { -// Text.keyme(title, font: .body5) -// .foregroundColor(.white.opacity(0.3)) - - Text.keyme("친구들이 생각하는\n\(nickname)님의" + - "\n\(title) 성격은?", font: .heading1) + Group { + if nickname.count > 3 { + Text.keyme("친구들이 생각하는" + + "\n" + + "\(nickname)님과 " + + "\n" + + "\(title) 성격은?", + font: .heading1) + } else { + Text.keyme("친구들이 생각하는" + + "\n" + + "\(nickname)님과 \(title) 성격은?", + font: .heading1) + } + } + .lineSpacing(4) + .transition(.opacity) .foregroundColor(.white) Spacer() diff --git a/Projects/Features/Sources/MyPage/MyPageView.swift b/Projects/Features/Sources/MyPage/MyPageView.swift index 1f811efd..afb69c38 100644 --- a/Projects/Features/Sources/MyPage/MyPageView.swift +++ b/Projects/Features/Sources/MyPage/MyPageView.swift @@ -87,10 +87,24 @@ struct MyPageView: View { .padding(.horizontal, 17) .padding(.top, 25) - Text.keyme("친구들이 생각하는\n\(viewStore.nickname)님의" + - "\n\(viewStore.selectedSegment.title) 성격은?", font: .heading1) - .padding(17) - .transition(.opacity) + Group { + if viewStore.nickname.count > 3 { + Text.keyme("친구들이 생각하는" + + "\n" + + "\(viewStore.nickname)님과 " + + "\n" + + "\(viewStore.selectedSegment.title) 성격은?", + font: .heading1) + } else { + Text.keyme("친구들이 생각하는" + + "\n" + + "\(viewStore.nickname)님과 \(viewStore.selectedSegment.title) 성격은?", + font: .heading1) + } + } + .lineSpacing(4) + .padding(17) + .transition(.opacity) } .foregroundColor(.white) .transition(.opacity) diff --git a/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift b/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift index 9c2f34c9..1ae6dd42 100644 --- a/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift +++ b/Projects/Features/Sources/MyPage/ScoreList/ScoreListView.swift @@ -48,6 +48,7 @@ struct ScoreListView: View { .redacted(reason: viewStore.nowFetching ? .placeholder : []) Divider().overlay(keymeWhite.opacity(0.1)) + .padding(.vertical, 4) if viewStore.nowFetching { scoreListLoading() @@ -65,9 +66,10 @@ struct ScoreListView: View { // MARK: - Subviews private func headerView(using viewStore: ViewStoreOf) -> some View { - VStack(alignment: .leading) { + VStack(alignment: .leading, spacing: 8) { if let questionText = viewStore.questionText { Text.keyme(nickname + questionText, font: .body1) + .lineSpacing(3) .foregroundColor(keymeWhite) } else { Text("") diff --git a/Projects/Features/Sources/Registration/RegistrationView.swift b/Projects/Features/Sources/Registration/RegistrationView.swift index 9e79f2eb..c0c92ff1 100644 --- a/Projects/Features/Sources/Registration/RegistrationView.swift +++ b/Projects/Features/Sources/Registration/RegistrationView.swift @@ -76,6 +76,8 @@ public struct RegistrationView: View { // 닉네임을 입력하는 TextField TextField("Nickname", text: $nickname) + .font(Font(DSKitFontFamily.Pretendard.semiBold.font(size: 16))) + .kerning(16 * (-3 / 100)) .focused($isTextFieldFocused) .placeholder(when: nickname.isEmpty, placeholder: { Text.keyme("닉네임을 입력해주세요.", font: .body3Regular) @@ -113,7 +115,8 @@ public struct RegistrationView: View { .cornerRadius(8) .overlay( Text.keyme("친구들이 원활하게 문제를 풀 수 있도록, 나를 가장 잘 나타내는 닉네임으로 설정해주세요.", font: .body4) - .lineSpacing(10) + .lineSpacing(8) + .padding(.horizontal, 16) .foregroundColor(.white) ) .padding(.bottom, 64)