From 16e525139619aab2435e4d77ed058f540cf3b85a Mon Sep 17 00:00:00 2001 From: dscyrescotti Date: Fri, 5 Jul 2024 18:25:12 +0700 Subject: [PATCH] feat: update padding --- .../Canvas/RenderPasses/PreviewRenderPass.swift | 16 ++-------------- .../Dashboard/Details/Memos/MemosView.swift | 2 +- .../Dashboard/Details/Shared/MemoGrid.swift | 2 +- .../Dashboard/Details/Shared/MemoPreview.swift | 3 ++- 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Memola/Canvas/RenderPasses/PreviewRenderPass.swift b/Memola/Canvas/RenderPasses/PreviewRenderPass.swift index 1324f92..65b2502 100644 --- a/Memola/Canvas/RenderPasses/PreviewRenderPass.swift +++ b/Memola/Canvas/RenderPasses/PreviewRenderPass.swift @@ -62,9 +62,9 @@ final class PreviewRenderPass: RenderPass { } } } - let padding = calculatePadding(bounds) + let padding: CGFloat = 20 let origin = CGPoint(x: bounds[0] - padding, y: bounds[1] - padding) - let size = CGSize(width: bounds[2] - origin.x + padding, height: bounds[3] - origin.y + padding) + let size = CGSize(width: (bounds[2] - origin.x) + padding, height: (bounds[3] - origin.y) + padding) previewTexture = createPreviewTexture(for: size, with: renderer) descriptor?.colorAttachments[0].texture = previewTexture descriptor?.colorAttachments[0].clearColor = MTLClearColor(red: 1, green: 1, blue: 1, alpha: 0) @@ -84,18 +84,6 @@ final class PreviewRenderPass: RenderPass { return true } - private func calculatePadding(_ bounds: [CGFloat]) -> CGFloat { - let maxDifference = max(bounds[2] - bounds[0], bounds[3] - bounds[1]) - - let minPadding: CGFloat = 10.0 - let maxPadding: CGFloat = 50.0 - - let normalizedDifference = min(maxDifference, 1.0) - let inverseDifference = 1.0 / normalizedDifference - let paddingRange = maxPadding - minPadding - return minPadding + (inverseDifference * paddingRange) - } - private func createPreviewTexture(for size: CGSize, with renderer: Renderer) -> MTLTexture? { let ratio = size.width / size.height let dimension: CGFloat = 800 diff --git a/Memola/Features/Dashboard/Details/Memos/MemosView.swift b/Memola/Features/Dashboard/Details/Memos/MemosView.swift index d82b122..53e71ae 100644 --- a/Memola/Features/Dashboard/Details/Memos/MemosView.swift +++ b/Memola/Features/Dashboard/Details/Memos/MemosView.swift @@ -152,7 +152,7 @@ struct MemosView: View { .animation(.easeInOut, value: memoObject.isFavorite) .frame(width: 20, height: 20) .padding(5) - .background(.gray) + .background(.gray.tertiary) .cornerRadius(5) .contentShape(Rectangle()) .onTapGesture { diff --git a/Memola/Features/Dashboard/Details/Shared/MemoGrid.swift b/Memola/Features/Dashboard/Details/Shared/MemoGrid.swift index 5b54b88..319fc14 100644 --- a/Memola/Features/Dashboard/Details/Shared/MemoGrid.swift +++ b/Memola/Features/Dashboard/Details/Shared/MemoGrid.swift @@ -17,7 +17,7 @@ struct MemoGrid: View { if horizontalSizeClass == .compact { return 180 } - return 250 + return 200 } var body: some View { diff --git a/Memola/Features/Dashboard/Details/Shared/MemoPreview.swift b/Memola/Features/Dashboard/Details/Shared/MemoPreview.swift index b978ae8..c5fc94c 100644 --- a/Memola/Features/Dashboard/Details/Shared/MemoPreview.swift +++ b/Memola/Features/Dashboard/Details/Shared/MemoPreview.swift @@ -24,13 +24,14 @@ struct MemoPreview: View { if let preview, let previewImage = UIImage(data: preview) { Image(uiImage: previewImage) .resizable() - .aspectRatio(contentMode: .fill) + .aspectRatio(contentMode: .fit) } else { Rectangle() .fill(.white) } } .frame(width: cellWidth, height: cellHeight) + .background(.white) .clipShape(RoundedRectangle(cornerRadius: 10)) } }