From 5109cc53fc2c249aec535b4aa77fecb6db211734 Mon Sep 17 00:00:00 2001
From: dscyrescotti <dscyrescotti@gmail.com>
Date: Thu, 9 May 2024 23:22:16 +0700
Subject: [PATCH] refactor: clean up

---
 Memola/Canvas/Core/Canvas.swift              | 7 +++++--
 Memola/Canvas/Geometries/Stroke/Stroke.swift | 1 -
 Memola/Canvas/View/CanvasView.swift          | 2 +-
 Memola/Features/Memo/MemoView.swift          | 4 ++--
 Memola/Features/Memos/MemosView.swift        | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Memola/Canvas/Core/Canvas.swift b/Memola/Canvas/Core/Canvas.swift
index 82dff1e..ba73052 100644
--- a/Memola/Canvas/Core/Canvas.swift
+++ b/Memola/Canvas/Core/Canvas.swift
@@ -42,9 +42,12 @@ final class Canvas: NSManagedObject, Identifiable {
 // MARK: - Actions
 extension Canvas {
     func load() {
-        state = .loading
         let start = Date().formatted(.dateTime.minute().second().secondFraction(.fractional(5)))
         Task(priority: .high) { [start] in
+            await MainActor.run {
+                state = .loading
+                objectWillChange.send()
+            }
             await withTaskGroup(of: Void.self) { taskGroup in
                 for stroke in graphicContext.strokes {
                     guard let stroke = stroke as? Stroke else { continue }
@@ -53,11 +56,11 @@ extension Canvas {
                     }
                 }
             }
-
             let end = Date().formatted(.dateTime.minute().second().secondFraction(.fractional(5)))
             NSLog("[Memola] - Loaded from \(start) to \(end)")
             await MainActor.run {
                 state = .loaded
+                objectWillChange.send()
             }
         }
     }
diff --git a/Memola/Canvas/Geometries/Stroke/Stroke.swift b/Memola/Canvas/Geometries/Stroke/Stroke.swift
index 7f2eb73..0ab49fb 100644
--- a/Memola/Canvas/Geometries/Stroke/Stroke.swift
+++ b/Memola/Canvas/Geometries/Stroke/Stroke.swift
@@ -56,7 +56,6 @@ final class Stroke: NSManagedObject {
     func finish(at point: CGPoint) {
         penStyle.anyPenStyle.generator.finish(at: point, on: self)
         keyPoints.removeAll()
-        NSLog("[Memola] - \(_quads.count) quads")
     }
 
     func loadVertices() {
diff --git a/Memola/Canvas/View/CanvasView.swift b/Memola/Canvas/View/CanvasView.swift
index 5bc9ab9..3842c6d 100644
--- a/Memola/Canvas/View/CanvasView.swift
+++ b/Memola/Canvas/View/CanvasView.swift
@@ -8,8 +8,8 @@
 import SwiftUI
 
 struct CanvasView: UIViewControllerRepresentable {
-    let canvas: Canvas
     @EnvironmentObject var tool: Tool
+    @EnvironmentObject var canvas: Canvas
     @EnvironmentObject var history: History
 
     func makeUIViewController(context: Context) -> CanvasViewController {
diff --git a/Memola/Features/Memo/MemoView.swift b/Memola/Features/Memo/MemoView.swift
index b933020..0673109 100644
--- a/Memola/Features/Memo/MemoView.swift
+++ b/Memola/Features/Memo/MemoView.swift
@@ -14,10 +14,10 @@ struct MemoView: View {
     @StateObject var tool = Tool()
     @StateObject var history = History()
 
-    let canvas: Canvas
+    @EnvironmentObject var canvas: Canvas
 
     var body: some View {
-        CanvasView(canvas: canvas)
+        CanvasView()
             .ignoresSafeArea()
             .overlay(alignment: .bottomTrailing) {
                 PenToolView()
diff --git a/Memola/Features/Memos/MemosView.swift b/Memola/Features/Memos/MemosView.swift
index c52813a..c0972d9 100644
--- a/Memola/Features/Memos/MemosView.swift
+++ b/Memola/Features/Memos/MemosView.swift
@@ -30,7 +30,8 @@ struct MemosView: View {
                 }
         }
         .fullScreenCover(item: $memo) { memo in
-            MemoView(canvas: memo.canvas)
+            MemoView()
+                .environmentObject(memo.canvas)
         }
     }