Merge pull request #522 from sopt-makers/hotfix/#521-Third-QA

[Hotfix] #521 - 신규 홈 뷰, 솝트로그 3차 QA 반영

Author: dlwogus0128

SOPT-iOS/Projects/Core/Sources/Literals/StringLiterals.swift

@@ -261,6 +261,8 @@ public struct I18N {
                 public static let attendance = "출석"
                 public static let event = "행사"
                 public static let seminar = "세미나"
+                public static let jointSeminar = "합동 세미나"
+                public static let `break` = "휴식"
             }
         }
 
@@ -322,6 +324,11 @@ public struct I18N {
         public static let poke = "콕찌르기"
         public static let soptamp = "솝탬프"
         public static let withSopt = "솝트와"
+        public static let toolTipTitle = "솝레벨이란?"
+        public static let toolTip = """
+                                    앱잼, 솝커톤, 솝텀, 모임 등 다양한
+                                    솝트 활동에 참여한 횟수를 의미해요.
+                                    """
     }
 
     public struct Attendance {

SOPT-iOS/Projects/Features/AttendanceFeature/Sources/ShowAttendanceScene/VC/ShowAttendanceVC.swift

@@ -66,7 +66,6 @@ public final class ShowAttendanceVC: UIViewController, ShowAttendanceViewControl
 
     private lazy var attendanceButtonStackView: UIStackView = {
         let stackView = UIStackView()
-//        stackView.backgroundColor = DSKitAsset.Colors.gray900.color // 안쓰는거같음
         stackView.addArrangedSubview(attendanceButton)
         return stackView
     }()

SOPT-iOS/Projects/Features/HomeFeature/Sources/HomeScene/Components/TagTypes/CalenderCategoryTagType.swift

@@ -14,31 +14,41 @@ import DSKit
 enum CalenderCategoryTagType: String {
     case event = "EVENT"
     case seminar = "SEMINAR"
+    case jointSeminar = "JOINT_SEMINAR"
+    case `break` = "BREAK"
 
     var text: String {
         switch self {
         case .event:
             return I18N.Home.DashBoard.Attendance.event
         case .seminar:
             return I18N.Home.DashBoard.Attendance.seminar
+        case .jointSeminar:
+            return I18N.Home.DashBoard.Attendance.jointSeminar
+        case .break:
+            return I18N.Home.DashBoard.Attendance.break
         }
     }
 
     var textColor: UIColor {
         switch self {
         case .event:
             return DSKitAsset.Colors.success.color
-        case .seminar:
+        case .seminar, .jointSeminar:
             return DSKitAsset.Colors.secondary.color
+        case .break:
+            return DSKitAsset.Colors.information.color
         }
     }
 
     var backgroundColor: UIColor {
         switch self {
         case .event:
             return DSKitAsset.Colors.success.color.withAlphaComponent(0.2)
-        case .seminar:
+        case .seminar, .jointSeminar:
             return DSKitAsset.Colors.secondary.color.withAlphaComponent(0.2)
+        case .break:
+            return DSKitAsset.Colors.information.color.withAlphaComponent(0.2)
         }
     }
 }

SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/SoptlogFeatureBuildable.swift

@@ -10,4 +10,5 @@ import Foundation
 
 public protocol SoptlogFeatureBuildable {
     func makeSoptlog() -> SoptlogPresentable
+    func makeSoptlogToolTip(_ toolTipFrame: CGRect) -> SoptlogTooltipPresentable
 }

SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/SoptlogPresentable.swift

@@ -14,6 +14,7 @@ import Core
 public protocol SoptlogViewControllable: ViewControllable { }
 public protocol SoptlogCoordinatable {
     var onProfileEditTapped: (() -> Void)? { get set }
+    var onToolTipTapped: ((CGRect) -> Void)? { get set }
     var onSoptuneTapped: (() -> Void)? { get set }
     var onNetworkError: (() -> Void)? { get set }
     var onNeedSignIn: (() -> Void)? { get set }

SOPT-iOS/Projects/Features/SoptlogFeature/Interface/Sources/SoptlogToolTipPresentable.swift

@@ -0,0 +1,19 @@
+//
+//  SoptlogToolTipPresentable.swift
+//  SoptlogFeatureInterface
+//
+//  Created by 강윤서 on 3/26/25.
+//  Copyright © 2025 SOPT-iOS. All rights reserved.
+//
+
+import Foundation
+
+import BaseFeatureDependency
+import Core
+
+public protocol SoptlogToolTipViewControllable: ViewControllable { }
+public protocol SoptlogToolTipCoordinatable {
+    var onDismissButtonTap: (() -> Void)? { get set }
+}
+public typealias SoptlogToolTipViewModelType = ViewModelType & SoptlogToolTipCoordinatable
+public typealias SoptlogTooltipPresentable = (vc: SoptlogToolTipViewControllable, vm: any SoptlogToolTipViewModelType)

SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/SoptlogAppServiceCVC.swift

@@ -7,12 +7,21 @@
 //
 
 import UIKit
+import Combine
 
 import Core
 import DSKit
 
 final class SoptlogAppServiceCVC: UICollectionViewCell {
 
+    // MARK: - Properties
+
+    lazy var toolTipButtonTapped = infoToolTipButton.publisher(for: .touchUpInside)
+        .withUnretained(self)
+        .map { owner, _ in
+            owner.infoToolTipButton.convert(owner.infoToolTipButton.bounds, to: nil)
+        }.asDriver()
+    
     // MARK: - UI Components
 
     private let stackView = UIStackView(frame: .zero).then {
@@ -35,6 +44,16 @@ final class SoptlogAppServiceCVC: UICollectionViewCell {
         $0.font = DSKitFontFamily.Suit.bold.font(size: 16)
     }
 
+    private let serviceTitleStackView = UIStackView().then {
+        $0.axis = .horizontal
+        $0.spacing = 1
+    }
+    
+    private let infoToolTipButton = UIButton().then {
+        $0.setImage(DSKitAsset.Assets.icInfo.image, for: .normal)
+        $0.isHidden = true
+    }
+    
     // MARK: - init
 
     override init(frame: CGRect) {
@@ -46,11 +65,6 @@ final class SoptlogAppServiceCVC: UICollectionViewCell {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
-    override func prepareForReuse() {
-        super.prepareForReuse()
-        self.stackView.removeAllSubViews()
-    }
 }
 
 // MARK: - UI & Layout
@@ -61,18 +75,26 @@ extension SoptlogAppServiceCVC {
     }
 
     private func setLayout() {
-        stackView.addArrangedSubviews(serviceLabel, serviceImageView, serviceValue)
+        setStackView()
+        contentView.addSubviews(stackView)
 
         serviceImageView.snp.makeConstraints { make in
             make.size.equalTo(39)
         }
 
-        contentView.addSubviews(stackView)
+        infoToolTipButton.snp.makeConstraints { make in
+            make.size.equalTo(16)
+        }
 
         stackView.snp.makeConstraints { make in
             make.center.equalToSuperview()
         }
     }
+    
+    private func setStackView() {
+        serviceTitleStackView.addArrangedSubviews(serviceLabel, infoToolTipButton)
+        stackView.addArrangedSubviews(serviceTitleStackView, serviceImageView, serviceValue)
+    }
 }
 
 // MARK: - Methods
@@ -83,5 +105,6 @@ extension SoptlogAppServiceCVC {
         self.serviceLabel.text = model.serviceName
         self.serviceValue.text = model.serviceValue
         self.serviceImageView.setImage(with: model.serviceImageURL)
+        self.infoToolTipButton.isHidden = model.serviceName != "솝레벨"
     }
 }

SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Cell/SoptlogHeaderView.swift

@@ -15,7 +15,7 @@ final class SoptlogHeaderView: UICollectionReusableView {
 
     // MARK: - UI Components
 
-    private let profileImageView = CustomProfileImageView()
+    private let profileImageView = CustomProfileImageView().hideBorder()
 
     private let nameLabel = UILabel().then {
         $0.font = DSKitFontFamily.Suit.bold.font(size: 20)

SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Coordinator/SoptlogBuilder.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2024 SOPT-iOS. All rights reserved.
 //
 
+import Foundation
+
 import Core
 import Domain
 @_exported import SoptlogFeatureInterface
@@ -23,4 +25,10 @@ extension SoptlogBuilder: SoptlogFeatureBuildable {
         let soptlogVC = SoptlogVC(viewModel: viewModel)
         return (soptlogVC, viewModel)
     }
+    
+    public func makeSoptlogToolTip(_ toolTipFrame: CGRect) -> SoptlogTooltipPresentable {
+        let viewModel = SoptlogToolTipViewModel()
+        let soptlogToolTipVC = SoptlogToolTipVC(viewModel: viewModel, toolTipFrame: toolTipFrame)
+        return (soptlogToolTipVC, viewModel)
+    }
 }

SOPT-iOS/Projects/Features/SoptlogFeature/Sources/SoptlogScene/Coordinator/SoptlogCoordinator.swift

@@ -57,6 +57,10 @@ public final class SoptlogCoordinator: DefaultCoordinator {
             self?.requestCoordinating?(.webLink(url: url))
         }
 
+        soptlog.vm.onToolTipTapped = { [weak self] toolTipFrame in
+            self?.showToolTip(toolTipFrame)
+        }
+        
         soptlog.vm.onSoptuneTapped = { [weak self] in
             self?.requestCoordinating?(.dailySoptune)
         }
@@ -72,4 +76,16 @@ public final class SoptlogCoordinator: DefaultCoordinator {
         self.rootViewController = soptlog.vc.viewController
         self.router.push(soptlog.vc)
     }
+    
+    private func showToolTip(_ frame: CGRect) {
+        var soptlogToolTip = factory.makeSoptlogToolTip(frame)
+        
+        soptlogToolTip.vm.onDismissButtonTap = { [weak self] in
+            self?.rootViewController?.dismiss(animated: true )
+        }
+        
+        soptlogToolTip.vc.viewController.modalPresentationStyle = .overFullScreen
+        soptlogToolTip.vc.viewController.modalTransitionStyle = .crossDissolve
+        self.rootViewController?.present(soptlogToolTip.vc.viewController, animated: true)
+    }
 }