[Feature] 화이트보드에 그림 추가 기능 구현(2차)

Domain/Domain/Sources/Entity/DrawingObject.swift

@@ -8,14 +8,17 @@ import Foundation
 
 public class DrawingObject: WhiteboardObject {
     public private(set) var points: [CGPoint]
+    public let lineWidth: CGFloat
 
     public init(
         id: UUID,
         position: CGPoint,
         size: CGSize,
-        points: [CGPoint]
+        points: [CGPoint],
+        lineWidth: CGFloat
     ) {
         self.points = points
+        self.lineWidth = lineWidth
         super.init(
             id: id,
             position: position,

Domain/Domain/Sources/Interface/UseCase/DrawObjectUseCaseInterface.swift

@@ -8,21 +8,23 @@
 import Foundation
 
 public protocol DrawObjectUseCaseInterface {
-    /// 그림을 그리기 시작한 점
-    var origin: CGPoint? { get }
 
     /// 선을 나타내는 점들의 배열
     var points: [CGPoint] { get }
 
-    /// 그리기를 시작하는 메서드
+    /// 선의 굵기를 설정합니다.
+    /// - Parameter width: 선의 너비
+    func setLineWidth(width: CGFloat)
+
+    /// 그리기를 시작합니다.
     /// - Parameter point: 시작 지점 CGPoint
     func startDrawing(at point: CGPoint)
 
-    /// 그림 그리는 중에 새로운 점을 추가하는 메서드
+    /// 그림 그리는 중에 새로운 점을 추가합니다.
     /// - Parameter point: 추가할 점의 CGPoint
     func addPoint(point: CGPoint)
 
-    /// 그림 그리기를 종료하는 메서드
+    /// 그림 그리기를 종료합니다.
     /// - Returns: 완성된 그림 객체 (옵셔널)
     func finishDrawing() -> DrawingObject?
 }

Domain/Domain/Sources/Interface/UseCase/ManageWhiteboardObjectUseCaseInterface.swift

@@ -20,14 +20,17 @@ public protocol ManageWhiteboardObjectUseCaseInterface {
     /// 화이트보드 객체를 추가하는 메서드
     /// - Parameter whiteboardObject: 추가할 화이트보드 객체
     /// - Returns: 추가 성공 여부
+    @discardableResult
     func addObject(whiteboardObject: WhiteboardObject) -> Bool
 
     /// 화이트보드 객체를 수정하는 메서드
     /// - Parameter whiteboardObject: 수정할 화이트보드 객체
     /// - Returns: 추가 성공 여부
+    @discardableResult
     func updateObject(whiteboardObject: WhiteboardObject) -> Bool
 
     /// 화이트보드를 제거하는 메서드
     /// - Returns: 추가 성공 여부
+    @discardableResult
     func removeObject(whiteboardObject: WhiteboardObject) -> Bool
 }

Domain/Domain/Sources/UseCase/DrawObjectUseCase.swift

@@ -9,14 +9,18 @@ import Foundation
 
 public final class DrawObjectUseCase: DrawObjectUseCaseInterface {
     public private(set) var points: [CGPoint]
-    public private(set) var origin: CGPoint?
+    public private(set) var lineWidth: CGFloat
 
     public init() {
         points = []
+        lineWidth = 5
+    }
+
+    public func setLineWidth(width: CGFloat) {
+        lineWidth = width
     }
 
     public func startDrawing(at point: CGPoint) {
-        origin = point
         points = [point]
     }
 
@@ -32,29 +36,29 @@ public final class DrawObjectUseCase: DrawObjectUseCaseInterface {
         }
 
         guard
-            let origin,
             let minX = xPoints.min(),
             let maxX = xPoints.max(),
             let minY = yPoints.min(),
             let maxY = yPoints.max()
         else { return nil }
-
-        let size = CGSize(width: maxX - minX, height: maxY - minY)
+        let padding = lineWidth / 2
+        let origin = CGPoint(x: minX - padding, y: minY - padding)
+        let size = CGSize(width: maxX - minX + padding * 2, height: maxY - minY + padding * 2)
         let adjustedPoints = points.map {
-            CGPoint(x: $0.x - minX, y: $0.y - minY)
+            CGPoint(x: $0.x - minX + padding, y: $0.y - minY + padding)
         }
 
         let drawingObject = DrawingObject(
             id: UUID(),
             position: origin,
             size: size,
-            points: adjustedPoints)
+            points: adjustedPoints,
+            lineWidth: lineWidth)
 
         return drawingObject
     }
 
     private func reset() {
-        origin = nil
         points.removeAll()
     }
 }

Domain/Domain/Sources/UseCase/ManageWhiteboardToolUseCase.swift

@@ -21,7 +21,12 @@ public final class ManageWhiteboardToolUseCase: ManageWhiteboardToolUseCaseInter
     }
 
     public func selectTool(tool: WhiteboardTool) {
-        currentToolSubject.send(tool)
+        let previousTool = currentToolSubject.value
+        if previousTool == tool {
+            currentToolSubject.send(nil)
+        } else {
+            currentToolSubject.send(tool)
+        }
     }
 
     public func finishUsingTool() {

Domain/DomainTests/DrawObjectUseCaseTests.swift

@@ -8,80 +8,69 @@ import Domain
 import XCTest
 
 final class DrawObjectUseCaseTests: XCTestCase {
+    let lineWidth: CGFloat = 1
     var useCase: DrawObjectUseCaseInterface!
 
     override func setUpWithError() throws {
         useCase = DrawObjectUseCase()
+        useCase.setLineWidth(width: lineWidth)
     }
 
     override func tearDownWithError() throws {
         useCase = nil
     }
-
-    // startDrawing시, 시작 좌표를 올바르게 설정하는지 확인
-    func testStartDrawingSetsOrigin() {
-        let startPoint = CGPoint(x: 100, y: 100)
-        useCase.startDrawing(at: startPoint)
-
-        XCTAssertEqual(startPoint, useCase.origin)
-    }
-
+
     // 그림을 그릴 때, points 배열에 점들을 올바르게 추가하는지 확인
     func testAddPointToArray() {
+        // 준비
         let startPoint = CGPoint(x: 100, y: 100)
         let point1 = CGPoint(x: 115, y: 115)
         let point2 = CGPoint(x: 15, y: 30)
 
+        // 실행
         useCase.startDrawing(at: startPoint)
         useCase.addPoint(point: point1)
         useCase.addPoint(point: point2)
 
+        // 검증
         XCTAssertEqual(useCase.points, [startPoint, point1, point2])
     }
 
     // finishDrawing이 올바르게 DrawingObject를 생성하는지 확인
      func testFinishDrawingCreatesAndSendsDrawingObject() {
+         // 준비
          useCase.startDrawing(at: CGPoint(x: 10, y: 10))
          useCase.addPoint(point: CGPoint(x: 11, y: 11))
          useCase.addPoint(point: CGPoint(x: 12, y: 12))
          useCase.addPoint(point: CGPoint(x: 13, y: 13))
+         let padding = lineWidth / 2
+         let expectedAdjustedPoints = [
+             CGPoint(x: 0 + padding, y: 0 + padding),
+             CGPoint(x: 1 + padding, y: 1 + padding),
+             CGPoint(x: 2 + padding, y: 2 + padding),
+             CGPoint(x: 3 + padding, y: 3 + padding)]
 
+         // 실행
          let drawingObject = useCase.finishDrawing()
 
+         // 검증
          XCTAssertNotNil(drawingObject)
-         XCTAssertEqual(drawingObject?.position, CGPoint(x: 10, y: 10))
-         XCTAssertEqual(drawingObject?.size, CGSize(width: 3, height: 3))
-
-         let expectedAdjustedPoints = [
-             CGPoint(x: 0, y: 0),
-             CGPoint(x: 1, y: 1),
-             CGPoint(x: 2, y: 2),
-             CGPoint(x: 3, y: 3)]
+         XCTAssertEqual(drawingObject?.position, CGPoint(x: 10 - padding, y: 10 - padding))
+         XCTAssertEqual(drawingObject?.size, CGSize(width: 3 + padding * 2, height: 3 + padding * 2))
          XCTAssertEqual(drawingObject?.points, expectedAdjustedPoints)
      }
 
     // 그림 그린 후 useCase 내부 상태 초기화가 되는지 확인
     func testResetAfterFinishDrawing() {
+        // 준비
         useCase.startDrawing(at: CGPoint(x: 10, y: 10))
         useCase.addPoint(point: CGPoint(x: 110, y: 110))
         useCase.addPoint(point: CGPoint(x: 120, y: 120))
+
+        // 실행
         _ = useCase.finishDrawing()
 
-        XCTAssertNil(useCase.origin)
+        // 검증
         XCTAssertEqual(useCase.points.count, 0)
     }
 }
-
-final class MockWhiteboardObjectRepository: WhiteboardObjectRepositoryInterface {
-    private var continuation: AsyncStream<WhiteboardObject>.Continuation?
-
-    func send(whiteboardObject: WhiteboardObject) {
-        continuation?.yield(whiteboardObject)
-    }
-
-    func whiteboardObjectAsyncStream() -> AsyncStream<WhiteboardObject> {
-        return AsyncStream { continuation in
-            self.continuation = continuation
-        }
-    }
-}

Presentation/Presentation.xcodeproj/project.pbxproj

@@ -13,6 +13,8 @@
 		0080E8D12CE4A00F0095B958 /* WhiteboardViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0080E8D02CE4A0060095B958 /* WhiteboardViewModel.swift */; };
 		0080E8D32CE4A0840095B958 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0080E8D22CE4A0820095B958 /* ViewModel.swift */; };
 		00CCC2672CE60BCD005FA747 /* AirplainFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8525DC72CE201D50089DA5E /* AirplainFont.swift */; };
