diff --git a/Memola.xcodeproj/project.pbxproj b/Memola.xcodeproj/project.pbxproj index 8356b79..26a2b03 100644 --- a/Memola.xcodeproj/project.pbxproj +++ b/Memola.xcodeproj/project.pbxproj @@ -101,7 +101,6 @@ ECA738E42BE6110800A4542E /* Drawable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECA738E32BE6110800A4542E /* Drawable.swift */; }; ECA738FC2BE61C5200A4542E /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECA738FB2BE61C5200A4542E /* Persistence.swift */; }; ECA739082BE623F300A4542E /* PenDock.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECA739072BE623F300A4542E /* PenDock.swift */; }; - ECBE52962C1D5900006BDB3D /* PhotoPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECBE52952C1D5900006BDB3D /* PhotoPreview.swift */; }; ECBE529C2C1D94A4006BDB3D /* CameraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECBE529A2C1D94A4006BDB3D /* CameraView.swift */; }; ECC4F38C2C4B9B63007EC227 /* PhotoFileObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECC4F38B2C4B9B63007EC227 /* PhotoFileObject.swift */; }; ECC995A32C1E8F2800B2699A /* PhotoItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECC995A22C1E8F2800B2699A /* PhotoItem.swift */; }; @@ -243,7 +242,6 @@ ECA738E32BE6110800A4542E /* Drawable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Drawable.swift; sourceTree = ""; }; ECA738FB2BE61C5200A4542E /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = ""; }; ECA739072BE623F300A4542E /* PenDock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PenDock.swift; sourceTree = ""; }; - ECBE52952C1D5900006BDB3D /* PhotoPreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoPreview.swift; sourceTree = ""; }; ECBE529A2C1D94A4006BDB3D /* CameraView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraView.swift; sourceTree = ""; }; ECC4F38B2C4B9B63007EC227 /* PhotoFileObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoFileObject.swift; sourceTree = ""; }; ECC995A22C1E8F2800B2699A /* PhotoItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoItem.swift; sourceTree = ""; }; @@ -591,6 +589,7 @@ EC86C5802C4010BE00C07D21 /* PhotoDock */ = { isa = PBXGroup; children = ( + ECC995A22C1E8F2800B2699A /* PhotoItem.swift */, EC86C5812C4010CC00C07D21 /* PhotoDock.swift */, ); path = PhotoDock; @@ -647,7 +646,6 @@ children = ( EC86C5802C4010BE00C07D21 /* PhotoDock */, ECDAC0792C318DAF0000ED77 /* ElementToolbar */, - ECBE52942C1D58F5006BDB3D /* PhotoPreview */, EC1B783B2BFA0AAC005A34E2 /* Toolbar */, EC5050082BF65D0500B4D86E /* Memo */, EC5050052BF65CCD00B4D86E /* PenDock */, @@ -909,15 +907,6 @@ path = Core; sourceTree = ""; }; - ECBE52942C1D58F5006BDB3D /* PhotoPreview */ = { - isa = PBXGroup; - children = ( - ECBE52952C1D5900006BDB3D /* PhotoPreview.swift */, - ECC995A22C1E8F2800B2699A /* PhotoItem.swift */, - ); - path = PhotoPreview; - sourceTree = ""; - }; ECBE529B2C1D94A4006BDB3D /* CameraView */ = { isa = PBXGroup; children = ( @@ -1244,7 +1233,6 @@ EC2002D72C4160EF002EBD5F /* EditCommands.swift in Sources */, ECF7B2DF2C39169C004D2C57 /* simd_float4x4++.swift in Sources */, ECF7B2D02C39169C004D2C57 /* Array++.swift in Sources */, - ECBE52962C1D5900006BDB3D /* PhotoPreview.swift in Sources */, ECA738DE2BE610A000A4542E /* ViewPortRenderPass.swift in Sources */, EC8F54AC2C2ACDA8001C7C74 /* GridMode.swift in Sources */, EC2002D92C4161ED002EBD5F /* ViewCommands.swift in Sources */, diff --git a/Memola/Features/Memo/PhotoPreview/PhotoItem.swift b/Memola/Features/Memo/PhotoDock/PhotoItem.swift similarity index 100% rename from Memola/Features/Memo/PhotoPreview/PhotoItem.swift rename to Memola/Features/Memo/PhotoDock/PhotoItem.swift diff --git a/Memola/Features/Memo/PhotoPreview/PhotoPreview.swift b/Memola/Features/Memo/PhotoPreview/PhotoPreview.swift deleted file mode 100644 index 614b4b8..0000000 --- a/Memola/Features/Memo/PhotoPreview/PhotoPreview.swift +++ /dev/null @@ -1,62 +0,0 @@ -// -// PhotoPreview.swift -// Memola -// -// Created by Dscyre Scotti on 6/15/24. -// - -import SwiftUI - -struct PhotoPreview: View { - @Environment(\.horizontalSizeClass) private var horizontalSizeClass - - private let photoItem: PhotoItem - @ObservedObject private var tool: Tool - - private var previewWidth: CGFloat? { - horizontalSizeClass == .compact ? 80 : nil - } - - private var previewHeight: CGFloat? { - horizontalSizeClass == .compact ? nil : 100 - } - - init(photoItem: PhotoItem, tool: Tool) { - self.photoItem = photoItem - self.tool = tool - } - - var body: some View { - Image(image: photoItem.image) - .resizable() - .frame(width: previewWidth, height: previewHeight) - .cornerRadius(5) - .overlay { - RoundedRectangle(cornerRadius: 5) - .stroke(Color.gray, lineWidth: 0.2) - } - .padding(10) - .background(.regularMaterial) - .cornerRadius(5) - .overlay(alignment: .topLeading) { - Button { -// tool.unselectPhoto() - } label: { - Image(systemName: "xmark.circle.fill") - .font(.title2) - .padding(1) - .contentShape(.circle) - .background { - Circle() - .fill(.white) - } - } - .foregroundStyle(.red) - #if os(iOS) - .hoverEffect(.lift) - #endif - .offset(x: -12, y: -12) - } - .padding(10) - } -}