Merge pull request #37 from LearnMate-Dev/fix/#36

[Fix/#36] QA 반영

Author: iiuoon

Projects/Chat/Sources/View/ChatViewController.swift

@@ -44,6 +44,7 @@ public class ChatViewController: BaseViewController {
 
         // 초기에 endButton 숨기기
         chatView.hideEndButton()
+        setupTapGesture()
     }
 
     public override func setupViewProperty() {
@@ -242,4 +243,14 @@ public class ChatViewController: BaseViewController {
         // 이전 화면으로 이동
         navigationController?.popViewController(animated: true)
     }
+
+    private func setupTapGesture() {
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
+        tapGesture.cancelsTouchesInView = false
+        view.addGestureRecognizer(tapGesture)
+    }
+    
+    @objc private func dismissKeyboard() {
+        view.endEditing(true)
+    }
 }

Projects/CommonUI/Derived/Sources/TuistAssets+CommonUI.swift

@@ -39,7 +39,7 @@ public enum CommonUIAsset: Sendable {
     public static let lmRed02 = CommonUIColors(name: "LMRed02")
   }
   public enum Images {
-  public static let add = CommonUIImages(name: "add")
+    public static let add = CommonUIImages(name: "add")
     public static let back = CommonUIImages(name: "back")
     public static let bubble = CommonUIImages(name: "bubble")
     public static let close = CommonUIImages(name: "close")

Projects/CommonUI/Sources/Assets/Images.xcassets/Icon/profile.imageset/Contents.json

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

Projects/CommonUI/Sources/Assets/Images.xcassets/Icon/profile.imageset/[email protected]

@@ -57,6 +57,8 @@ public class LMAlert: UIView {
     // MARK: - Properties
     private var cancelAction: (() -> Void)?
     private var confirmAction: (() -> Void)?
+    private var titleTopConstraint: Constraint?
+    private var buttonTopConstraint: Constraint?
 
     // MARK: - Initialization
     public init(title: String, cancelTitle: String = "아니요", confirmTitle: String = "네") {
@@ -102,7 +104,7 @@ public class LMAlert: UIView {
         }
 
         titleLabel.snp.makeConstraints {
-            $0.top.equalToSuperview().inset(24)
+            self.titleTopConstraint = $0.top.equalToSuperview().inset(24).constraint
             $0.horizontalEdges.equalToSuperview().inset(20)
             $0.bottom.lessThanOrEqualTo(buttonStackView.snp.top).offset(-16)
         }
@@ -111,7 +113,7 @@ public class LMAlert: UIView {
             $0.bottom.equalToSuperview().inset(20)
             $0.horizontalEdges.equalToSuperview().inset(20)
             $0.height.equalTo(44)
-            $0.top.greaterThanOrEqualTo(titleLabel.snp.bottom).offset(16)
+            self.buttonTopConstraint = $0.top.greaterThanOrEqualTo(titleLabel.snp.bottom).offset(16).constraint
         }
     }
 
@@ -137,7 +139,10 @@ public class LMAlert: UIView {
         // cancelTitle이 비어있으면 취소 버튼 숨기기
         if cancelTitle.isEmpty {
             cancelButton.isHidden = true
+        } else {
+            cancelButton.isHidden = false
         }
+        updateSpacing(for: attributedString)
     }
 
     // MARK: - Actions
@@ -195,4 +200,40 @@ public class LMAlert: UIView {
             completion()
         }
     }
+
+    // MARK: - Layout Helpers
+    private func updateSpacing(for attributedString: NSAttributedString) {
+        let contentWidth: CGFloat = 280 - 40 // container width - horizontal inset
+        let lineCount = calculateLineCount(for: attributedString, maxWidth: contentWidth)
+        let spacing = spacingConfiguration(for: lineCount)
+        titleTopConstraint?.update(offset: spacing.topInset)
+        buttonTopConstraint?.update(offset: spacing.betweenSpacing)
+        layoutIfNeeded()
+    }
+    
+    private func spacingConfiguration(for lineCount: Int) -> (topInset: CGFloat, betweenSpacing: CGFloat) {
+        switch lineCount {
+        case ..<2:
+            return (32, 24)
+        case 2:
+            return (28, 20)
+        default:
+            return (24, 16)
+        }
+    }
+    
+    private func calculateLineCount(for attributedString: NSAttributedString, maxWidth: CGFloat) -> Int {
+        guard attributedString.length > 0 else { return 1 }
+        let boundingRect = attributedString.boundingRect(
+            with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude),
+            options: [.usesLineFragmentOrigin, .usesFontLeading],
+            context: nil
+        )
+        let font = (attributedString.attribute(.font, at: 0, effectiveRange: nil) as? UIFont) ?? titleLabel.font ?? .systemFont(ofSize: 16)
+        let paragraphStyle = attributedString.attribute(.paragraphStyle, at: 0, effectiveRange: nil) as? NSParagraphStyle
+        let lineHeight = font.lineHeight + (paragraphStyle?.lineSpacing ?? 0)
+        if lineHeight == 0 { return 1 }
+        let rawCount = Int(ceil(boundingRect.height / lineHeight))
+        return max(1, rawCount)
+    }
 }