+		00D2DD982CE8CD300089F0BA /* DrawingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D2DD972CE8CD300089F0BA /* DrawingView.swift */; };
+		00D2DD9A2CE8DCEA0089F0BA /* DrawingObjectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D2DD992CE8DCEA0089F0BA /* DrawingObjectView.swift */; };
 		5B2BC78E2CE4F66F00893B9E /* WhiteboardListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B2BC78A2CE4F66F00893B9E /* WhiteboardListViewController.swift */; };
 		5B2BC78F2CE4F66F00893B9E /* WhiteboardListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B2BC78C2CE4F66F00893B9E /* WhiteboardListViewModel.swift */; };
 		5B7C6EBA2CDB6C5C0024704A /* Domain.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B7C6EB92CDB6C5C0024704A /* Domain.framework */; };
@@ -51,6 +53,8 @@
 		0080E8C92CE2FF6E0095B958 /* WhiteboardObjectViewFactoryable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhiteboardObjectViewFactoryable.swift; sourceTree = "<group>"; };
 		0080E8D02CE4A0060095B958 /* WhiteboardViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhiteboardViewModel.swift; sourceTree = "<group>"; };
 		0080E8D22CE4A0820095B958 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
+		00D2DD972CE8CD300089F0BA /* DrawingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawingView.swift; sourceTree = "<group>"; };
+		00D2DD992CE8DCEA0089F0BA /* DrawingObjectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawingObjectView.swift; sourceTree = "<group>"; };
 		5B2BC78A2CE4F66F00893B9E /* WhiteboardListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhiteboardListViewController.swift; sourceTree = "<group>"; };
 		5B2BC78C2CE4F66F00893B9E /* WhiteboardListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhiteboardListViewModel.swift; sourceTree = "<group>"; };
 		5B7C6E502CDB6A380024704A /* Presentation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Presentation.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -88,6 +92,7 @@
 				0080E8C52CE2F04F0095B958 /* WhiteboardObjectView.swift */,
 				6F199EF02CE31A05005DC40F /* WhiteboardToolBar.swift */,
 				6F21477C2CE4EFCF00B55E2C /* TextObjectView.swift */,
