Merge pull request #102 from boostcampwm-2024/fix/#100-fix-content-co…

…nstraints [FIX/#100] 스크롤뷰 컨텐츠 센터링 + 줌 문제 해결
boostcampwm-2024 · Nov 26, 2024 · 031aab0 · 031aab0
2 parents b9a58ec + 9d8613c
commit 031aab0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/...PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/CanvasScrollView.swift b/...PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/CanvasScrollView.swift
@@ -34,7 +34,10 @@ final class CanvasScrollView: UIScrollView {
 
     func updateFrameImage(to image: UIImage) {
         imageView.image = image
-        imageView.sizeToFit()
+
+        self.imageView.sizeToFit()
+        self.setupZoomScale()
+        self.contentCentering()
     }
 
     func contentCentering() {
@@ -62,14 +65,14 @@ final class CanvasScrollView: UIScrollView {
         let heightBaseScale = frame.height / image.size.height
         let calculatedZoomScale = min(widthBaseScale, heightBaseScale)
 
-        zoomScale = calculatedZoomScale
+        // 호출 순서 바꾸면 안됨
         minimumZoomScale = calculatedZoomScale
+        zoomScale = calculatedZoomScale
     }
 }
 
 extension CanvasScrollView: UIScrollViewDelegate {
     public func viewForZooming(in scrollView: UIScrollView) -> UIView? {
-        contentCentering()
         return imageView
     }
 }
diff --git a/...r/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomGuestViewController.swift b/...r/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomGuestViewController.swift
@@ -43,13 +43,6 @@ public class EditPhotoRoomGuestViewController: BaseViewController, ViewControlle
         bindOutput()
     }
 
-    public override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-
-        canvasScrollView.setupZoomScale()
-        canvasScrollView.contentCentering()
-    }
-
     public func addViews() {
         [navigationView, canvasScrollView, bottomView].forEach {
             view.addSubview($0)

diff --git a/...er/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomHostViewController.swift b/...er/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomHostViewController.swift
@@ -43,13 +43,6 @@ public class EditPhotoRoomHostViewController: BaseViewController, ViewController
         bindOutput()
     }
 
-    public override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-
-        canvasScrollView.setupZoomScale()
-        canvasScrollView.contentCentering()
-    }
-
     public func addViews() {
         [navigationView, canvasScrollView, bottomView].forEach {
             view.addSubview($0)
@@ -82,8 +75,6 @@ public class EditPhotoRoomHostViewController: BaseViewController, ViewController
         navigationView.backgroundColor = .yellow
         bottomView.backgroundColor = .yellow
         canvasScrollView.backgroundColor = .red
-
-        canvasScrollView.imageView.sizeToFit()
     }
 
     public func bindInput() {