✨[feat]: qa 수정완료

DDD-Community · Aug 31, 2024 · 05b483d · 05b483d
1 parent 408bafd
commit 05b483d
Show file tree

Hide file tree

Showing 13 changed files with 677 additions and 833 deletions.
diff --git a/OPeace/OPeace.xcworkspace/contents.xcworkspacedata b/OPeace/OPeace.xcworkspace/contents.xcworkspacedata
diff --git a/OPeace/Projects/App/OPeace.xcodeproj/project.pbxproj b/OPeace/Projects/App/OPeace.xcodeproj/project.pbxproj
diff --git a/OPeace/Projects/App/OPeace.xcodeproj/xcshareddata/xcschemes/OPeace.xcscheme b/OPeace/Projects/App/OPeace.xcodeproj/xcshareddata/xcschemes/OPeace.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1010"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -44,12 +44,10 @@
       disableMainThreadChecker = "YES">
       <TestPlans>
          <TestPlanReference
-            default = "YES"
-            reference = "container:OPeaceTests/Sources/OPeaceTestPlan.xctestplan">
+            reference = "container:OPeaceTests/Sources/OPeaceTestPlan.xctestplan"
+            default = "YES">
          </TestPlanReference>
       </TestPlans>
-      <Testables>
-      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

diff --git a/...e/Projects/Presentation/Presentation/Sources/Auth/SignUpPaging/Reducer/SignUpPaging.swift b/...e/Projects/Presentation/Presentation/Sources/Auth/SignUpPaging/Reducer/SignUpPaging.swift
@@ -143,28 +143,28 @@ public struct SignUpPaging {
                 switch AsyncAction {
 
                 case .updateUserInfo(let nickname, let year, let job, let generation):
-                    return .run { @MainActor send in
+                    return .run {  send in
                         let userInfoResult = await Result {
                             try await signUpUseCase.updateUserInfo(nickname: nickname, year: year, job: job, generation: generation)
                         }
 
                         switch userInfoResult {
                         case .success(let updateUserInfoData):
                             if let updateUserInfoData = updateUserInfoData {
-                                send(.async(.updateUserInfoResponse(.success(updateUserInfoData))))
+                                await send(.async(.updateUserInfoResponse(.success(updateUserInfoData))))
 
-                                send(.view(.closePopUp))
+                                await  send(.view(.closePopUp))
 
                                 try await clock.sleep(for: .seconds(1))
                                 if updateUserInfoData.data?.isFirstLogin == false {
-                                    send(.navigation(.presntOnboarding))
+                                    await send(.navigation(.presntOnboarding))
                                 } else {
-                                    send(.navigation(.presntMainHome))
+                                    await send(.navigation(.presntMainHome))
                                 }
                             }
 
                         case .failure(let error):
-                            send(.async(.updateUserInfoResponse(.failure(CustomError.map(error)))))
+                            await send(.async(.updateUserInfoResponse(.failure(CustomError.map(error)))))
                         }
                     }
 

diff --git a/...esentation/Presentation/Sources/CreateQuestion/WriteQuestion/View/WriteQuestionView.swift b/...esentation/Presentation/Sources/CreateQuestion/WriteQuestion/View/WriteQuestionView.swift
@@ -87,12 +87,12 @@ extension WriteQuestionView {
         VStack {
             Spacer()
                 .frame(height: 16)
-            
+
             if store.isInuputEmoji {
                 HStack {
                     Spacer()
-                        .frame(width: UIScreen.screenWidth * 0.4)
-                        
+                        .frame(width: UIScreen.main.bounds.width * 0.4)
+
                     EmojiTextField(
                         text: $store.selectEmojiText,
                         emojiImage: $store.emojiImage,
@@ -103,30 +103,36 @@ extension WriteQuestionView {
                             if newValue.count == 1, newValue.unicodeScalars.allSatisfy({ $0.properties.isEmoji }) {
                                 self.store.emojiImage = Image.emojiToImage(emoji: newValue)
                                 store.isInuputEmoji = false
+                                store.isActiveEmoji = false
                             } else {
                                 store.selectEmojiText = ""
                             }
                         }
                         .focused($isFocused)
+                        .opacity(store.isActiveEmoji ? 0.1 : 0)
+                        .overlay {
+                            if store.isActiveEmoji {
+                                Image(asset: .activeEmojiI)
+                                    .resizable()
+                                    .scaledToFit()
+                                    .frame(width: 80, height: 80)
+                                    .onTapGesture {
+                                        // Return to text field view
+                                        store.isActiveEmoji = false
+                                        store.isInuputEmoji = true
+                                        isFocused = true
+                                    }
+                                    .offset(x: -70)
+                            }
+                        }
+
 
                     Spacer()
                 }
 
                 UnderlineView(text: store.selectEmojiText.isEmpty ? "😀" : store.selectEmojiText)
-
-            }
-            else if store.isActiveEmoji {
-                Circle()
-                    .fill(Color.gray500)
-                    .frame(width: 80, height: 80)
-                    .overlay(alignment: .center) {
-                        Image(asset: .activeEmojiI)
-                            .resizable()
-                            .scaledToFit()
-                    }
-
-            }
-            else if let emojiImage = store.emojiImage {
+
+            } else if let emojiImage = store.emojiImage {
                 emojiImage
                     .resizable()
                     .frame(width: 80, height: 80)
@@ -135,6 +141,7 @@ extension WriteQuestionView {
                         UIApplication.shared.sendAction(#selector(UIResponder.becomeFirstResponder), to: nil, from: nil, for: nil)
                         store.isInuputEmoji.toggle()
                         store.selectEmojiText = ""
+                        store.isActiveEmoji.toggle()
                         isFocused.toggle()
                     }
                     .offset(x: 10)
@@ -150,14 +157,15 @@ extension WriteQuestionView {
                             .onTapGesture {
                                 store.isInuputEmoji.toggle()
                                 isFocused.toggle()
+                                store.isActiveEmoji.toggle()
                                 UIApplication.shared.sendAction(#selector(UIResponder.becomeFirstResponder), to: nil, from: nil, for: nil)
                             }
                     }
             }
         }
         .padding()
     }
-    
+
 
     @ViewBuilder
     private func wittingQustionView() -> some View {

diff --git a/...Projects/Presentation/Presentation/Sources/Profile/EditProfile/View/EditProfileView.swift b/...Projects/Presentation/Presentation/Sources/Profile/EditProfile/View/EditProfileView.swift
@@ -104,7 +104,7 @@ extension EditProfileView {
                 }
 
             Spacer()
-                .frame(height: 12)
+                .frame(height: 8)
 
             UnderlineView(text: store.editProfileName.isEmpty ? store.profileName : store.editProfileName)
 
@@ -116,7 +116,7 @@ extension EditProfileView {
     private func erorNIckCheckText() -> some View {
         VStack {
             Spacer()
-                .frame(height: 16)
+                .frame(height: 12)
 
             if store.editProfileName.isEmpty {
                 Text(store.checkNickNameMessage)

diff --git a/OPeace/Projects/Shared/DesignSystem/Sources/UI/Button/CustomButton.swift b/OPeace/Projects/Shared/DesignSystem/Sources/UI/Button/CustomButton.swift
@@ -31,7 +31,7 @@ public struct CustomButton: View {
             .frame(height: config.frameHeight)
             .overlay {
                 Text(title)
-                    .pretendardFont(family: .Regular, size: 20)
+                    .pretendardFont(family: .SemiBold, size: 20)
                     .foregroundColor(isEnable ? config.enableFontColor : config.disableFontColor)
             }
             .onTapGesture {

diff --git a/OPeace/Projects/Shared/DesignSystem/Sources/UI/NavigationBar/BackButton.swift b/OPeace/Projects/Shared/DesignSystem/Sources/UI/NavigationBar/BackButton.swift
@@ -18,6 +18,9 @@ public struct NavigationBackButton: View {
 
     public var body: some View {
         HStack {
+            Spacer()
+                .frame(width: 19)
+
             Image(asset: .arrowLeft)
                 .resizable()
                 .scaledToFit()
@@ -30,6 +33,5 @@ public struct NavigationBackButton: View {
             Spacer()
 
         }
-        .padding(.horizontal, 20)
     }
 }
diff --git a/...rojects/Shared/DesignSystem/Sources/UI/NavigationBar/CustomTitleNaviagionBackButton.swift b/...rojects/Shared/DesignSystem/Sources/UI/NavigationBar/CustomTitleNaviagionBackButton.swift
@@ -21,6 +21,9 @@ public struct CustomTitleNaviagionBackButton: View {
 
     public var body: some View {
         HStack {
+            Spacer()
+                .frame(width: 19)
+
             Image(asset: .arrowLeft)
                 .resizable()
                 .scaledToFit()
@@ -35,10 +38,11 @@ public struct CustomTitleNaviagionBackButton: View {
             Text(title)
                 .pretendardFont(family: .SemiBold, size: 20)
                 .foregroundStyle(Color.gray200)
+                .offset(x: -10)
 
             Spacer()
+
 
         }
-        .padding(.horizontal, 20)
     }
 }
diff --git a/OPeace/Projects/Shared/DesignSystem/Sources/UI/Text/UnderlineView.swift b/OPeace/Projects/Shared/DesignSystem/Sources/UI/Text/UnderlineView.swift
@@ -6,7 +6,6 @@
 //
 
 import SwiftUI
-import Utill
 
 public struct UnderlineView: View {
     var text: String
@@ -17,33 +16,33 @@ public struct UnderlineView: View {
 
     public var body: some View {
         GeometryReader { geometry in
-            let textWidth = calculateUnderlineWidth(text: text)
+            let textWidth = calculateUnderlineWidth(text: text) 
             RoundedRectangle(cornerRadius: 1)
                 .fill(Color.basicWhite)
                 .frame(width: textWidth, height: 2)
                 .offset(x: (geometry.size.width - textWidth) / 2)
         }
     }
 
+
     private func calculateUnderlineWidth(text: String) -> CGFloat {
-        let baseWidth: CGFloat = 83
-        let extraWidthPerCharacter: CGFloat = 20
-        let koreanCharacterFactor: CGFloat = 0.8
+        let baseWidthForThreeCharacters: CGFloat = 125
+        let baseCharacterCount = 3
+
+        let widthPerCharacter: CGFloat = baseWidthForThreeCharacters / CGFloat(baseCharacterCount)
+        var totalWidth: CGFloat = 0
 
-        var totalWidth = baseWidth
         for char in text {
             if isKoreanCharacter(char) {
-                totalWidth += extraWidthPerCharacter * koreanCharacterFactor
+                totalWidth += widthPerCharacter * 0.8
             } else {
-                totalWidth += extraWidthPerCharacter
+                totalWidth += widthPerCharacter
             }
         }
-        return totalWidth
+        return max(totalWidth, widthPerCharacter * CGFloat(text.count))
     }
 
     private func isKoreanCharacter(_ char: Character) -> Bool {
         return ("\u{AC00}" <= char && char <= "\u{D7A3}") || ("\u{1100}" <= char && char <= "\u{11FF}")
     }
 }
-
-