+				00D2DD992CE8DCEA0089F0BA /* DrawingObjectView.swift */,
 			);
 			path = ObjectView;
 			sourceTree = "<group>";
@@ -135,6 +140,7 @@
 			isa = PBXGroup;
 			children = (
 				6F199EF22CE3203A005DC40F /* WhiteboardViewController.swift */,
+				00D2DD972CE8CD300089F0BA /* DrawingView.swift */,
 				004645F22CE60A1B00C76EDB /* ObjectView */,
 			);
 			path = View;
@@ -383,12 +389,14 @@
 				A8E97ABF2CE4E94D00B28063 /* SelectProfileIconViewController.swift in Sources */,
 				A8E979C52CE493E900B28063 /* ProfileViewController.swift in Sources */,
 				A85260252CE3447E0089DA5E /* UIColor+.swift in Sources */,
+				00D2DD982CE8CD300089F0BA /* DrawingView.swift in Sources */,
 				A8E979CA2CE49A1800B28063 /* ProfileViewModel.swift in Sources */,
 				0080E8C62CE2F0510095B958 /* WhiteboardObjectView.swift in Sources */,
 				A8525DCB2CE203D50089DA5E /* UIView+.swift in Sources */,
 				6F199EF32CE3203A005DC40F /* WhiteboardViewController.swift in Sources */,
 				6F199EF12CE31A05005DC40F /* WhiteboardToolBar.swift in Sources */,
 				6F21477D2CE4EFCF00B55E2C /* TextObjectView.swift in Sources */,
