Merge pull request #41 from Student-Center/working/WEAV-122

[WEAV-122] �프로필 위젯 입력 기능 구현

.github/workflows/deploy.yml

@@ -9,8 +9,7 @@ on:
 
 jobs:
   build:
-
-    runs-on: macos-latest
+    runs-on: macos-15
     environment: develop
     env:
       # app archive 및 export 에 쓰일 환경 변수 설정

.github/workflows/unitTest.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   run-unitTest:
 
-    runs-on: macos-latest
+    runs-on: macos-15
 
     steps:
     - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
       run: |
         set -o pipefail && xcodebuild test \
           -scheme three-days-UnitTest \
-          -destination 'platform=iOS Simulator,name=iPhone 15,OS=latest' \
+          -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' \
           | tee result.log
         if grep -q "** TEST FAILED **" result.log; then
           exit 1

Projects/Core/CommonKit/Sources/AppCoordinator.swift

@@ -43,6 +43,7 @@ public final class AppCoordinator: ObservableObject {
                 }
             }
         }
+        startRefreshMyUserInfo()
     }
 
     @MainActor
@@ -100,4 +101,25 @@ public final class AppCoordinator: ObservableObject {
             }
         }
     }
+
+    public func refreshMyUserInfo() async throws {
+        if TokenManager.accessToken == nil || TokenManager.accessToken == "" {
+            return
+        }
+        let userInfo = try await authService.requestMyUserInfo()
+        await MainActor.run {
+            self.userInfo = userInfo
+            AuthState.change(.login)
+        }
+    }
+
+    // 20초마다 한번씩 refreshMyUserInfo() 를 호출
+    private func startRefreshMyUserInfo() {
+        Task {
+            while true {
+                try? await Task.sleep(for: .seconds(20))
+                try? await refreshMyUserInfo()
+            }
+        }
+    }
 }

Projects/DesignSystem/DesignCore/Sources/Color+Ext.swift → Projects/Core/CoreKit/Sources/Color+Ext.swift

@@ -1,9 +1,9 @@
 //
 //  Color+Ext.swift
-//  DesignCore
+//  CoreKit
 //
-//  Created by 김지수 on 9/14/24.
-//  Copyright © 2024 com.studentcenter. All rights reserved.
+//  Created by 김지수 on 11/11/24.
+//  Copyright © 2024 com.weave. All rights reserved.
 //
 
 import SwiftUI

Projects/Core/CoreKit/Sources/String+Ext.swift

@@ -34,4 +34,13 @@ extension String {
             return "\(firstPart)-\(secondPart)-\(thirdPart)"
         }
     }
+
+    public func clipMaxCount(_ maxCount: Int) -> String {
+        if self.count > maxCount {
+            let index = self.index(self.startIndex, offsetBy: maxCount)
+            let formattedText = String(self[..<index])
+            return formattedText
+        }
+        return self
+    }
 }

Projects/Core/NetworkKit/Sources/AuthService/AuthServiceMock.swift

@@ -63,7 +63,8 @@ public class AuthServiceMock: AuthServiceProtocol {
                 jobOccupations: [],
                 distanceType: .anywhere,
                 allowSameCompany: nil
-            )
+            ),
+            profileWidgets: []
         )
     }
 }

Projects/Core/NetworkKit/Sources/ProfileService/ProfileService.swift

@@ -0,0 +1,56 @@
+//
+//  ProfileService.swift
+//  CommonKit
+//
+//  Created by 김지수 on 11/14/24.
+//  Copyright © 2024 com.weave. All rights reserved.
+//
+
+import Foundation
+import CoreKit
+import OpenapiGenerated
+import Model
+
+public protocol ProfileServiceProtocol {
+    func requestPutProfileWidget(
+        widgetType: Components.Schemas.ProfileWidgetType,
+        content: String
+    ) async throws
+
+    func requestDeleteProfileWidget(
+        widgetType: Components.Schemas.ProfileWidgetType
+    ) async throws
+}
+
+public final class ProfileService {
+    public static let shared = ProfileService()
+    private init() {}
+}
+
+extension ProfileService: ProfileServiceProtocol {
+    public func requestPutProfileWidget(
+        widgetType: Components.Schemas.ProfileWidgetType,
+        content: String
+    ) async throws {
+        let result = try await client.putProfileWidget(
+            body: .json(
+                .init(
+                    _type: widgetType,
+                    content: content
+                )
+            )
+        )
+        let _ = try result.ok
+    }
+
+    public func requestDeleteProfileWidget(
+        widgetType: Components.Schemas.ProfileWidgetType
+    ) async throws {
+        let response = try await client.deleteProfileWidget(
+            .init(
+                path: .init(_type: widgetType)
+            )
+        )
+        _ = try response.noContent
+    }
+}

