Merge branch 'develop' into main

Nexters · Nov 5, 2023 · ee205f2 · ee205f2
2 parents ca4a458 + 12b2d3c
commit ee205f2
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 15 deletions.
diff --git a/Projects/DSKit/Sources/Button/SegmentControlView.swift b/Projects/DSKit/Sources/Button/SegmentControlView.swift
@@ -54,7 +54,6 @@ public struct SegmentControlView<SegmentType: Identifiable, Content: View>: 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
@@ -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
@@ -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
@@ -187,11 +187,23 @@ public struct MyPageImageExportView<Content: View>: 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
@@ -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
@@ -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<ScoreListFeature>) -> 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
@@ -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)