Projects/CommonUI/Sources/Assets/Images.xcassets/Icon/profile.imageset/[email protected]

@@ -58,6 +58,7 @@ public enum CommonUIAssets {
     public static let IconNext = image(named: "next")
     public static let IconNext2 = image(named: "next2")
     public static let IconAdd = image(named: "add")
+    public static let IconProfile = image(named: "profile")
 
     /// color
     public static let LMOrange0 = color(named: "LMOrange00")

Projects/CommonUI/Sources/Component/LMAlert.swift

@@ -156,13 +156,19 @@ open class ChatView: UIView {
                 $0.center.equalToSuperview()
                 $0.leading.trailing.equalToSuperview().inset(16)
             }
+
+            // 탭 이벤트 설정
+            view.tag = index
+            view.isUserInteractionEnabled = true
+            let tap = UITapGestureRecognizer(target: self, action: #selector(handleRecommendTap(_:)))
+            view.addGestureRecognizer(tap)
         }
 
         titleLabel.snp.makeConstraints {
             $0.top.equalTo(self.safeAreaLayoutGuide).offset(20)
             $0.leading.equalToSuperview().inset(20)
         }
-        
+
         subtitleLabel.snp.makeConstraints {
             $0.top.equalTo(titleLabel.snp.bottom).offset(10)
             $0.leading.equalToSuperview().inset(20)
@@ -213,6 +219,18 @@ open class ChatView: UIView {
         }
     }
 
+    @objc private func handleRecommendTap(_ gesture: UITapGestureRecognizer) {
+        guard let view = gesture.view else { return }
+        let index = view.tag
+        guard index >= 0 && index < recommendLabels.count else { return }
+        let text = recommendLabels[index].text ?? ""
+        guard !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else { return }
+
+        // 추천 섹션 숨기고 바로 전송 콜백 호출
+        hideRecommendSection()
+        onSendButtonTapped?(text)
+    }
+
     // 추천 섹션 숨기기 메서드
     public func hideRecommendSection() {
         UIView.animate(withDuration: 0.3) {

Projects/CommonUI/Sources/Enum/CommonUIAssets.swift

@@ -56,24 +56,12 @@ open class DiaryView: UIView {
         bindEvents()
         calendarView.configureSubviews()
         calendarView.makeConstraints()
-        setupSampleEmotionData()
         updateMonthButtonTitle()
     }
 
     required public init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
-    private func setupSampleEmotionData() {
-        // 샘플 이모지 데이터 설정 (이미지와 동일하게)
-        let sampleEmotions: [Int: String] = [
-            1: "😢",  // 우는 얼굴
-            7: "😐",  // 무표정한 얼굴
-            12: "🥳", // 파티 모자
-            13: "😡"  // 화난 얼굴
-        ]
-        calendarView.setEmotionData(sampleEmotions)
-    }
 
     // MARK: Configuration
     func configureSubviews() {
@@ -108,11 +96,11 @@ open class DiaryView: UIView {
             $0.height.width.equalTo(monthLabel.snp.height)
         }
 
-        addButton.snp.makeConstraints {
-            $0.centerY.equalTo(monthLabel)
-            $0.trailing.equalToSuperview().inset(20)
-            $0.height.width.equalTo(monthLabel.snp.height)
-        }
+//        addButton.snp.makeConstraints {
+//            $0.centerY.equalTo(monthLabel)
+//            $0.trailing.equalToSuperview().inset(20)
+//            $0.height.width.equalTo(monthLabel.snp.height)
+//        }
 
         calendarView.snp.makeConstraints {
             $0.top.equalTo(monthLabel.snp.bottom).offset(17)
@@ -121,7 +109,7 @@ open class DiaryView: UIView {
         }
 
         diaryTodayView.snp.makeConstraints {
-            $0.top.equalTo(calendarView.snp.bottom).offset(3)
+            $0.top.equalTo(calendarView.snp.bottom).offset(30)
             $0.centerX.equalToSuperview()
             $0.width.equalToSuperview().inset(20)
             $0.height.equalTo(141)

Projects/CommonUI/Sources/View/Chat/ChatView.swift

@@ -126,7 +126,6 @@ open class HomeProgressView: UIView {
         self.layer.cornerRadius = 12
 
         courseLabel = courseLabel.then {
-            $0.text = "한국어 훈련 1단계"
             $0.textColor = CommonUIAssets.LMBlack
             $0.font = .systemFont(ofSize: 18, weight: .semibold)
         }