klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(image): 이미지 선택 후 크롭 편집 흐름을 안정화한다

Browse Source
This commit is contained in:
Yu Sung
2026-03-17 17:05:22 +09:00
parent 039355c088
commit 606470ae04
2 changed files with 76 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
SodaLive/Sources/ImagePicker/ImagePicker.swift
View File

@@ -83,7 +83,6 @@ private enum CropHandle: CaseIterable, Identifiable {
struct ImageCropEditorView: View {
let image: UIImage
let aspectPolicy: ImageCropAspectPolicy
let onCancel: () -> Void
let onComplete: (UIImage) -> Void
@@ -103,11 +102,10 @@ struct ImageCropEditorView: View {
onCancel: @escaping () -> Void,
onComplete: @escaping (UIImage) -> Void
) {
self.image = image
self.aspectPolicy = aspectPolicy
self.onCancel = onCancel
self.onComplete = onComplete
self.normalizedImage = image.normalizedForCrop()
self.normalizedImage = image
}
var body: some View {
@@ -146,7 +144,7 @@ struct ImageCropEditorView: View {
ZStack {
Color.black
Image(uiImage: image)
Image(uiImage: normalizedImage)
.resizable()
.scaledToFit()
.scaleEffect(scale)
@@ -390,7 +388,12 @@ struct ImageCropEditorView: View {
y: cropYInScaled * yRatio,
width: cropSize.width * xRatio,
height: cropSize.height * yRatio
).integral
)
cropRect.origin.x = floor(cropRect.origin.x)
cropRect.origin.y = floor(cropRect.origin.y)
cropRect.size.width = floor(cropRect.size.width)
cropRect.size.height = floor(cropRect.size.height)
cropRect.origin.x = cropRect.origin.x.clamped(min: 0, max: max(0, normalizedImage.size.width - 1))
cropRect.origin.y = cropRect.origin.y.clamped(min: 0, max: max(0, normalizedImage.size.height - 1))
@@ -416,14 +419,29 @@ struct ImageCropEditorView: View {
}
extension UIImage {
func normalizedForCrop() -> UIImage {
if imageOrientation == .up {
func normalizedForCrop(maxDimension: CGFloat = 2048) -> UIImage {
guard size.width > 0, size.height > 0 else {
return self
}
let renderer = UIGraphicsImageRenderer(size: size)
let largestSide = max(size.width, size.height)
let scaleRatio: CGFloat
if maxDimension > 0, largestSide > maxDimension {
scaleRatio = maxDimension / largestSide
} else {
scaleRatio = 1
}
let targetWidth = max(1, floor(size.width * scaleRatio))
let targetHeight = max(1, floor(size.height * scaleRatio))
let targetSize = CGSize(width: targetWidth, height: targetHeight)
let format = UIGraphicsImageRendererFormat.default()
format.scale = 1
let renderer = UIGraphicsImageRenderer(size: targetSize, format: format)
return renderer.image { _ in
draw(in: CGRect(origin: .zero, size: size))
draw(in: CGRect(origin: .zero, size: targetSize))
}
}
@@ -438,7 +456,9 @@ extension UIImage {
}
let scaleRatio = maxDimension / largestSide
let targetSize = CGSize(width: size.width * scaleRatio, height: size.height * scaleRatio)
let targetWidth = max(1, floor(size.width * scaleRatio))
let targetHeight = max(1, floor(size.height * scaleRatio))
let targetSize = CGSize(width: targetWidth, height: targetHeight)
let format = UIGraphicsImageRendererFormat.default()
format.scale = 1
let renderer = UIGraphicsImageRenderer(size: targetSize, format: format)