커스텀 앨범에서 이미지 편집 뷰로 이동

MemorialHouse/MHPresentation/MHPresentation/Source/CustomAlbum/CustomAlbumViewController.swift → MemorialHouse/MHPresentation/MHPresentation/Source/CustomAlbum/View/CustomAlbumViewController.swift

@@ -3,36 +3,44 @@ import Photos
 
 final class CustomAlbumViewController: UIViewController {
     // MARK: - Properties
-    private var imageAsset: PHFetchResult<PHAsset>?
-    private let imageManager = PHCachingImageManager()
     private let imagePicker = UIImagePickerController()
-
     private lazy var albumCollectionView: UICollectionView = {
         let flowLayout = UICollectionViewFlowLayout()
-        let cellSize = (self.view.bounds.inset(by: self.view.safeAreaInsets).width - 10) / 3
+        let cellSize = (self.view.bounds.inset(by: self.view.safeAreaInsets).width - 6) / 3
         flowLayout.itemSize = CGSize(width: cellSize, height: cellSize)
-        flowLayout.minimumLineSpacing = 10
-        flowLayout.minimumInteritemSpacing = 5
+        flowLayout.minimumLineSpacing = 3
+        flowLayout.minimumInteritemSpacing = 2
         flowLayout.scrollDirection = .vertical
         let collectionView = UICollectionView(frame: .zero, collectionViewLayout: flowLayout)
 
         return collectionView
     }()
+    private let viewModel: CustomAlbumViewModel
+
+    // MARK: - Initializer
+    init(viewModel: CustomAlbumViewModel) {
+        self.viewModel = viewModel
+
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    required init?(coder: NSCoder) {
+        self.viewModel = CustomAlbumViewModel()
+
+        super.init(nibName: nil, bundle: nil)
+    }
 
     // MARK: - ViewDidLoad
     override func viewDidLoad() {
         super.viewDidLoad()
 
         setup()
         configureConstraints()
+        viewModel.action(.viewDidLoad)
     }
 
     // MARK: - Setup & Configure
     private func setup() {
-        let fetchOptions = PHFetchOptions()
-        fetchOptions.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
-
-        imageAsset = PHAsset.fetchAssets(with: fetchOptions)
         imagePicker.delegate = self
         albumCollectionView.delegate = self
         albumCollectionView.dataSource = self
@@ -49,9 +57,9 @@ final class CustomAlbumViewController: UIViewController {
 
     // MARK: - Open Camera
     private func openCamera() {
-        if (UIImagePickerController.isSourceTypeAvailable(.camera)) {
+        if UIImagePickerController.isSourceTypeAvailable(.camera) {
             imagePicker.sourceType = .camera
-            navigationController?.pushViewController(imagePicker, animated: true)
+            navigationController?.show(imagePicker, sender: nil)
         } else {
             // TODO: - 카메라 접근 권한 Alert
         }
@@ -67,14 +75,14 @@ extension CustomAlbumViewController: UICollectionViewDelegate {
         if indexPath.item == 0 {
             self.openCamera()
         } else {
-            guard let asset = self.imageAsset?[indexPath.item - 1] else { return }
-            imageManager.requestImage(
-                for: asset,
-                targetSize: .zero,
-                contentMode: .default,
-                options: nil
-            ) { image, _ in
-                // TODO: - 이미지 편집 뷰 로 이동
+            guard let asset = viewModel.photoAsset?[indexPath.item - 1] else { return }
+            Task {
+                await LocalPhotoManager.shared.requestImage(with: asset) { [weak self] image in
+                    guard let self else { return }
+                    let editViewController = EditPhotoViewController()
+                    editViewController.setPhoto(image: image)
+                    self.navigationController?.pushViewController(editViewController, animated: true)
+                }
             }
         }
     }
@@ -86,8 +94,8 @@ extension CustomAlbumViewController: UICollectionViewDataSource {
         _ collectionView: UICollectionView,
         numberOfItemsInSection section: Int
     ) -> Int {
-        guard let imageAsset else { return 1 }
-        return imageAsset.count + 1
+        guard let assetNum = viewModel.photoAsset?.count else { return 1 }
+        return assetNum + 1
     }
 
     func collectionView(
@@ -102,18 +110,14 @@ extension CustomAlbumViewController: UICollectionViewDataSource {
         if indexPath.item == 0 {
             cell.setPhoto(.photo)
         } else {
-            guard let asset = imageAsset?[indexPath.item - 1] else { return cell }
+            guard let asset = viewModel.photoAsset?[indexPath.item - 1] else { return cell }
             let cellSize = cell.bounds.size
-            imageManager.requestImage(
-                for: asset,
-                targetSize: cellSize,
-                contentMode: .aspectFill,
-                options: nil
-            ) { image, _ in
-                cell.setPhoto(image)
+            Task {
+                await LocalPhotoManager.shared.requestImage(with: asset, cellSize: cellSize) { image in
+                    cell.setPhoto(image)
+                }
             }
         }
-
         return cell
     }
 }
@@ -122,11 +126,13 @@ extension CustomAlbumViewController: UICollectionViewDataSource {
 extension CustomAlbumViewController: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
     func imagePickerController(
         _ picker: UIImagePickerController,
-        didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]
+        didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]
     ) {
+        dismiss(animated: true, completion: nil)
         if let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage {
-            // TODO: - 이미지 편집 뷰로 이동
+            let editViewController = EditPhotoViewController()
+            editViewController.setPhoto(image: image)
+            self.navigationController?.pushViewController(editViewController, animated: true)
         }
-        dismiss(animated: true, completion: nil)
     }
 }

MemorialHouse/MHPresentation/MHPresentation/Source/CustomAlbum/ViewModel/CustomAlbumViewModel.swift

@@ -0,0 +1,26 @@
+import MHFoundation
+import Photos
+import Combine
+
+final class CustomAlbumViewModel {
+    enum Input {
+        case viewDidLoad
+    }
+    // MARK: - Properties
+    @Published private(set) var photoAsset: PHFetchResult<PHAsset>?
+
+    func action(_ input: CustomAlbumViewModel.Input) {
+        switch input {
+        case .viewDidLoad:
+            fetchPhotoAssets()
+        }
+    }
+
+    private func fetchPhotoAssets() {
+        let fetchOptions = PHFetchOptions()
+        fetchOptions.predicate = NSPredicate(format: "mediaType = %d", PHAssetMediaType.image.rawValue)
+        fetchOptions.sortDescriptors = [NSSortDescriptor(key: "creationDate", ascending: false)]
+
+        photoAsset = PHAsset.fetchAssets(with: fetchOptions)
+    }
+}

MemorialHouse/MHPresentation/MHPresentation/Source/CustomAlbum/ViewModel/LocalPhotoManager.swift

@@ -0,0 +1,33 @@
+import UIKit
+import Photos
+
+actor LocalPhotoManager {
+    static let shared = LocalPhotoManager()
+
+    private let imageManager = PHImageManager()
+    private let imageRequestOptions: PHImageRequestOptions = {
+        let options = PHImageRequestOptions()
+        options.deliveryMode = .highQualityFormat
+
+        return options
+    }()
+
+    private init() { }
+
+    func requestImage(
+        with asset: PHAsset?,
+        cellSize: CGSize = .zero,
+        completion: @escaping @MainActor (UIImage?) -> Void
+    ) {
+        guard let asset else { return }
+
+        imageManager.requestImage(
+            for: asset,
+            targetSize: cellSize,
+            contentMode: .aspectFill,
+            options: imageRequestOptions,
+            resultHandler: { image, _ in
+                Task { await completion(image) }
+            })
+    }
+}

MemorialHouse/MHPresentation/MHPresentation/Source/EditPhoto/EditPhotoViewController.swift

@@ -2,12 +2,18 @@
 
 public final class EditPhotoViewController: UIViewController {
     // MARK: - Properties
-    private let photoView = UIImageView()
     private let clearView = UIView.dimmedView(opacity: 0)
     private let dimmedView1 = UIView.dimmedView(opacity: 0.5)
     private let dimmedView2 = UIView.dimmedView(opacity: 0.5)
     private let dividedLine1 = UIView.dividedLine()
     private let dividedLine2 = UIView.dividedLine()
+    private let photoView: UIImageView = {
+       let imageView = UIImageView()
+        imageView.contentMode = .scaleAspectFit
+        imageView.backgroundColor = .clear
+
+        return imageView
+    }()
     private let captionTextField: UITextField = {
         let textField = UITextField()
         textField.attributedPlaceholder = NSAttributedString(
@@ -75,7 +81,11 @@
         navigationController?.navigationBar.titleTextAttributes = [
             NSAttributedString.Key.font: UIFont.ownglyphBerry(size: 17),
             NSAttributedString.Key.foregroundColor: UIColor.white]
-        let leftBarButton = UIBarButtonItem(title: "닫기")
+        let closeAction = UIAction { [weak self] _ in
+            guard let self else { return }
+            self.navigationController?.popViewController(animated: true)
+        }
+        let leftBarButton = UIBarButtonItem(title: "닫기", primaryAction: closeAction)
         leftBarButton.setTitleTextAttributes(
             [NSAttributedString.Key.font: UIFont.ownglyphBerry(size: 17),
              NSAttributedString.Key.foregroundColor: UIColor.white],
@@ -158,20 +168,24 @@
 
     private func configureButtonAction() {
         let cropButtonAction = UIAction { _ in
             // TODO: - Crop Action
         }
         let rotateButtonAction = UIAction { _ in
             // TODO: - Rotate Action
         }
         let drawButtonAction = UIAction { _ in
             // TODO: - Draw Action
         }
         cropButton.addAction(cropButtonAction, for: .touchUpInside)
         rotateButton.addAction(rotateButtonAction, for: .touchUpInside)
         drawButton.addAction(drawButtonAction, for: .touchUpInside)
     }
+
+    func setPhoto(image: UIImage?) {
+        photoView.image = image
+    }
 }
 
 extension EditPhotoViewController: UITextFieldDelegate {
     // TODO: - TextField의 텍스트 처리
 }