Merge branch 'develop' into feature/WEAV-137

.gitignore

@@ -70,3 +70,4 @@ Derived/
 Tuist/.build
 Projects/Core/CoreKit/Sources/Secret.swift
 graph.png
+OpenApiGenerator/.build

Projects/App/Sources/Debug/AuthInfoView.swift

@@ -155,6 +155,14 @@ struct AuthDebugInfoView: View {
                 dismissButton: .default(Text("확인"))
             )
         }
+        .toolbarRole(.navigationStack)
+        .toolbar {
+            ToolbarItem(placement: .topBarTrailing) {
+                Button("로그아웃", role: .destructive) {
+                    AppCoordinator.shared.logout()
+                }
+            }
+        }
     }
 
     // 클립보드에 복사하는 함수

Projects/App/Sources/Navigation/NavigationStack.swift

@@ -40,6 +40,9 @@ extension PathType {
             case .authAgreement(let input):
                 AuthAgreementView(input)
 
+            case .profileIntro(let input):
+                ProfileIntroView(input)
+
             case .authGreeting(let input):
                 AuthGreetingView(input)
             case .authProfileGender(let input):
@@ -55,6 +58,8 @@ extension PathType {
             case .authName(let input):
                 AuthNameInputView(input)
 
+            case .dreamPartnerIntro(let input):
+                DreamPartnerIntroView(input)
             case .dreamPartnerAgeRange(let input):
                 DreamPartnerAgeView(input)
             case .dreamPartnerJobOccupation(let input):

Projects/Core/CommonKit/Sources/AppCoordinator.swift

@@ -113,4 +113,11 @@ public final class AppCoordinator: ObservableObject {
         }
         return userInfo
     }
+
+    public func logout() {
+        TokenManager.accessToken = nil
+        TokenManager.refreshToken = nil
+        TokenManager.registerToken = nil
+        AuthState.change(.loggedOut)
+    }
 }

Projects/Core/CommonKit/Sources/Path/PathTypes.swift

@@ -52,6 +52,7 @@ public enum PathType: Hashable {
         .signUp(.authRegion(input: .mock)),
         .signUp(.authPhoneInput),
 
+        .signUp(.dreamPartnerIntro(input: .mock)),
         .signUp(.dreamPartnerAgeRange(input: .mock))
     ]
     #endif
