From 20ed32b1860139440617631e5b3bf1ed3754fc47 Mon Sep 17 00:00:00 2001
From: dscyrescotti <dscyrescotti@gmail.com>
Date: Sun, 19 May 2024 21:43:06 +0700
Subject: [PATCH] feat: add more pens in newly created memo object

---
 Memola/Features/Memo/PenDock/PenDock.swift |  2 +-
 Memola/Features/Memos/MemosView.swift      | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Memola/Features/Memo/PenDock/PenDock.swift b/Memola/Features/Memo/PenDock/PenDock.swift
index f6d8f55..f660462 100644
--- a/Memola/Features/Memo/PenDock/PenDock.swift
+++ b/Memola/Features/Memo/PenDock/PenDock.swift
@@ -221,7 +221,7 @@ struct PenDock: View {
         )
         Picker("", selection: selection) {
             ForEach(pen.style.thicknessSteps, id: \.self) { step in
-                let size = ((step - minimum) * (end - start) / (maximum - minimum)) + start - (1 / step)
+                let size = ((step - minimum) * (end - start) / (maximum - minimum)) + start - (0.5 / step)
                 Circle()
                     .fill(.black)
                     .frame(width: size, height: size)
diff --git a/Memola/Features/Memos/MemosView.swift b/Memola/Features/Memos/MemosView.swift
index 4f66f0d..331016c 100644
--- a/Memola/Features/Memos/MemosView.swift
+++ b/Memola/Features/Memos/MemosView.swift
@@ -76,8 +76,12 @@ struct MemosView: View {
 
         let eraserPenObject = PenObject.createObject(\.viewContext, penStyle: .eraser)
         eraserPenObject.orderIndex = 0
-        let markerPenObject = PenObject.createObject(\.viewContext, penStyle: .marker)
-        markerPenObject.orderIndex = 1
+        let markerPenObjects = [Color.red, Color.blue, Color.yellow, Color.black].enumerated().map { (index, color) in
+            let penObject = PenObject.createObject(\.viewContext, penStyle: .marker)
+            penObject.orderIndex = Int16(index) + 1
+            penObject.color = color.components
+            return penObject
+        }
 
         let graphicContextObject = GraphicContextObject(\.viewContext)
         graphicContextObject.strokes = []
@@ -89,10 +93,10 @@ struct MemosView: View {
         canvasObject.graphicContext = graphicContextObject
 
         toolObject.memo = memoObject
-        toolObject.pens = [eraserPenObject, markerPenObject]
+        toolObject.pens = .init(array: [eraserPenObject] + markerPenObjects)
 
         eraserPenObject.tool = toolObject
-        markerPenObject.tool = toolObject
+        markerPenObjects.forEach { $0.tool = toolObject }
 
         graphicContextObject.canvas = canvasObject