Merge branch 'develop' into fix/qa-home

boostcampwm-2024 · Dec 4, 2024 · a120e4a · a120e4a
2 parents 1dc4d8f + 7faac4f
commit a120e4a
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 23 deletions.
diff --git a/MemorialHouse/MHApplication/MHApplication/Source/App/SceneDelegate.swift b/MemorialHouse/MHApplication/MHApplication/Source/App/SceneDelegate.swift
@@ -239,6 +239,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 +319,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 +329,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)
     }
@@ -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),
@@ -310,6 +320,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 +339,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
@@ -81,6 +81,9 @@ public final class CreateAudioViewModel: ViewModelType {
             output.send(.audioStop)
         }
         output.send(.recordCompleted)
-        completion(mediaDescription)
+
+        if withCompletion {
+            completion(mediaDescription)
+        }
     }
 }
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/...rialHouse/MHPresentation/MHPresentation/Source/EditBook/ViewModel/EditBookViewModel.swift b/...rialHouse/MHPresentation/MHPresentation/Source/EditBook/ViewModel/EditBookViewModel.swift
@@ -27,6 +27,7 @@ final class EditBookViewModel: ViewModelType {
     private let fetchBookUseCase: FetchBookUseCase
     private let updateBookUseCase: UpdateBookUseCase
     private let storeMediaUseCase: PersistentlyStoreMediaUseCase
+    private let deleteTemporaryMediaUsecase: DeleteTemporaryMediaUseCase
     private let createMediaUseCase: CreateMediaUseCase
     private let fetchMediaUseCase: FetchMediaUseCase
     private let deleteMediaUseCase: DeleteMediaUseCase
@@ -40,6 +41,7 @@ final class EditBookViewModel: ViewModelType {
         fetchBookUseCase: FetchBookUseCase,
         updateBookUseCase: UpdateBookUseCase,
         storeMediaUseCase: PersistentlyStoreMediaUseCase,
+        deleteTemporaryMediaUsecase: DeleteTemporaryMediaUseCase,
         createMediaUseCase: CreateMediaUseCase,
         fetchMediaUseCase: FetchMediaUseCase,
         deleteMediaUseCase: DeleteMediaUseCase,
@@ -48,6 +50,7 @@ final class EditBookViewModel: ViewModelType {
         self.fetchBookUseCase = fetchBookUseCase
         self.updateBookUseCase = updateBookUseCase
         self.storeMediaUseCase = storeMediaUseCase
+        self.deleteTemporaryMediaUsecase = deleteTemporaryMediaUsecase
         self.createMediaUseCase = createMediaUseCase
         self.fetchMediaUseCase = fetchMediaUseCase
         self.deleteMediaUseCase = deleteMediaUseCase
@@ -114,6 +117,7 @@ final class EditBookViewModel: ViewModelType {
         let description = MediaDescription(type: type, attributes: attributes)
         do {
             try await createMediaUseCase.execute(media: description, from: url, at: bookID)
+            try await deleteTemporaryMediaUsecase.execute(media: description)
             editPageViewModels[currentPageIndex].addMedia(media: description, url: url)
         } catch {
             output.send(.error(message: "미디어를 추가하는데 실패했습니다."))

diff --git a/...se/MHPresentation/MHPresentation/Source/EditBook/ViewModel/EditBookViewModelFactory.swift b/...se/MHPresentation/MHPresentation/Source/EditBook/ViewModel/EditBookViewModelFactory.swift
@@ -5,6 +5,7 @@ public struct EditBookViewModelFactory {
     private let fetchBookUseCase: FetchBookUseCase
     private let updateBookUseCase: UpdateBookUseCase
     private let storeMediaUseCase: PersistentlyStoreMediaUseCase
+    private let deleteTemporaryMediaUseCase: DeleteTemporaryMediaUseCase
     private let createMediaUseCase: CreateMediaUseCase
     private let fetchMediaUseCase: FetchMediaUseCase
     private let deleteMediaUseCase: DeleteMediaUseCase
@@ -13,13 +14,15 @@ public struct EditBookViewModelFactory {
         fetchBookUseCase: FetchBookUseCase,
         updateBookUseCase: UpdateBookUseCase,
         storeMediaUseCase: PersistentlyStoreMediaUseCase,
+        deleteTemporaryMediaUseCase: DeleteTemporaryMediaUseCase,
         createMediaUseCase: CreateMediaUseCase,
         fetchMediaUseCase: FetchMediaUseCase,
         deleteMediaUseCase: DeleteMediaUseCase
     ) {
         self.fetchBookUseCase = fetchBookUseCase
         self.updateBookUseCase = updateBookUseCase
         self.storeMediaUseCase = storeMediaUseCase
+        self.deleteTemporaryMediaUseCase = deleteTemporaryMediaUseCase
         self.createMediaUseCase = createMediaUseCase
         self.fetchMediaUseCase = fetchMediaUseCase
         self.deleteMediaUseCase = deleteMediaUseCase
@@ -30,6 +33,7 @@ public struct EditBookViewModelFactory {
             fetchBookUseCase: fetchBookUseCase,
             updateBookUseCase: updateBookUseCase,
             storeMediaUseCase: storeMediaUseCase,
+            deleteTemporaryMediaUsecase: deleteTemporaryMediaUseCase,
             createMediaUseCase: createMediaUseCase,
             fetchMediaUseCase: fetchMediaUseCase,
             deleteMediaUseCase: deleteMediaUseCase,