@@ -69,6 +70,8 @@ public enum PathType: Hashable {
             case .authPhoneVerify: return "전화번호 인증"
             case .authAgreement: return "이용 약관"
 
+            case .profileIntro: return "프로필 입력 인트로"
+
             case .authGreeting: return "가입 후 환영"
             case .authProfileGender: return "성별 입력"
             case .authProfileAge: return "나이 입력"
@@ -77,6 +80,7 @@ public enum PathType: Hashable {
             case .authRegion: return "내 지역, 선호 지역 입력"
             case .authName: return "이름 입력"
 
+            case .dreamPartnerIntro: return "이상형 입력 인트로"
             case .dreamPartnerAgeRange: return "이상형 나이대"
             case .dreamPartnerJobOccupation: return "이상형 직업"
             case .dreamPartnerDistance: return "이상형과의 거리"
@@ -90,6 +94,7 @@ public enum SignUpSubViewType: Hashable {
     case authPhoneVerify(SMSSendResponse)
     case authAgreement(input: SignUpFormDomain)
 
+    case profileIntro(input: SignUpFormDomain)
     case authGreeting(input: SignUpFormDomain)
     case authProfileGender(input: SignUpFormDomain)
     case authProfileAge(input: SignUpFormDomain)
@@ -98,6 +103,7 @@ public enum SignUpSubViewType: Hashable {
     case authRegion(input: SignUpFormDomain)
     case authName(input: SignUpFormDomain)
 
+    case dreamPartnerIntro(input: SignUpFormDomain)
     case dreamPartnerAgeRange(input: SignUpFormDomain)
     case dreamPartnerJobOccupation(input: SignUpFormDomain)
     case dreamPartnerDistance(input: SignUpFormDomain)
@@ -108,6 +114,8 @@ public enum SignUpSubViewType: Hashable {
 
     public func hash(into hasher: inout Hasher) {
         switch self {
+        case .profileIntro:
+            hasher.combine(-1)
         case .authPhoneInput:
             hasher.combine(0)
         case .authPhoneVerify:
@@ -129,6 +137,8 @@ public enum SignUpSubViewType: Hashable {
         case .authName:
             hasher.combine(9)
 
+        case .dreamPartnerIntro:
+            hasher.combine(-2)
         case .dreamPartnerAgeRange:
             hasher.combine(10)
         case .dreamPartnerJobOccupation:

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/Profile/profile_border.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "profile_border.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/Profile/profile_default.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "profile_default.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/heart-with-arrow.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "heart-with-arrow.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/magnifying-glass.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "magnifying-glass.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/DesignSystem/DesignCore/Sources/Tooltip/ToolTip.swift

@@ -9,37 +9,63 @@
 import SwiftUI
 
 extension View {
-    public func tooltip(message: String, offset: CGFloat) -> some View {
+    public func tooltip(message: String?, offset: CGFloat) -> some View {
+        return modifier(ToolTipViewModifier(message: message, offset: offset))
+    }
+
+    public func tooltip(message: AttributedString?, offset: CGFloat) -> some View {
         return modifier(ToolTipViewModifier(message: message, offset: offset))
     }
 }
 
 struct ToolTipViewModifier: ViewModifier {
-    let message: String
+    let message: AttributedString?
     let offset: CGFloat
 
+    init(
+        message: AttributedString?,
+        offset: CGFloat
+    ) {
+        self.message = message
+        self.offset = offset
+    }
+
+    init(
+        message: String?,
+        offset: CGFloat
+    ) {
+        if let message {
+            self.message = .init(stringLiteral: message)
+        } else {
+            self.message = nil
+        }
+        self.offset = offset
+    }
+
     func body(content: Content) -> some View {
         content
             .overlay {
-                Text(message)
-                    .padding(.horizontal, 20)
-                    .padding(.vertical, 10)
-                    .typography(.regular_12)
-                    .foregroundStyle(.white)
-                    .multilineTextAlignment(.center)
-                    .background {
-                        ZStack {
-                            RoundedRectangle(cornerRadius: 6)
-                                .fill(DesignCore.Colors.grey400)
-                            VStack {
-                                Spacer()
-                                InvertedTriangle()
+                if let message {
+                    Text(message)
+                        .padding(.horizontal, 20)
+                        .padding(.vertical, 10)
+                        .typography(.regular_12)
+                        .foregroundStyle(.white)
+                        .multilineTextAlignment(.center)
+                        .background {
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 6)
+                                    .fill(DesignCore.Colors.grey400)
+                                VStack {
+                                    Spacer()
+                                    InvertedTriangle()
+                                }
+                                .offset(y: 12)
                             }
-                            .offset(y: 12)
                         }
-                    }
-                    .frame(width: 300)
-                    .offset(y: -offset)
+//                        .frame(width: 300)
+                        .offset(y: -offset)
+                }
             }
     }
 }

Projects/Features/Home/Sources/ProfilePannel/ProfilePannelView.swift

@@ -52,8 +52,12 @@ public struct ProfilePannelView: View {
             VStack(spacing: 6) {
                 HStack {
                     Spacer()
-                    RoundedRectangle(cornerRadius: 24)
-                        .frame(width: 102, height: 102)
+                    ZStack {
+                        DesignCore.Images.profileDefault.image
+                            .cornerRadius(20, corners: .allCorners)
+                        DesignCore.Images.profileBorder.image
+                    }
+                    .frame(width: 102, height: 102)
                     Spacer()
                 }
                 .shadow(.default)

Projects/Features/Home/UnitTest/WidgetUnitTest.swift

@@ -33,10 +33,7 @@ struct WidgetUnitTest {
             model: writeState,
             input: .init(
                 widgetType: .body,
-                content: nil,
-                successHandler: {
-
-                }
+                content: nil
             ),
             service: ProfileServiceMock()
         )

Projects/Features/SignUp/Sources/AuthSignUp/AuthAgreement/AuthAgreementIntent.swift

@@ -53,7 +53,7 @@ extension AuthAgreementIntent: AuthAgreementIntent.Intentable {
     func onTapNextButton() {
         Task {
             await AppCoordinator.shared.changeRootView(
-                .signUp(.authGreeting(input: input.input))
+                .signUp(.profileIntro(input: input.input))
             )
         }
     }

Projects/Features/SignUp/Sources/DreamPartnerInput/DreamPartnerAge/DreamPartnerAgeView.swift

@@ -137,7 +137,7 @@ public struct DreamPartnerAgeView: View {
         }
         .ignoresSafeArea(.keyboard)
         .textureBackground()
-        .setPopNavigation {
+        .setNavigation(showLeftBackButton: false) {
             AppCoordinator.shared.pop()
         }
         .setLoading(state.isLoading)