Merge branch 'develop' into fix/image-qa

boostcampwm-2024 · Dec 4, 2024 · 5609f49 · 5609f49
2 parents 502e578 + 6a7dc63
commit 5609f49
Show file tree

Hide file tree

Showing 43 changed files with 259 additions and 122 deletions.
diff --git a/MemorialHouse/MHApplication/MHApplication/Source/App/SceneDelegate.swift b/MemorialHouse/MHApplication/MHApplication/Source/App/SceneDelegate.swift
@@ -73,11 +73,12 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             try registerUseCaseDependency()
             try registerViewModelFactoryDependency()
         } catch let error as MHCoreError {
-            MHLogger.error("\(error.description)")
+            MHLogger.error(error.description + #function)
         } catch {
-            MHLogger.error("\(error.localizedDescription)")
+            MHLogger.error(error.localizedDescription + #function)
         }
     }
+
     private func registerStorageDepedency() throws {
         DIContainer.shared.register(CoreDataStorage.self, object: CoreDataStorage())
 
@@ -239,6 +240,10 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             TemporaryStoreMediaUseCase.self,
             object: DefaultTemporaryStoreMediaUseCase(repository: mediaRepository)
         )
+        DIContainer.shared.register(
+            DeleteTemporaryMediaUseCase.self,
+            object: DefaultDeleteTemporaryMediaUseCase(repository: mediaRepository)
+        )
     }
 
     private func registerViewModelFactoryDependency() throws {
@@ -315,6 +320,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         // MARK: - EditBook ViewModel
         let updateBookUseCase = try DIContainer.shared.resolve(UpdateBookUseCase.self)
         let storeMediaUseCase = try DIContainer.shared.resolve(PersistentlyStoreMediaUseCase.self)
+        let deleteTemporaryMediaUseCase = try DIContainer.shared.resolve(DeleteTemporaryMediaUseCase.self)
         let createMediaUseCase = try DIContainer.shared.resolve(CreateMediaUseCase.self)
         let fetchMediaUseCase = try DIContainer.shared.resolve(FetchMediaUseCase.self)
         let deleteMediaUseCase = try DIContainer.shared.resolve(DeleteMediaUseCase.self)
@@ -324,6 +330,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                 fetchBookUseCase: fetchBookUseCase,
                 updateBookUseCase: updateBookUseCase,
                 storeMediaUseCase: storeMediaUseCase,
+                deleteTemporaryMediaUseCase: deleteTemporaryMediaUseCase,
                 createMediaUseCase: createMediaUseCase,
                 fetchMediaUseCase: fetchMediaUseCase,
                 deleteMediaUseCase: deleteMediaUseCase

diff --git a/MemorialHouse/MHDomain/MHDomain/UseCase/DefaultMediaUseCase.swift b/MemorialHouse/MHDomain/MHDomain/UseCase/DefaultMediaUseCase.swift
@@ -99,3 +99,19 @@ public struct DefaultTemporaryStoreMediaUseCase: TemporaryStoreMediaUseCase {
         return try await repository.getURL(media: media, from: nil).get()
     }
 }
