Merge pull request #194 from YAPP-Github/BOOK-293-fix/#192

fix: 문장 공유 카드 이미지 접근 권한 버그 외 버그 2건 수정

Author: clxxrlove

src/Projects/BKPresentation/Sources/Common/Component/ToastMessageView.swift

@@ -37,7 +37,7 @@ final class ToastMessageView: UIView {
     private func setupLayout() {
         messageLabel.snp.makeConstraints {
             $0.centerX.equalToSuperview()
-            $0.horizontalEdges.greaterThanOrEqualToSuperview().inset(16)
+            $0.horizontalEdges.equalToSuperview().inset(16)
             $0.verticalEdges.equalToSuperview().inset(12)
         }
     }
@@ -58,7 +58,7 @@ final class ToastMessageView: UIView {
         toastView.snp.makeConstraints {
             $0.centerX.equalToSuperview()
             $0.bottom.equalTo(keyWindow.safeAreaLayoutGuide.snp.bottom).inset(88)
-            $0.width.equalTo(keyWindow.safeAreaLayoutGuide.snp.width).inset(72)
+            $0.width.equalTo(keyWindow.safeAreaLayoutGuide.snp.width).inset(36)
         }
 
         toastView.alpha = 0.0

src/Projects/BKPresentation/Sources/MainFlow/BookDetail/View/SentenceCardViewController.swift

@@ -82,6 +82,16 @@ final class SentenceCardViewController: BaseViewController<SentenceCardView> {
             }
             .store(in: &cancellables)
 
+        viewModel.statePublisher
+            .map(\.requestAccess)
+            .removeDuplicates()
+            .filter { $0 == true }
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.presentSettingsAlert()
+            }
+            .store(in: &cancellables)
+        
         viewModel.statePublisher
             .map { $0.isLoading }
             .removeDuplicates()
@@ -95,7 +105,6 @@ final class SentenceCardViewController: BaseViewController<SentenceCardView> {
             }
             .store(in: &cancellables)
     }
-    
 }
 
 extension SentenceCardViewController {
@@ -118,4 +127,27 @@ extension SentenceCardViewController {
 
         self.present(activityViewController, animated: true, completion: completion)
     }
+    
+    private func presentSettingsAlert() {
+        let dialog = BKDialog(
+            title: "접근 권한 필요",
+            subtitle: "설정에서 사진 추가 권한을 허용해주세요.",
+            config: .init(
+                leftButtonTitle: "취소",
+                leftButtonAction: { [weak self] in
+                    self?.viewModel.send(.settingsAlertDismissed)
+                },
+                rightButtonTitle: "설정으로 이동",
+                rightButtonAction: { [weak self] in
+                    self?.viewModel.send(.settingsAlertDismissed)
+                    if let url = URL(string: UIApplication.openSettingsURLString) {
+                        UIApplication.shared.open(url)
+                    }
+                }
+            )
+        )
+        
+        let dialogViewController = BKDialogViewController(dialog: dialog)
+        present(dialogViewController, animated: true)
+    }
 }

src/Projects/BKPresentation/Sources/MainFlow/BookDetail/ViewModel/SentenceCardViewModel.swift

@@ -7,10 +7,15 @@ import Foundation
 import Photos
 import UIKit
 
+enum PhotoAccessError: Error {
+    case denied
+}
+
 final class SentenceCardViewModel: BaseViewModel {
     struct State {
         var data: BookDetailItem?
         var alertInfo: String?
+        var requestAccess: Bool = false
         var isLoading: Bool = false
     }
 
@@ -19,6 +24,7 @@ final class SentenceCardViewModel: BaseViewModel {
         case didTapSaveButton(image: UIImage)
         case saveImageResult(Result<Void, Error>)
         case alertDismissed
+        case settingsAlertDismissed
         case prepareToSaveImage
     }
 
@@ -60,11 +66,16 @@ final class SentenceCardViewModel: BaseViewModel {
             case .success:
                 newState.alertInfo = "이미지를 저장했습니다!"
             case .failure(let error):
-                // TODO : error는 로그로 찍어서 수집하기
-                newState.alertInfo = "[저장 실패] 잠시 후 다시 시도해주세요."
+                if error is PhotoAccessError {
+                    newState.requestAccess = true
+                } else {
+                    newState.alertInfo = "[저장 실패] 잠시 후 다시 시도해주세요."
+                }
             }
         case .alertDismissed:
             newState.alertInfo = nil
+        case .settingsAlertDismissed:
+            newState.requestAccess = false
         case .prepareToSaveImage:
             newState.isLoading = true
         }
@@ -108,12 +119,14 @@ final class SentenceCardViewModel: BaseViewModel {
         if status == .notDetermined {
             status = await PHPhotoLibrary.requestAuthorization(for: .addOnly)
         }
-        guard status == .authorized || status == .limited else {
-            throw NSError(
-                domain: "PhotoLibrary",
-                code: 2,
-                userInfo: [NSLocalizedDescriptionKey: "포토 라이브러리 접근 권한이 필요합니다."]
-            )
+        
+        switch status {
+        case .authorized, .limited:
+            return
+        case .denied, .restricted:
+            throw PhotoAccessError.denied
+        default:
+            throw PhotoAccessError.denied
         }
     }
 }

src/Projects/BKPresentation/Sources/MainFlow/Setting/View/SettingView.swift

@@ -52,8 +52,19 @@ final class SettingView: BaseView {
         _ isUpdateAvailable: Bool
     ) {
         self.appVersion = appVersion
-        self.recentVersion = recentVersion
         self.isUpdateAvailable = isUpdateAvailable
+        
+        if let currentVersion = Version(appVersion),
+           let lastestVersion = Version(recentVersion) {
+            if lastestVersion < currentVersion {
+                self.recentVersion = appVersion
+            } else {
+                self.recentVersion = recentVersion
+            }
+        } else {
+            self.recentVersion = recentVersion
+        }
+        
         collectionView.reloadData()
     }
 }

src/SupportingFiles/Booket/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>