starred/Memola
1
0
Fork 0
mirror of https://github.com/dscyrescotti/Memola.git synced 2026-04-25 10:08:34 +02:00
Code Issues 5 Packages Projects Releases 3 Wiki Activity

feat: update padding

Browse Source
This commit is contained in:
dscyrescotti
2024-07-05 18:25:12 +07:00
parent aa5f230822
commit 16e5251396
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Memola/Canvas/RenderPasses/PreviewRenderPass.swift
View File

@@ -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 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) previewTexture = createPreviewTexture(for: size, with: renderer)
descriptor?.colorAttachments[0].texture = previewTexture descriptor?.colorAttachments[0].texture = previewTexture
descriptor?.colorAttachments[0].clearColor = MTLClearColor(red: 1, green: 1, blue: 1, alpha: 0) descriptor?.colorAttachments[0].clearColor = MTLClearColor(red: 1, green: 1, blue: 1, alpha: 0)
@@ -84,18 +84,6 @@ final class PreviewRenderPass: RenderPass {
return true 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? { private func createPreviewTexture(for size: CGSize, with renderer: Renderer) -> MTLTexture? {
let ratio = size.width / size.height let ratio = size.width / size.height
let dimension: CGFloat = 800 let dimension: CGFloat = 800

2
Memola/Features/Dashboard/Details/Memos/MemosView.swift
View File

@@ -152,7 +152,7 @@ struct MemosView: View {
.animation(.easeInOut, value: memoObject.isFavorite) .animation(.easeInOut, value: memoObject.isFavorite)
.frame(width: 20, height: 20) .frame(width: 20, height: 20)
.padding(5) .padding(5)
.background(.gray) .background(.gray.tertiary)
.cornerRadius(5) .cornerRadius(5)
.contentShape(Rectangle()) .contentShape(Rectangle())
.onTapGesture { .onTapGesture {

2
Memola/Features/Dashboard/Details/Shared/MemoGrid.swift
View File

@@ -17,7 +17,7 @@ struct MemoGrid<Card: View>: View {
if horizontalSizeClass == .compact { if horizontalSizeClass == .compact {
return 180 return 180
} }
return 250 return 200
} }
var body: some View { var body: some View {

3
Memola/Features/Dashboard/Details/Shared/MemoPreview.swift
View File

@@ -24,13 +24,14 @@ struct MemoPreview: View {
if let preview, let previewImage = UIImage(data: preview) { if let preview, let previewImage = UIImage(data: preview) {
Image(uiImage: previewImage) Image(uiImage: previewImage)
.resizable() .resizable()
.aspectRatio(contentMode: .fill) .aspectRatio(contentMode: .fit)
} else { } else {
Rectangle() Rectangle()
.fill(.white) .fill(.white)
} }
} }
.frame(width: cellWidth, height: cellHeight) .frame(width: cellWidth, height: cellHeight)
.background(.white)
.clipShape(RoundedRectangle(cornerRadius: 10)) .clipShape(RoundedRectangle(cornerRadius: 10))
} }
} }