+
+public struct DefaultDeleteTemporaryMediaUseCase: DeleteTemporaryMediaUseCase {
+    // MARK: - Property
+    let repository: MediaRepository
+
+    // MARK: - Initializer
+    public init(repository: MediaRepository) {
+        self.repository = repository
+    }
+
+    // MARK: - Method
+    public func execute(media: MediaDescription) async throws {
+        try await repository.delete(media: media, at: nil).get()
+    }
+}
+
diff --git a/MemorialHouse/MHDomain/MHDomain/UseCase/Interface/MediaUseCase.swift b/MemorialHouse/MHDomain/MHDomain/UseCase/Interface/MediaUseCase.swift
@@ -27,3 +27,7 @@ public protocol PersistentlyStoreMediaUseCase: Sendable {
 public protocol TemporaryStoreMediaUseCase: Sendable {
     func execute(media: MediaDescription) async throws -> URL
 }
+
+public protocol DeleteTemporaryMediaUseCase: Sendable {
+    func execute(media: MediaDescription) async throws
+}
diff --git a/...use/MHPresentation/MHPresentation/Source/Audio/Audio/View/CreateAudioViewController.swift b/...use/MHPresentation/MHPresentation/Source/Audio/Audio/View/CreateAudioViewController.swift
@@ -53,14 +53,22 @@ final class CreateAudioViewController: UIViewController {
         return button
     }()
     private let saveButton: UIButton = {
-        let button = UIButton(
-            frame: CGRect(origin: .zero, size: CGSize(width: 60, height: 21))
-        )
-        var attributedString = AttributedString(stringLiteral: "저장")
-        attributedString.font = UIFont.ownglyphBerry(size: 21)
-        attributedString.foregroundColor = UIColor.black
-        button.setAttributedTitle(NSAttributedString(attributedString), for: .normal)
+        let button = UIButton(frame: CGRect(origin: .zero, size: CGSize(width: 60, height: 21)))
         button.contentHorizontalAlignment = .center
+        button.setAttributedTitle(
+            NSAttributedString(
+                string: "저장",
+                attributes: [.font: UIFont.ownglyphBerry(size: 21), .foregroundColor: UIColor.mhTitle]
+            ),
+            for: .normal
+        )
+        button.setAttributedTitle(
+            NSAttributedString(
+                string: "저장",
+                attributes: [.font: UIFont.ownglyphBerry(size: 21), .foregroundColor: UIColor.systemGray2]
+            ),
+            for: .disabled
+        )
         return button
     }()
     // audio metering
@@ -98,7 +106,9 @@ final class CreateAudioViewController: UIViewController {
     }
 
     required init?(coder: NSCoder) {
-        guard let viewModelFactory = try? DIContainer.shared.resolve(CreateAudioViewModelFactory.self) else { return nil }
+        guard let viewModelFactory = try? DIContainer.shared.resolve(CreateAudioViewModelFactory.self) else {
+            return nil
+        }
         self.viewModel = viewModelFactory.make { _ in }
         super.init(nibName: nil, bundle: nil)
     }
@@ -112,7 +122,7 @@ final class CreateAudioViewController: UIViewController {
         configureAddSubviews()
         configureConstraints()
         configureAddActions()
-        input.send(.viewDidLoad)
+        input.send(.prepareTemporaryAudio)
     }
 
     // MARK: - Setup
@@ -128,7 +138,7 @@ final class CreateAudioViewController: UIViewController {
 
         for index in 0..<numberOfBars {
             let upMeteringLayer = CALayer()
-            upMeteringLayer.backgroundColor = UIColor.orange.cgColor
+            upMeteringLayer.backgroundColor = UIColor.mhOrange.cgColor
             upMeteringLayer.frame = CGRect(
                 x: index * (width + barSpacing),
                 y: Int(volumeHalfHeight),
@@ -264,19 +274,11 @@ final class CreateAudioViewController: UIViewController {
 
     // MARK: - Helper
     private func requestMicrophonePermission() {
-        let alert = UIAlertController(
-            title: "마이크 권한 필요",
-            message: "설정에서 마이크 권한을 허용해주세요.",
-            preferredStyle: .alert
-        )
-        alert.addAction(UIAlertAction(title: "OK", style: .default) { [weak self] _ in
-            self?.dismiss(animated: true)
-        })
         Task {
             AVAudioSession.sharedInstance().requestRecordPermission { @Sendable granted in
                 Task { @MainActor in
                     if !granted {
-                        self.present(alert, animated: true, completion: nil)
+                        self.showRedirectSettingAlert(with: .audio)
                     }
                 }
             }
@@ -310,6 +312,8 @@ final class CreateAudioViewController: UIViewController {
         audioButton.setWidthAndHeight(width: 32, height: 32)
         audioButton.setCenter(view: audioButtonBackground)
         NSLayoutConstraint.activate(audioButton.constraints)
+
+        saveButton.isEnabled = false
     }
 
     private func stopRecording() {
@@ -327,6 +331,8 @@ final class CreateAudioViewController: UIViewController {
         audioButton.setWidthAndHeight(width: 48, height: 48)
         audioButton.setCenter(view: audioButtonBackground)
         NSLayoutConstraint.activate(audioButton.constraints)
+
+        saveButton.isEnabled = true
     }
 
     private func updateAudioMetering() {

diff --git a/...use/MHPresentation/MHPresentation/Source/Audio/Audio/ViewModel/CreateAudioViewModel.swift b/...use/MHPresentation/MHPresentation/Source/Audio/Audio/ViewModel/CreateAudioViewModel.swift
@@ -6,7 +6,7 @@ import MHDomain
 public final class CreateAudioViewModel: ViewModelType {
     // MARK: - Type
     enum Input {
-        case viewDidLoad
+        case prepareTemporaryAudio
         case audioButtonTapped
         case saveButtonTapped
         case recordCancelled
@@ -39,8 +39,8 @@ public final class CreateAudioViewModel: ViewModelType {
     func transform(input: AnyPublisher<Input, Never>) -> AnyPublisher<Output, Never> {
         input.sink { [weak self] event in
             switch event {
-            case .viewDidLoad:
-                Task { await self?.viewDidLoad() }
+            case .prepareTemporaryAudio:
+                Task { await self?.prepareTemporaryAudio() }
             case .audioButtonTapped:
                 self?.audioButtonTapped()
             case .saveButtonTapped:
@@ -54,14 +54,14 @@ public final class CreateAudioViewModel: ViewModelType {
     }
 
     // MARK: - Helper
-    private func viewDidLoad() async {
+    private func prepareTemporaryAudio() async {
         let mediaDescription = MediaDescription(type: .audio)
         self.mediaDescription = mediaDescription
         do {
             let url = try await temporaryStoreMediaUsecase.execute(media: mediaDescription)
             output.send(.audioFileURL(url: url))
         } catch {
-            MHLogger.error("Error in store audio file url: \(error.localizedDescription)")
+            MHLogger.error(error.localizedDescription + #function)
             completion(nil)
             output.send(.recordCompleted)
         }
@@ -81,6 +81,9 @@ public final class CreateAudioViewModel: ViewModelType {
             output.send(.audioStop)
         }
         output.send(.recordCompleted)
-        completion(mediaDescription)
+
+        if withCompletion {
+            completion(mediaDescription)
+        }
     }
 }
diff --git a/...resentation/MHPresentation/Source/Audio/Audio/ViewModel/CreateAudioViewModelFactory.swift b/...resentation/MHPresentation/Source/Audio/Audio/ViewModel/CreateAudioViewModelFactory.swift
@@ -15,4 +15,3 @@ public struct CreateAudioViewModelFactory {
             )
     }
 }
-
diff --git a/MemorialHouse/MHPresentation/MHPresentation/Source/Audio/Player/View/MHAudioPlayerView.swift b/MemorialHouse/MHPresentation/MHPresentation/Source/Audio/Player/View/MHAudioPlayerView.swift
@@ -45,11 +45,14 @@ final class MHAudioPlayerView: UIView {
     private var progressViewConstraints: [NSLayoutConstraint] = []
     private let audioStateButton: UIButton = {
         let button = UIButton()
-        button.setImage(UIImage(systemName: "play.fill"), for: .normal)
+        button.setImage(UIImage(systemName: "play.fill")?
+            .withTintColor(.captionPlaceHolder, renderingMode: .alwaysOriginal), for: .normal)
         return button
     }()
-    private let playImage = UIImage(systemName: "play.fill")
-    private let pauseImage = UIImage(systemName: "pause.fill")
+    private let playImage = UIImage(systemName: "play.fill")?
+        .withTintColor(.captionPlaceHolder, renderingMode: .alwaysOriginal)
+    private let pauseImage = UIImage(systemName: "pause.fill")?
+        .withTintColor(.captionPlaceHolder, renderingMode: .alwaysOriginal)
     private let audioPlayTimeLabel: UILabel = {
         let label = UILabel()
         label.text = "00:00"
@@ -59,6 +62,7 @@ final class MHAudioPlayerView: UIView {
 
         return label
     }()
+    private var playerWidth: CGFloat = 0
 
     public override init(frame: CGRect) {
         super.init(frame: frame)
@@ -109,7 +113,7 @@ final class MHAudioPlayerView: UIView {
         )
 
         audioProgressView.translatesAutoresizingMaskIntoConstraints = false
-        progressViewWidthConstraint = audioProgressView.widthAnchor.constraint(equalToConstant: 290)
+        progressViewWidthConstraint = audioProgressView.widthAnchor.constraint(equalToConstant: frame.width - 9)
         NSLayoutConstraint.activate([
             audioProgressView.topAnchor.constraint(equalTo: topAnchor, constant: 29),
             audioProgressView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: 4),
@@ -156,20 +160,21 @@ final class MHAudioPlayerView: UIView {
 
     private func updatePlayAudioProgress() {
         guard let audioPlayer else { return }
-        let width = ceil(Float(audioPlayer.currentTime) / Float(audioPlayer.duration) * Float(299))
+        let width = ceil(Float(audioPlayer.currentTime) / Float(audioPlayer.duration) * Float(frame.width))
 
         progressViewWidthConstraint?.constant = CGFloat(width)
         self.layoutIfNeeded()
+        let seconds = ceil(Double(audioPlayer.currentTime))
+        self.setTimeLabel(seconds: Int(seconds))
     }
 
     private func startTimer() {
         timer?.invalidate()
-        timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { [weak self] _ in
+        timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] _ in
             guard let audioPlayer = self?.audioPlayer else { return }
             Task { @MainActor in
                 if audioPlayer.isPlaying {
                     self?.updatePlayAudioProgress()
-                    self?.setTimeLabel(seconds: Int(audioPlayer.currentTime))
                 }
             }
         }
@@ -196,10 +201,8 @@ extension MHAudioPlayerView: AVAudioPlayerDelegate {
 
             stopTimer()
 
-            progressViewWidthConstraint?.constant = CGFloat(290)
-            UIView.animate(withDuration: 0) {
-                self.layoutIfNeeded()
-            }
+            progressViewWidthConstraint?.constant = CGFloat(frame.width - 9)
+            self.layoutIfNeeded()
         }
     }
 }
@@ -209,13 +212,13 @@ extension MHAudioPlayerView: @preconcurrency MediaAttachable {
         audioPlayer = try? AVAudioPlayer(data: data)
         guard let audioPlayer else { return }
         audioPlayer.delegate = self
-        self.setTimeLabel(seconds: Int(audioPlayer.duration.rounded()))
+        self.setTimeLabel(seconds: Int(ceil(Double(audioPlayer.duration))))
     }
 
     func configureSource(with mediaDescription: MediaDescription, url: URL) {
         audioPlayer = try? AVAudioPlayer(contentsOf: url)
         guard let audioPlayer else { return }
         audioPlayer.delegate = self
-        self.setTimeLabel(seconds: Int(audioPlayer.duration.rounded()))
+        self.setTimeLabel(seconds: Int(ceil(Double(audioPlayer.duration))))
     }
 }
diff --git a/MemorialHouse/MHPresentation/MHPresentation/Source/Book/View/BookViewController.swift b/MemorialHouse/MHPresentation/MHPresentation/Source/Book/View/BookViewController.swift
@@ -136,7 +136,7 @@ final class BookViewController: UIViewController {
             let editBookViewController = EditBookViewController(viewModel: editBookViewModel, mode: .modify)
             navigationController?.pushViewController(editBookViewController, animated: true)
         } catch {
-            MHLogger.error(error)
+            MHLogger.error(error.localizedDescription + #function)
         }
     }
 }

diff --git a/...alHouse/MHPresentation/MHPresentation/Source/BookCover/View/BookCoverViewController.swift b/...alHouse/MHPresentation/MHPresentation/Source/BookCover/View/BookCoverViewController.swift
@@ -129,7 +129,7 @@ final class BookCoverViewController: UIViewController {
         configureAddSubviews()
         configureConstraints()
         configureAction()
-        createInput.send(.viewDidAppear)
+        createInput.send(.setBookCover)
         modifyInput.send(.loadBookCover)
     }
 
@@ -233,7 +233,7 @@ final class BookCoverViewController: UIViewController {
             let editBookViewController = EditBookViewController(viewModel: editBookViewModel)
             navigationController?.pushViewController(editBookViewController, animated: true)
         } catch {
-            MHLogger.error(error)
+            MHLogger.error(error.localizedDescription + #function)
         }
     }
 }
@@ -489,7 +489,7 @@ extension BookCoverViewController: BookCategoryViewControllerDelegate {
 
             self.present(navigationController, animated: true)
         } catch {
-            MHLogger.error(error)
+            MHLogger.error(error.localizedDescription + #function)
         }
     }
 

diff --git a/...e/MHPresentation/MHPresentation/Source/BookCover/ViewModel/CreateBookCoverViewModel.swift b/...e/MHPresentation/MHPresentation/Source/BookCover/ViewModel/CreateBookCoverViewModel.swift
@@ -6,7 +6,7 @@ import Photos
 // TODO: - 에러 처리 필요
 final class CreateBookCoverViewModel: ViewModelType {
     enum Input {
-        case viewDidAppear
+        case setBookCover
         case changedBookTitle(title: String?)
         case changedBookColor(colorIndex: Int)
         case changedBookImage(bookImage: Data?)
@@ -60,7 +60,7 @@ final class CreateBookCoverViewModel: ViewModelType {
     func transform(input: AnyPublisher<Input, Never>) -> AnyPublisher<Output, Never> {
         input.sink { [weak self] event in
             switch event {
-            case .viewDidAppear:
+            case .setBookCover:
                 self?.setBookColor(nowIndex: 0)
                 Task { try await self?.fetchMemorialHouseName() }
             case .changedBookTitle(let title):

diff --git a/.../Category/BookCategoryTableViewCell.swift → ...gory/View/BookCategoryTableViewCell.swift b/.../Category/BookCategoryTableViewCell.swift → ...gory/View/BookCategoryTableViewCell.swift
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@ public struct CreateAudioViewModelFactory {
		)
		}
		}