[Damagucci-Juice] step3 델리게이트 프로토콜로 작동하던 것을 노티피케이션 센터를 이용해서 설정

DrawingApp/DrawingApp/NotificationCenter.swift

@@ -0,0 +1,24 @@
+//
+//  NotificationCenter.swift
+//  DrawingApp
+//
+//  Created by YEONGJIN JANG on 2022/03/16.
+//
+
+import Foundation
+
+let notificationCenter = NotificationCenter.default
+
+extension Notification.Name {
+    static let addRectangleView = Notification.Name("A rectangle is made")
+    static let tappedRectangleView = Notification.Name("a rectangle view is Tapped")
+    static let colorChange = Notification.Name("color changed")
+    static let alphaChange = Notification.Name("alpha changed")
+}
+
+enum NotificationKey {
+    case color
+    case alpha
+    case tappedRectangle
+    case addedRectangle
+}

DrawingApp/DrawingApp/Plane.swift

@@ -1,27 +1,7 @@
 import Foundation
 
-protocol RectangleAddedDelegate {
-    func made(rectangle : Rectangle)
-}
-
-protocol RectangleTouchedDelegate {
-    func touched(rectangle: Rectangle)
-}
-
-protocol RectangleColorChangeDelegate {
-    func didChangeColor(rectangle: Rectangle)
-}
-protocol RectangleAlaphaChangeDelegate {
-    func didChangeAlpha(rectangle: Rectangle)
-}
-
 class Plane {
     private var rectangles: [Rectangle] = []
-
-    var addedRectangleDelegate :RectangleAddedDelegate?
-    var rectangleTapDelegate : RectangleTouchedDelegate?
-    var colorDelegate: RectangleColorChangeDelegate?
-    var alphaDelegate: RectangleAlaphaChangeDelegate?
 
     var rectangleCount: Int {
         return rectangles.count
@@ -31,15 +11,13 @@ class Plane {
     func addRectangle() {
         let rectangle: Rectangle = Factory.createRandomRectangle()
         rectangles.append(rectangle)
-
-        addedRectangleDelegate?.made(rectangle: rectangle)
+        notificationCenter.post(name: .addRectangleView, object: nil, userInfo: [NotificationKey.addedRectangle : rectangle])
     }
 
     subscript(index: Int) -> Rectangle {
         return rectangles[index]
     }
 
-    //MARK: Bound Gate
     private func isTouchedOnRectangle(at point: Point) -> Rectangle? {
         var optionalRectangle: Rectangle?
         for rectangle in rectangles {
@@ -54,18 +32,18 @@ class Plane {
         guard let rectangle = isTouchedOnRectangle(at: point) else {
             return
         }
-        self.rectangleTapDelegate?.touched(rectangle: rectangle)
+        notificationCenter.post(name: Notification.Name.tappedRectangleView, object: nil, userInfo: [NotificationKey.tappedRectangle: rectangle])
     }
 
     func changeColorOfRectangle(_ rectangle: Rectangle) {
         var oldRectangle = rectangle
         let newRectangle = oldRectangle.changeColor()
-        self.colorDelegate?.didChangeColor(rectangle: newRectangle)
+        notificationCenter.post(name: Notification.Name.colorChange, object: nil, userInfo: [NotificationKey.color: newRectangle])
     }
 
     func changeAlpha(_ rectangle: Rectangle, _ alpha: Int) {
         var willChangeRectangle = rectangle
         willChangeRectangle = willChangeRectangle.changeAlpha(alpha)
-        alphaDelegate?.didChangeAlpha(rectangle: willChangeRectangle)
+        notificationCenter.post(name: Notification.Name.alphaChange, object: nil, userInfo: [NotificationKey.alpha: willChangeRectangle])
     }
 }

DrawingApp/DrawingApp/ViewController/ViewController.swift

@@ -40,11 +40,18 @@ class ViewController: UIViewController {
         self.plane.addRectangle()
     }
 
-    private func declareDelegates() {
-        plane.addedRectangleDelegate = self
-        plane.rectangleTapDelegate = self
-        plane.colorDelegate = self
-        plane.alphaDelegate = self
+    private func activateNotificationObservers() {
+        // add rectangle
+        notificationCenter.addObserver(self, selector: #selector(made(rectangleNoti: )), name: Notification.Name.addRectangleView, object: nil)
+
+        // rectangle tapped
+        notificationCenter.addObserver(self, selector: #selector(touched(rectangleNoti:)), name: Notification.Name.tappedRectangleView, object: nil)
+
+        // color changed
+        notificationCenter.addObserver(self, selector: #selector(didChangeColor(rectangleNoti:)), name: Notification.Name.colorChange, object: nil)
+
+        // alpha changed
+        notificationCenter.addObserver(self, selector: #selector(didChangeAlpha(rectangleNoti: )), name: Notification.Name.alphaChange, object: nil)
     }
 
     private func initDetailView() {
@@ -58,14 +65,19 @@ class ViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        declareDelegates()
+
+        activateNotificationObservers()
         initDetailView()
-        touchBackgroundView()
+        activateBackgroundTappable()
+    }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        notificationCenter.removeObserver(self)
     }
 }
 
 extension ViewController: UIGestureRecognizerDelegate {
-        func touchBackgroundView() {
+        func activateBackgroundTappable() {
             let tap = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:)))
             self.view.addGestureRecognizer(tap)
         }
@@ -77,16 +89,19 @@ extension ViewController: UIGestureRecognizerDelegate {
         }
 }
 
-extension ViewController: RectangleAddedDelegate {
-    func made(rectangle: Rectangle) {
+extension ViewController {
+    @objc func made(rectangleNoti : Notification) {
+        guard let rectangle = rectangleNoti.userInfo?[NotificationKey.addedRectangle] as? Rectangle else {
+            return
+        }
         let rectView = UIView(frame: CGRect(x: rectangle.point.x, y: rectangle.point.y, width: rectangle.size.width, height: rectangle.size.height))
         rectView.backgroundColor = UIColor(red: CGFloat(rectangle.color.R)/255.0, green: CGFloat(rectangle.color.G)/255.0, blue: CGFloat(rectangle.color.B)/255.0, alpha: CGFloat(rectangle.alpha.rawValue)/10.0)
         self.rectangleAndViewContainer[rectangle] = rectView
         self.view.addSubview(rectView)
     }
 }
-
-extension ViewController: RectangleTouchedDelegate {
+//
+extension ViewController {
     private func paintBorder(_ rectangle: Rectangle) {
         let touchedView = self.rectangleAndViewContainer[rectangle]
         touchedView?.layer.borderWidth = 3.0
@@ -107,7 +122,11 @@ extension ViewController: RectangleTouchedDelegate {
             alphaSlider.value = Float(rect.alpha.rawValue)
         }
     }
-    func touched(rectangle: Rectangle) {
+
+    @objc func touched(rectangleNoti: Notification) {
+        guard let rectangle = rectangleNoti.userInfo?[NotificationKey.tappedRectangle] as? Rectangle else {
+            return
+        }
         if let view = self.selectedView {
             view.layer.borderWidth = .zero
         }
@@ -116,25 +135,30 @@ extension ViewController: RectangleTouchedDelegate {
     }
 }
 
-extension ViewController: RectangleColorChangeDelegate {
+extension ViewController {
     func changeColorAndAlpha(_ rectangle: Rectangle) {
-        let viewValue = rectangleAndViewContainer[rectangle]
-        rectangleAndViewContainer.removeValue(forKey: rectangle)
+        let viewValue = rectangleAndViewContainer.removeValue(forKey: rectangle)
         rectangleAndViewContainer[rectangle] = viewValue
         if let view = rectangleAndViewContainer[rectangle] {
             view.backgroundColor = UIColor(red: CGFloat(rectangle.color.R)/255.0, green: CGFloat(rectangle.color.G)/255.0, blue: CGFloat(rectangle.color.B)/255.0, alpha: CGFloat(rectangle.alpha.rawValue)/10.0)
             self.rectangleAndViewContainer.updateValue(view, forKey: rectangle)
         }
     }
 
-    func didChangeColor(rectangle: Rectangle) {
+    @objc func didChangeColor(rectangleNoti: Notification) {
+        guard let rectangle = rectangleNoti.userInfo?[NotificationKey.color] as? Rectangle else {
+            return
+        }
         changeColorAndAlpha(rectangle)
         colorButton.setTitle("#\(rectangle.color.showRGBVlaue())", for: .normal)
     }
 }
 
-extension ViewController : RectangleAlaphaChangeDelegate {
-    func didChangeAlpha(rectangle: Rectangle) {
+extension ViewController  {
+    @objc func didChangeAlpha(rectangleNoti: Notification) {
+        guard let rectangle = rectangleNoti.userInfo?[NotificationKey.alpha] as? Rectangle else {
+            return
+        }
         changeColorAndAlpha(rectangle)
         alphaSlider.value = Float(rectangle.alpha.rawValue)
     }

README.md

@@ -1,7 +1,7 @@
 # swift-drawingapp
 3번째 미션 - iOS 터치 드로잉 앱
 
-## step-1 주요  작업 내용
+## step1 주요  작업 내용
 - [x] Device - iPad, Device Orientation - Landscape Left, Landscape Right)
 - [x] Factory 클래스에서 랜덤하게 Rectangle 클래스 생성
 
@@ -36,4 +36,165 @@ struct BackgroundColor {
     }
 ```
 
-![os_log](https://user-images.githubusercontent.com/50472122/156562405-f07d43dc-e2a6-4b82-81de-cb4ac1381613.png)
+![os_log](https://user-images.githubusercontent.com/50472122/156562405-f07d43dc-e2a6-4b82-81de-cb4ac1381613.png)
+
+## step2 주요 작업 내용
+
+- [x] MVC 중에서 M -> C 로 갈 때 delegate 패턴을 적용
+- [x] "사각형" 버튼을 누르면 사각형 View 추가
+- [x] Slider 의 변화에 따라 view 투명도 조절
+- [x] 버튼 누르면 사각형 뷰의 색이 변경 
+    - [x] 색 버튼의 title 변경 
+- [x] 선택된 사각형 뷰에 선택됨을 알리표는 테두리 추가
+    - [x] 화면에 다른 사각형을 선택시 테두리 걷어가기
+
+## 주요 구현 모습
+
+### 사각형 버튼을 누르면 사각형 UIView 를 추가
+
+* ViewController.swift
+
+```
+    @IBAction func rectangleButtonTouched(_ sender: Any) {
+        self.plane.addRectangle()
+    }
+
+    override func viewDidLoad() {
+	super.viewDidLoad()
+	plane.addedRectangleDelegate = self
+    }
+
+```
+
+* Plane.swift
+
+```
+    var addedRectangleDelegate :RectangleAddedDelegate?
+
+    func addRectangle() {
+        let rectangle: Rectangle = Factory.createRandomRectangle()
+        rectangles.append(rectangle)
+
+        addedRectangleDelegate?.made(rectangle: rectangle)
+    }
+
+...
+
+protocol RectangleAddedDelegate {
+    func made(rectangle : Rectangle)
+}
+
+```
+
+* extension : ViewController
+
+```
+
+extension ViewController: RectangleAddedDelegate {
+    func made(rectangle: Rectangle) {
+        let rectView = UIView(frame: CGRect(x: rectangle.point.x, y: rectangle.point.y, width: rectangle.size.width, height: rectangle.size.height))
+        rectView.backgroundColor = UIColor(red: CGFloat(rectangle.color.R)/255.0, green: CGFloat(rectangle.color.G)/255.0, blue: CGFloat(rectangle.color.B)/255.0, alpha: CGFloat(rectangle.alpha.rawValue)/10.0)
+        self.rectangleAndViewContainer[rectangle] = rectView
+        self.view.addSubview(rectView)
+    }
+}
+
+```
+
+### 배경에 tap이 될 수 있도록 적용
+
+> ViewController 에 UIGestureRecognizerDelegate 를 적용하고 그 함수를 채택해야함
+
+* ViewController.swift
+
+```
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        activateBackgroundTappable()
+    }
+
+extension ViewController: UIGestureRecognizerDelegate {
+        func activateBackgroundTappable() {
+            let tap = UITapGestureRecognizer(target: self, action: #selector(self.handleTap(_:)))
+            self.view.addGestureRecognizer(tap)
+        }
+
+        @objc func handleTap(_ sender: UITapGestureRecognizer) {
+            let viewPoint: CGPoint = sender.location(in: self.view)
+            let rectPoint: Point = Point(x: viewPoint.x, y: viewPoint.y)
+            plane.touchedRectangle(at: rectPoint)
+        }
+}
+
+```
+
+## step3 주요 구현내용
+
+- [x] Delegate로 작동하는 것을 NotificationCenter 를 이용하도록 설정
+    - [x] 사각형 추가 기능
+    - [x] rectangle view 를 터치하면 테두리 설정
+    - [x] rectangle color 변경
+    - [x] rectangle alpha 변경
+
+### 사각형 추가 기능을 NotificationCenter 를 이용해서 설정
+
+* NotificationCenter.swift
+
+```
+let notificationCenter = NotificationCenter.default
+
+extension Notification.Name {
+    static let addRectangleView = Notification.Name("A rectangle is made")
+    static let tappedRectangleView = Notification.Name("a rectangle view is Tapped")
+    static let colorChange = Notification.Name("color changed")
+    static let alphaChange = Notification.Name("alpha changed")
+}
+
+enum NotificationKey {
+    case color
+    case alpha
+    case tappedRectangle
+    case addedRectangle
+}
+
+```
+
+* Plane.swift
+
+```
+    func addRectangle() {
+        let rectangle: Rectangle = Factory.createRandomRectangle()
+        rectangles.append(rectangle)
+	// Notification.post
+        notificationCenter.post(name: .addRectangleView, object: nil, userInfo: [NotificationKey.addedRectangle : rectangle])
+    }
+```
+
+* ViewController.swift
+
+```
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        notificationCenter.addObserver(self, selector: #selector(made(rectangleNoti: )), name: Notification.Name.addRectangleView, object: nil)
+    }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        notificationCenter.removeObserver(self)
+    }
+
+    @objc func made(rectangleNoti : Notification) {
+        guard let rectangle = rectangleNoti.userInfo?[NotificationKey.addedRectangle] as? Rectangle else {
+            return
+        }
+        let rectView = UIView(frame: CGRect(x: rectangle.point.x, y: rectangle.point.y, width: rectangle.size.width, height: rectangle.size.height))
+        rectView.backgroundColor = UIColor(red: CGFloat(rectangle.color.R)/255.0, green: CGFloat(rectangle.color.G)/255.0, blue: CGFloat(rectangle.color.B)/255.0, alpha: CGFloat(rectangle.alpha.rawValue)/10.0)
+        self.rectangleAndViewContainer[rectangle] = rectView
+        self.view.addSubview(rectView)
+    }
+
+```
+
+## 구현화면
+
+![drawing-step3](https://user-images.githubusercontent.com/50472122/158532985-1b8aea8d-307d-42f8-81f6-5adad2744bf2.gif)
+