[Alex] Step4 다형성을 적용한 리팩토링

DrawingApp/DrawingApp.xcodeproj/xcshareddata/xcschemes/DrawingApp.xcscheme

@@ -26,7 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E481265D27CCF8E000A3FFF6"
+            BuildableName = "DrawingApp.app"
+            BlueprintName = "DrawingApp"
+            ReferencedContainer = "container:DrawingApp.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">

DrawingApp/DrawingApp/Controller/ViewController.swift

@@ -15,7 +15,7 @@ class ViewController: UIViewController {
 
     // MARK: - Property for Model
     private let plane = Plane()
-    private var rectangleMap = [Rectangle: RectangleShapable]()
+    private var shapeMap = [Shape: ShapeViewable]()
 
     // MARK: - View Life Cycle Methods
     override func viewDidLoad() {
@@ -32,16 +32,16 @@ class ViewController: UIViewController {
 
     private func setObservers() {
         NotificationCenter.default.addObserver(forName: .RectangleModelDidCreated, object: nil, queue: .main, using: { notification in
-            guard let rectangle = notification.object as? Rectangle else { return }
-            self.createRectangleView(ofClass: RectangleView.self, with: rectangle)
+            guard let shape = notification.object as? Shape else { return }
+            self.createShapeView(ofClass: ColoredRectangleView.self, with: shape)
         })
-        NotificationCenter.default.addObserver(forName: .RectangleModelDidUpdated, object: nil, queue: .main, using: self.rectangleDataDidChanged)
+        NotificationCenter.default.addObserver(forName: .RectangleModelDidUpdated, object: nil, queue: .main, using: self.shapeModelDidChanged)
 
         NotificationCenter.default.addObserver(forName: .ImageRectangleModelDidCreated, object: nil, queue: .main, using: { notification in
-            guard let rectangle = notification.object as? Rectangle else { return }
-            self.createRectangleView(ofClass: ImageRectangleView.self, with: rectangle)
+            guard let shape = notification.object as? Shape else { return }
+            self.createShapeView(ofClass: ImageRectangleView.self, with: shape)
         })
-        NotificationCenter.default.addObserver(forName: .RectangleModelDidUpdated, object: nil, queue: .main, using: self.rectangleDataDidChanged)
+        NotificationCenter.default.addObserver(forName: .RectangleModelDidUpdated, object: nil, queue: .main, using: self.shapeModelDidChanged)
 
         NotificationCenter.default.addObserver(forName: .PlaneDidSelectItem, object: self.plane, queue: .main, using: self.planeDidSelectItem)
         NotificationCenter.default.addObserver(forName: .PlaneDidUnselectItem, object: self.plane, queue: .main, using: self.planeDidUnselectItem)
@@ -54,12 +54,12 @@ extension ViewController: PlaneViewDelegate {
         self.plane.unselectItem()
     }
 
-    func planeViewDidPressRectangleAddButton() {
-        let rectangle = RectangleFactory.makeRandomRectangle()
-        plane.append(item: rectangle)
+    func planeViewDidPressColoredRectangleAddButton() {
+        let shape = RectangleFactory.makeRandomRectangle()
+        plane.append(item: shape)
     }
 
-    func planeViewDidPressImageAddButton() {
+    func planeViewDidPressImageRectangleAddButton() {
         var configuration = PHPickerConfiguration(photoLibrary: .shared())
 
         configuration.filter = .images
@@ -76,87 +76,98 @@ extension ViewController: PlaneViewDelegate {
 // MARK: - ControlPanelView To ViewController
 extension ViewController: ControlPanelViewDelegate {
     func controlPanelDidPressColorButton() {
-        guard let rectangle = self.plane.currentItem else { return }
+        guard let shape = self.plane.currentItem as? BackgroundAdaptable else { return }
 
         let color = ColorFactory.makeTypeRandomly()
-        
-        rectangle.setBackgroundColor(color)
+
+        shape.setBackgroundColor(color)
     }
 
     func controlPanelDidMoveAlphaSlider(_ sender: UISlider) {
         let value = sender.value.toFixed(digits: 1)
 
-        guard let rectangle = self.plane.currentItem else { return }
+        guard let shape = self.plane.currentItem as? AlphaAdaptable else { return }
         guard let alpha = Alpha(rawValue: value) else { return }
 
-        rectangle.setAlpha(alpha)
+        shape.setAlpha(alpha)
     }
 }
 
 // MARK: - RectangleView To ViewController
 extension ViewController {
-    @objc private func handleOnTapRectangleView(_ sender: UITapGestureRecognizer) {
+    @objc private func handleOnTapShapeView(_ sender: UITapGestureRecognizer) {
         guard sender.state == .ended else { return }
 
         let point = sender.location(in: self.planeView).convert(using: Point.self)
 
-        guard let rectangle = self.plane.findItemBy(point: point) else { return }
+        guard let shape = self.plane.findItemBy(point: point) else { return }
 
-        self.plane.selectItem(id: rectangle.id)
+        self.plane.selectItem(id: shape.id)
     }
 }
 
 // MARK: - Rectangle Model To ViewController
 extension ViewController {
-    private func createRectangleView(ofClass Class: RectangleShapable.Type, with rectangle: Rectangle) {
-        guard let rectangleView = RectangleViewFactory.makeView(ofClass: Class, with: rectangle) else { return }
-
-        let tap = UITapGestureRecognizer(target: self, action: #selector(self.handleOnTapRectangleView))
+    private func createShapeView(ofClass Class: ShapeViewable.Type, with shape: Shape) {
+        guard let shapeView = ShapeViewFactory.makeView(ofClass: Class, with: shape) else { return }
 
-        rectangleView.addGestureRecognizer(tap)
+        let tap = UITapGestureRecognizer(target: self, action: #selector(self.handleOnTapShapeView))
 
-        self.planeView.addSubview(rectangleView)
-        self.rectangleMap.updateValue(rectangleView, forKey: rectangle)
+        shapeView.addGestureRecognizer(tap)
+        shapeView.animateScale(CGFloat(1.2), duration: 0.15, delay: 0)
 
-        rectangleView.animateScale(CGFloat(1.2), duration: 0.15, delay: 0)
+        self.planeView.addSubview(shapeView)
+        self.shapeMap.updateValue(shapeView, forKey: shape)
     }
 
-    private func rectangleDataDidChanged(_ notification: Notification) {
-        guard let rectangle = self.plane.currentItem as? Rectangle else { return }
-        guard let rectangleView = self.rectangleMap[rectangle] else { return }
+    private func shapeModelDidChanged(_ notification: Notification) {
+        guard let shape = self.plane.currentItem as? Shape else { return }
+        guard let shapeView = self.shapeMap[shape] else { return }
 
-        if let alpha = notification.userInfo?[Rectangle.NotificationKey.alpha] as? Alpha {
-            rectangleView.setAlpha(alpha)
-        }
+        let color = notification.userInfo?[NotificationKey.updated] as? Color
+        let alpha = notification.userInfo?[NotificationKey.updated] as? Alpha
+        let alphaAdaptableShape = shape as? AlphaAdaptableShape
+        let colorableShapeView = shapeView as? BackgroundViewable
 
-        if let color = notification.userInfo?[Rectangle.NotificationKey.color] as? Color {
-            rectangleView.setBackgroundColor(color: color, alpha: rectangle.alpha)
-            self.controlPanelView.setColorButtonTitle(title: rectangleView.backgroundColor?.toHexString() ?? "None")
+        if let _ = alphaAdaptableShape, let alpha = alpha {
+            shapeView.setAlpha(alpha)
+        }
+
+        if let shape = alphaAdaptableShape, let colorableShapeView = colorableShapeView, let color = color {
+            colorableShapeView.setBackgroundColor(color: color, alpha: shape.alpha)
+            self.controlPanelView.setColorButtonTitle(title: shapeView.backgroundColor?.toHexString() ?? "None")
         }
     }
 }
 
 // MARK: - Plane Model to ViewController
 extension ViewController {
     private func planeDidSelectItem(_ notification: Notification) {
-        guard let rectangle = notification.userInfo?[Plane.NotificationKey.select] as? Rectangle else { return }
-        guard let rectangleView = self.rectangleMap[rectangle] else { return }
+        guard let shape = notification.userInfo?[Plane.NotificationKey.select] as? Shape else { return }
+        guard let shapeView = self.shapeMap[shape] else { return }
 
-        rectangleView.setBorder(width: 2, color: .blue)
+        shapeView.setBorder(width: 2, color: .blue)
 
-        let hexString = UIColor(with: rectangle.backgroundColor).toHexString()
+        if let backgroundAdaptableShape = shape as? BackgroundAdaptable {
+            let hexString = Color.toHexString(backgroundAdaptableShape.backgroundColor)
+            self.controlPanelView.setColorButtonTitle(title: hexString)
+        }
+
+        if let AlphaAdaptableShape = shape as? AlphaAdaptable {
+            self.controlPanelView.setAlphaSliderValue(value: AlphaAdaptableShape.alpha)
+        }
 
-        self.controlPanelView.setColorButtonControllable(enable: rectangle.isType(of: Rectangle.self))
+        let isConformed = (shape as? ImageAdaptable) == nil
+
+        self.controlPanelView.setColorButtonControllable(enable: isConformed)
         self.controlPanelView.setAlphaSliderControllable(enable: true)
-        self.controlPanelView.setColorButtonTitle(title: hexString)
-        self.controlPanelView.setAlphaSliderValue(value: rectangle.alpha)
     }
 
     private func planeDidUnselectItem(_ notification: Notification) {
-        guard let rectangle = notification.userInfo?[Plane.NotificationKey.unselect] as? Rectangle else { return }
-        guard let rectangleView = self.rectangleMap[rectangle] else { return }
+        guard let shape = notification.userInfo?[Plane.NotificationKey.unselect] as? Shape else { return }
+        guard let shapeView = self.shapeMap[shape] else { return }
 
-        rectangleView.removeBorder()
+        shapeView.removeBorder()
 
         self.controlPanelView.reset()
     }
@@ -175,8 +186,9 @@ extension ViewController: PHPickerViewControllerDelegate {
             itemProvider.loadFileRepresentation(forTypeIdentifier: UTType.image.identifier) { url, error in
                 guard let url = url, error == nil else { return }
 
-                let imageRectangle = RectangleFactory.makeRandomRectangle(with: url)
-                self.plane.append(item: imageRectangle)
+                let imageShape = RectangleFactory.makeRandomRectangle(with: url)
+
+                self.plane.append(item: imageShape)
             }
         }
     }

DrawingApp/DrawingApp/Model/Color.swift

@@ -8,12 +8,19 @@
 import Foundation
 
 struct Color {
+    static let range = UInt8.min...UInt8.max
+
     static let black = Color(red: 0, green: 0, blue: 0)
     static let red = Color(red: 255, green: 0, blue: 0)
     static let green = Color(red: 0, green: 255, blue: 0)
     static let blue = Color(red: 0, green: 0, blue: 255)
     static let white = Color(red: 255, green: 255, blue: 255)
 
+    static func toHexString(_ color: Self) -> String {
+        let RGB = Int(color.red * 255) << 16 | Int(color.green * 255) << 8 | Int(color.blue * 255)
+        return String(format:"#%06x", RGB).uppercased()
+    }
+
     let red: Double
     let green: Double
     let blue: Double

DrawingApp/DrawingApp/Model/Rectangle.swift → DrawingApp/DrawingApp/Model/ColoredRectangle.swift

@@ -1,60 +1,41 @@
 //
-//  Rectangle.swift
+//  ColoredRectangle.swift
 //  DrawingApp
 //
 //  Created by 송태환 on 2022/03/01.
 //
 
 import Foundation
 
-protocol RectangleBuildable {
-    init(x: Double, y: Double, width: Double, height: Double)
-}
+typealias BackgroundColorControllable = BackgroundAdaptable & AlphaAdaptable
 
-class Rectangle: Shapable, Notifiable, Hashable {
-    enum NotificationKey {
-        case alpha
-        case color
-    }
-
+class ColoredRectangle: Shape, BackgroundColorControllable, Notifiable {
     // MARK: - Properties
     private(set) var backgroundColor: Color {
         didSet {
-            self.notifyDidUpdated(key: .color, data: self.backgroundColor)
+            self.notifyDidUpdated(key: .updated, data: self.backgroundColor)
         }
     }
 
     private(set) var alpha: Alpha {
         didSet {
-            self.notifyDidUpdated(key: .alpha, data: self.alpha)
+            self.notifyDidUpdated(key: .updated, data: self.alpha)
         }
     }
 
-    let id: String
-    let size: Size
-    let origin: Point
-
-    var diagonalPoint: Point {
-        let maxX = self.origin.x + self.size.width
-        let maxY = self.origin.y + self.size.height
-        return Point(x: maxX, y: maxY)
-    }
-
     // MARK: - Initialisers
     init(id: String, origin: Point, size: Size, color: Color = .white, alpha: Alpha = .opaque) {
-        self.id = id
-        self.origin = origin
-        self.size = size
         self.backgroundColor = color
         self.alpha = alpha
+        super.init(id: id, origin: origin, size: size)
     }
 
     init(id: String, x: Double, y: Double, width: Double, height: Double, color: Color = .white, alpha: Alpha = .opaque) {
-        self.id = id
-        self.origin = Point(x: x, y: y)
-        self.size = Size(width: width, height: height)
-        self.backgroundColor = color
+        let origin = Point(x: x, y: y)
+        let size = Size(width: width, height: height)
         self.alpha = alpha
+        self.backgroundColor = color
+        super.init(id: id, origin: origin, size: size)
     }
 
     func convert<T: RectangleBuildable>(using Convertor: T.Type) -> T {
@@ -79,7 +60,7 @@ class Rectangle: Shapable, Notifiable, Hashable {
 }
 
 // MARK: - CustomStringConvertible Protocol
-extension Rectangle {
+extension ColoredRectangle: CustomStringConvertible {
     var description: String {
         return """
         (\(self.id)), \(self.origin), \(self.size), \(self.backgroundColor), \(self.alpha)

DrawingApp/DrawingApp/Model/ImageRectangle.swift

@@ -7,24 +7,52 @@
 
 import Foundation
 
-class ImageRectangle: Rectangle {
-    private(set) var image: URL?
+typealias ImageControllable = ImageAdaptable & AlphaAdaptable
+
+class ImageRectangle: Shape, ImageControllable, Notifiable {
+    private(set) var alpha: Alpha {
+        didSet {
+            self.notifyDidUpdated(key: .updated, data: self.alpha)
+        }
+    }
+
+    private var imageURL: URL?
+
+    var imagePath: String? {
+        return self.imageURL?.path
+    }
 
     init(id: String, origin: Point, size: Size, image: URL? = nil) {
+        self.imageURL = image
+        self.alpha = .opaque
         super.init(id: id, origin: origin, size: size)
-        self.image = image
     }
 
     init(id: String, x: Double, y: Double, width: Double, height: Double, image: URL? = nil) {
-        super.init(id: id, x: x, y: y, width: width, height: height)
-        self.image = image
+        let origin = Point(x: x, y: y)
+        let size = Size(width: width, height: height)
+        self.imageURL = image
+        self.alpha = .opaque
+        super.init(id: id, origin: origin, size: size)
     }
 
-    func setImage(with url: URL) {
-        self.image = url
+    func setImagePath(with url: URL) {
+        self.imageURL = url
     }
 
-    override func notifyDidCreated() {
+    func setAlpha(_ alpha: Alpha) {
+        self.alpha = alpha
+    }
+
+    func convert<T: RectangleBuildable>(using Convertor: T.Type) -> T {
+        return Convertor.init(x: self.origin.x, y: self.origin.y, width: self.size.width, height: self.size.height)
+    }
+
+    func notifyDidCreated() {
         NotificationCenter.default.post(name: .ImageRectangleModelDidCreated, object: self)
     }
+
+    func notifyDidUpdated(key: NotificationKey, data: Any) {
+        NotificationCenter.default.post(name: .RectangleModelDidUpdated, object: self, userInfo: [key: data])
+    }
 }

DrawingApp/DrawingApp/Model/Plane.swift

@@ -7,10 +7,6 @@
 
 import Foundation
 
-protocol Notifiable: AnyObject {
-    func notifyDidCreated()
-}
-
 class Plane {
     private var items = [String: Shapable]()
 

DrawingApp/DrawingApp/Model/Protocols/AlphaAdaptable.swift

@@ -0,0 +1,13 @@
+//
+//  AlphaAdaptable.swift
+//  DrawingApp
+//
+//  Created by 송태환 on 2022/03/18.
+//
+
+import Foundation
+
+protocol AlphaAdaptable {
+    var alpha: Alpha { get }
+    func setAlpha(_ alpha: Alpha)
+}