+				00D2DD9A2CE8DCEA0089F0BA /* DrawingObjectView.swift in Sources */,
 				0080E8D12CE4A00F0095B958 /* WhiteboardViewModel.swift in Sources */,
 				0080E8D32CE4A0840095B958 /* ViewModel.swift in Sources */,
 				5B2BC78E2CE4F66F00893B9E /* WhiteboardListViewController.swift in Sources */,

Presentation/Presentation/Sources/Whiteboard/Factory/WhiteboardObjectViewFactoryable.swift

@@ -8,15 +8,16 @@ import Domain
 import Foundation
 
 protocol WhiteboardObjectViewFactoryable {
-    func create(with whiteboardObject: WhiteboardObject) -> WhiteboardObjectView
+    func create(with whiteboardObject: WhiteboardObject) -> WhiteboardObjectView?
 }
 
 struct WhiteboardObjectViewFactory: WhiteboardObjectViewFactoryable {
-    func create(with whiteboardObject: WhiteboardObject) -> WhiteboardObjectView {
+    func create(with whiteboardObject: WhiteboardObject) -> WhiteboardObjectView? {
         switch whiteboardObject {
         case let textObject as TextObject:
             return TextObjectView(textObject: textObject)
-        // TODO: 오브젝트 별 case 추가 예정
+        case let drawingObject as DrawingObject:
+            return DrawingObjectView(drawingObject: drawingObject)
         default:
             break
         }

Presentation/Presentation/Sources/Whiteboard/Util/DrawingRenderer.swift

@@ -17,7 +17,8 @@ struct DrawingRenderer: DrawingRendererInterface {
 
         let renderer = UIGraphicsImageRenderer(size: drawingObject.size)
         let image = renderer.image { context in
-            context.cgContext.setLineWidth(5)
+            context.cgContext.setLineCap(.round)
+            context.cgContext.setLineWidth(drawingObject.lineWidth)
             context.cgContext.setStrokeColor(UIColor.black.cgColor)
             context.cgContext.move(to: startPoint)
 

Presentation/Presentation/Sources/Whiteboard/View/DrawingView.swift

@@ -0,0 +1,78 @@
+//
+//  DrawingView.swift
+//  Presentation
+//
+//  Created by 이동현 on 11/16/24.
+//
+
+import UIKit
+
+protocol DrawingViewDelegate: AnyObject {
+    func drawingView(_ sender: DrawingView, at point: CGPoint)
+    func drawingViewDidStartDrawing(_ sender: DrawingView, at point: CGPoint)
+    func drawingViewDidEndDrawing(_ sender: DrawingView)
+}
+
+final class DrawingView: UIView {
+    private var drawingLayer = CAShapeLayer()
+    private var drawingPath = UIBezierPath()
+    private var previousPoint: CGPoint?
+    weak var delegate: DrawingViewDelegate?
+
+    init() {
+        super.init(frame: .zero)
+        configureAttributes()
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        configureAttributes()
+    }
+
+    func reset() {
+        drawingLayer.path = nil
+        drawingPath.removeAllPoints()
+        previousPoint = nil
+    }
+
+    private func configureAttributes() {
+        backgroundColor = .clear
+        drawingLayer.strokeColor = UIColor.black.cgColor
+        drawingLayer.lineWidth = 5
+        drawingLayer.lineCap = .round
+        layer.addSublayer(drawingLayer)
+
+        let drawingGesture = UIPanGestureRecognizer(target: self, action: #selector(handleDrawingGesture(sender:)))
+        drawingGesture.minimumNumberOfTouches = 1
+        drawingGesture.maximumNumberOfTouches = 1
+        self.addGestureRecognizer(drawingGesture)
+    }
+
+    @objc private func handleDrawingGesture(sender: UIPanGestureRecognizer) {
+        let point = sender.location(in: self)
+
+        switch sender.state {
+        case .began:
+            previousPoint = point
+            delegate?.drawingViewDidStartDrawing(self, at: point)
+            drawLine(to: point)
+        case .changed:
+            delegate?.drawingView(self, at: point)
+            drawLine(to: point)
+        case .ended:
+            delegate?.drawingViewDidEndDrawing(self)
+            previousPoint = nil
+        default:
+            break
+        }
+    }
+
+    private func drawLine(to point: CGPoint) {
+        guard let previousPoint else { return }
+
+        drawingPath.move(to: previousPoint)
+        drawingPath.addLine(to: point)
+        drawingLayer.path = drawingPath.cgPath
+        self.previousPoint = point
+    }
+}