starred/Memola
1
0
Fork 0
mirror of https://github.com/dscyrescotti/Memola.git synced 2026-07-12 15:52:41 +02:00
Code Issues 5 Packages Projects Releases 3 Wiki Activity

feat: add reordering and deleting

Browse Source
This commit is contained in:
dscyrescotti
2024-05-18 01:25:36 +07:00
parent 4701eac3ba
commit 821b34e158
5 changed files with 137 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Memola/Canvas/Tool/Core/Tool.swift
+17
View File
@@ -15,6 +15,9 @@ public class Tool: NSObject, ObservableObject {
@Published var pens: [Pen] = []
@Published var selectedPen: Pen?
@Published var draggedPen: Pen?
@Published var isReordering: Bool = false
@Published var isShaking: Bool = false
@Published var shakingId: UUID = UUID()
init(object: ToolObject) {
self.object = object
@@ -45,6 +48,9 @@ public class Tool: NSObject, ObservableObject {
func unselectPen(_ pen: Pen) {
pen.isSelected = false
withAnimation {
selectedPen = nil
}
}
func addPen(_ pen: Pen) {
@@ -56,4 +62,15 @@ public class Tool: NSObject, ObservableObject {
object.pens.add(_pen)
}
}
func removePen(_ pen: Pen) {
guard let index = pens.firstIndex(where: { $0 === pen }) else { return }
let deletedPen = withAnimation {
pens.remove(at: index)
}
if let _pen = deletedPen.object {
_pen.tool = nil
object.pens.remove(_pen)
}
}
}
Memola/Components/ViewModifiers/ContextMenuableViewModifier.swift
+29
View File
@@ -0,0 +1,29 @@
//
// ContextMenuableViewModifier.swift
// Memola
//
// Created by Dscyre Scotti on 5/17/24.
//
import SwiftUI
import Foundation
struct ContextMenuableViewModifier<MenuContent: View>: ViewModifier {
let condition: Bool
let menuItems: () -> MenuContent
@ViewBuilder
func body(content: Content) -> some View {
if condition {
content.contextMenu(menuItems: menuItems)
} else {
content
}
}
}
public extension View {
func contextMenu<MenuContent: View>(if condition: Bool, @ViewBuilder menuItems: @escaping () -> MenuContent) -> some View {
modifier(ContextMenuableViewModifier(condition: condition, menuItems: menuItems))
}
}
Memola/Features/Memo/PenTool/PenDropDelegate.swift
+1
View File
@@ -27,6 +27,7 @@ struct PenDropDelegate: DropDelegate {
tool.pens.move(fromOffsets: IndexSet(integer: fromIndex), toOffset: toIndex > fromIndex ? toIndex + 1 : toIndex)
tool.objectWillChange.send()
}
tool.shakingId = UUID()
withPersistence(\.viewContext) { context in
for (index, pen) in tool.pens.enumerated() {
pen.object?.orderIndex = Int16(index)
Memola/Features/Memo/PenTool/PenToolView.swift
+86 -36
View File
@@ -17,17 +17,42 @@ struct PenToolView: View {
var body: some View {
VStack(alignment: .trailing, spacing: 0) {
ScrollView(.vertical, showsIndicators: false) {
LazyVStack(spacing: 0) {
ForEach(tool.pens) { pen in
penView(pen)
if tool.isReordering {
LazyVStack(spacing: 0) {
ForEach(tool.pens) { pen in
if pen.strokeStyle == .marker {
penView(pen)
.offset(y: tool.isShaking ? 1.5 : -1.5)
} else {
penView(pen)
}
}
}
.padding(.vertical, 5)
.padding(.leading, 40)
.onAppear {
withAnimation(.easeInOut.repeatForever().speed(5)) {
tool.isShaking.toggle()
}
}
.id(tool.shakingId)
} else {
LazyVStack(spacing: 0) {
ForEach(tool.pens) { pen in
penView(pen)
}
}
.padding(.vertical, 5)
.padding(.leading, 40)
}
.padding(.vertical, 5)
.padding(.leading, 40)
}
VStack(spacing: 0) {
Divider()
newPenButton
if tool.isReordering {
reorderCancelButton
} else {
newPenButton
}
}
.frame(width: width * factor - 20)
}
@@ -58,43 +83,40 @@ struct PenToolView: View {
.frame(width: width * factor, height: height * factor)
.padding(.vertical, 5)
.padding(.leading, 10)
.clipShape(.rect(cornerRadii: .init(topLeading: 10, bottomLeading: 10)))
.contentShape(.rect(cornerRadii: .init(topLeading: 10, bottomLeading: 10)))
.onDrag(if: pen.strokeStyle != .eraser) {
.onTapGesture {
if tool.selectedPen === pen {
tool.unselectPen(pen)
} else {
tool.selectPen(pen)
}
}
.disabled(tool.isReordering)
.contextMenu(if: pen.strokeStyle != .eraser && !tool.isReordering) {
Button {
tool.isReordering = true
} label: {
Label("Rearrange", systemImage: "arrow.up.arrow.down.circle")
}
Button(role: .destructive) {
tool.removePen(pen)
} label: {
Label("Delete", systemImage: "trash")
}
}
.onDrag(if: pen.strokeStyle != .eraser && tool.isReordering) {
tool.draggedPen = pen
return NSItemProvider(contentsOf: URL(string: pen.id)) ?? NSItemProvider()
} preview: {
ZStack {
if let tip = pen.style.icon.tip {
Image(tip)
.resizable()
.renderingMode(.template)
.foregroundStyle(Color.rgba(from: pen.color))
}
Image(pen.style.icon.base)
.resizable()
}
.frame(width: width * factor, height: height * factor)
.padding([.vertical, .leading], 10)
.contentShape(.dragPreview, .rect(cornerRadius: 10))
penPreview(pen)
.contentShape(.dragPreview, .rect(cornerRadius: 10))
}
.onDrop(of: [.item], delegate: PenDropDelegate(id: pen.id, tool: tool))
.onTapGesture {
if tool.selectedPen === pen {
withAnimation {
tool.unselectPen(pen)
}
} else {
withAnimation {
tool.selectPen(pen)
}
}
}
.offset(x: tool.selectedPen === pen ? 0 : 28)
}
var newPenButton: some View {
Button(action: {
Button {
let pen = PenObject.createObject(\.viewContext, penStyle: .marker)
pen.color = [Color.red, Color.blue, Color.green, Color.black, Color.orange].randomElement()!.components
pen.isSelected = true
@@ -102,12 +124,40 @@ struct PenToolView: View {
pen.orderIndex = Int16(tool.pens.count)
let _pen = Pen(object: pen)
tool.addPen(_pen)
}) {
Image(systemName: "plus")
.font(.title3)
} label: {
Image(systemName: "pencil.tip.crop.circle.badge.plus")
.font(.title2)
.contentShape(.circle)
}
.hoverEffect(.lift)
.padding(10)
}
var reorderCancelButton: some View {
Button {
tool.isReordering = false
} label: {
Image(systemName: "xmark.circle")
.font(.title2)
.contentShape(.circle)
}
.hoverEffect(.lift)
.padding(10)
}
func penPreview(_ pen: Pen) -> some View {
ZStack {
if let tip = pen.style.icon.tip {
Image(tip)
.resizable()
.renderingMode(.template)
.foregroundStyle(Color.rgba(from: pen.color))
}
Image(pen.style.icon.base)
.resizable()
}
.frame(width: width * factor, height: height * factor)
.padding(.vertical, 5)
.padding(.leading, 10)
}
}