Projects/Core/NetworkKit/Sources/ProfileService/ProfileServiceMock.swift

@@ -0,0 +1,30 @@
+//
+//  ProfileServiceMock.swift
+//  NetworkKit
+//
+//  Created by 김지수 on 11/15/24.
+//  Copyright © 2024 com.weave. All rights reserved.
+//
+
+import Foundation
+import OpenapiGenerated
+import CoreKit
+
+public final class ProfileServiceMock: ProfileServiceProtocol {
+    public init() {}
+
+    public func requestPutProfileWidget(
+        widgetType: Components.Schemas.ProfileWidgetType,
+        content: String
+    ) async throws {
+        print("✅ [ProfileServiceMock] requestPutProfileWidget 성공!")
+        return
+    }
+
+    public func requestDeleteProfileWidget(
+        widgetType: Components.Schemas.ProfileWidgetType
+    ) async throws {
+        print("✅ [ProfileServiceMock] requestDeleteProfileWidget 성공!")
+        return
+    }
+}

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/pencil 1.imageset/Contents.json

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

Projects/DesignSystem/DesignCore/Resources/Images/Images.xcassets/plus_circle_filled.imageset/Contents.json

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

Projects/DesignSystem/DesignCore/Sources/FlatTextFieldOption.swift

@@ -0,0 +1,29 @@
+//
+//  FlatTextFieldOption.swift
+//  DesignCore
+//
+//  Created by 김지수 on 11/14/24.
+//  Copyright © 2024 com.weave. All rights reserved.
+//
+
+import SwiftUI
+
+struct FlatTextFieldOptionModifier: ViewModifier {
+    let keyboardType: UIKeyboardType
+
+    func body(content: Content) -> some View {
+        content
+            .keyboardType(keyboardType)
+            .interactiveDismissDisabled()
+            .textInputAutocapitalization(.never)
+            .autocorrectionDisabled()
+            .speechAnnouncementsQueued(false)
+            .speechSpellsOutCharacters(false)
+    }
+}
+
+extension View {
+    public func flatTextFieldOption(keyboardType: UIKeyboardType = .default) -> some View {
+        modifier(FlatTextFieldOptionModifier(keyboardType: keyboardType))
+    }
+}

Projects/DesignSystem/DesignCore/Sources/ProfileWidget/ProfileWidgetView.swift

@@ -0,0 +1,82 @@
+//
+//  ProfileWidgetView.swift
+//  DesignCore
+//
+//  Created by 김지수 on 11/7/24.
+//  Copyright © 2024 com.weave. All rights reserved.
+//
+
+import SwiftUI
+import CoreKit
+
+public enum ProfileWidgetIconType {
+    case add
+    case edit
+
+    var image: Image {
+        switch self {
+        case .add: DesignCore.Images.plusCircleFilled.image
+        case .edit: DesignCore.Images.pencil1.image
+        }
+    }
+}
+
+public struct ProfileWidgetView: View {
+
+    public let title: String
+    public let bodyText: String
+    public let titleColor: Color
+    public let bodyColor: Color
+    public let gradientColors: [Color]
+    public var iconType: ProfileWidgetIconType?
+
+    public init(
+        title: String,
+        bodyText: String,
+        titleColor: Color,
+        bodyColor: Color,
+        gradientColors: [Color],
+        iconType: ProfileWidgetIconType? = nil
+    ) {
+        self.title = title
+        self.bodyText = bodyText
+        self.titleColor = titleColor
+        self.bodyColor = bodyColor
+        self.gradientColors = gradientColors
+        self.iconType = iconType
+    }
+
+    public var body: some View {
+        ZStack {
+            RoundedRectangle(cornerRadius: 24)
+                .fill(
+                    LinearGradient(
+                        colors: gradientColors,
+                        startPoint: .top,
+                        endPoint: .bottom
+                    )
+                )
+            VStack {
+                HStack {
+                    Text(title)
+                        .pretendard(weight: ._600, size: 22)
+                        .foregroundStyle(titleColor)
+                    Spacer()
+                    if let iconType {
+                        iconType.image
+                            .resizable()
+                            .frame(width: 22, height: 22)
+                    }
+                }
+                Spacer()
+                ScrollView {
+                    LeftAlignText(bodyText)
+                        .typography(.regular_14)
+                        .foregroundStyle(bodyColor)
+                }
+            }
+            .scrollIndicators(.hidden)
+            .padding(.all, 20)
+        }
+    }
+}