Merge pull request #339 from BCSDLab/fix/postlostitem

refactor: 분실물 작성 화면 UI 개선

Author: hgjwilly-koreatech

Koin/Core/Extensions/UIApplication.swift Koin/Core/Extensions/UIApplication+.swiftKoin/Core/Extensions/UIApplication.swift renamed to Koin/Core/Extensions/UIApplication+.swift

@@ -43,4 +43,11 @@ extension UIApplication {
         height = statusBarManager?.statusBarFrame.height ?? 0        
         return height
     }
+    
+    static func bottomSafeAreaHeight() -> CGFloat {
+        let height: CGFloat
+        let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
+        height = windowScene?.windows.first?.safeAreaInsets.bottom ?? 0
+        return height
+    }
 }

Koin/Core/Extensions/UIViewController+Navigate.swift

@@ -13,4 +13,12 @@ extension UIViewController {
         loginViewController.title = "로그인"
         navigationController?.pushViewController(loginViewController, animated: true)
     }
+    
+    func replaceTopViewController(_ viewController: UIViewController, animated: Bool) {
+        if var viewControllers = navigationController?.viewControllers {
+            let _ = viewControllers.removeLast()
+            viewControllers.append(viewController)
+            navigationController?.setViewControllers(viewControllers, animated: animated)
+        }
+    }
 }

Koin/Data/Repository/DefaultNoticeListRepository.swift

@@ -28,7 +28,7 @@ final class DefaultNoticeListRepository: NoticeListRepository {
         service.deleteLostItem(id: id)
     }
 
-    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostArticleDetailDto, ErrorResponse> {
+    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostItemDataDto, ErrorResponse> {
         service.postLostItem(request: request)
     }
 

Koin/Data/Service/NoticeListService.swift

@@ -21,7 +21,7 @@ protocol NoticeListService {
     func downloadNoticeAttachment(downloadUrl: String, fileName: String) -> AnyPublisher<URL?, ErrorResponse>
     func manageRecentSearchedWord(name: String, date: Date, actionType: Int)
     func fetchRecentSearchedWord() -> [RecentSearchedWordInfo]
-    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostArticleDetailDto, ErrorResponse>
+    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostItemDataDto, ErrorResponse>
     func fetchLostItemList(requestModel: FetchNoticeArticlesRequest) -> AnyPublisher<NoticeListDto, Error>
     func fetchLostItem(id: Int, retry: Bool) -> AnyPublisher<LostArticleDetailDto, ErrorResponse>
     func deleteLostItem(id: Int) -> AnyPublisher<Void, ErrorResponse>
@@ -67,9 +67,9 @@ final class DefaultNoticeService: NoticeListService {
             .eraseToAnyPublisher()
     }
 
-    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostArticleDetailDto, ErrorResponse> {
+    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostItemDataDto, ErrorResponse> {
         return networkService.requestWithResponse(api: NoticeListAPI.postLostItem(request))
-            .catch { [weak self] error -> AnyPublisher<LostArticleDetailDto, ErrorResponse> in
+            .catch { [weak self] error -> AnyPublisher<LostItemDataDto, ErrorResponse> in
                 guard let self = self else { return Fail(error: error).eraseToAnyPublisher() }
                 if error.code == "401" {
                     return self.networkService.refreshToken()

Koin/Domain/Model/LostItem/LostItemListData.swift

@@ -19,3 +19,19 @@ struct LostItemListData {
     var isReported: Bool
     var isFound: Bool
 }
+
+extension LostItemListData {
+    
+    init(from data: LostItemData) {
+        self.id = data.id
+        self.type = data.type
+        self.category = data.category
+        self.foundPlace = data.foundPlace
+        self.foundDate = data.foundDate
+        self.content = data.content
+        self.author = data.author
+        self.registeredAt = data.registeredAt
+        self.isReported = false
+        self.isFound = data.isFound
+    }
+}

Koin/Domain/Repository/NoticeListRepository.swift

@@ -21,7 +21,7 @@ protocol NoticeListRepository {
     func downloadNoticeAttachment(downloadUrl: String, fileName: String) -> AnyPublisher<URL?, ErrorResponse>
     func manageRecentSearchedWord(name: String, date: Date, actionType: Int)
     func fetchRecentSearchedWord() -> [RecentSearchedWordInfo]
-    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostArticleDetailDto, ErrorResponse>
+    func postLostItem(request: [PostLostItemRequest]) -> AnyPublisher<LostItemDataDto, ErrorResponse>
     func fetchLostItem(id: Int) -> AnyPublisher<LostArticleDetailDto, ErrorResponse>
     func deleteLostItem(id: Int) -> AnyPublisher<Void, ErrorResponse>
     func reportLostItemArticle(id: Int, request: ReportLostItemRequest) -> AnyPublisher<Void, ErrorResponse>

Koin/Domain/UseCase/NoticeList/PostLostItemUseCase.swift

@@ -8,7 +8,7 @@
 import Combine
 
 protocol PostLostItemUseCase {
-    func execute(request: [PostLostItemRequest]) -> AnyPublisher<LostArticleDetailDto, ErrorResponse>
+    func execute(request: [PostLostItemRequest]) -> AnyPublisher<LostItemDataDto, ErrorResponse>
 }
 
 final class DefaultPostLostItemUseCase: PostLostItemUseCase {
@@ -19,7 +19,7 @@ final class DefaultPostLostItemUseCase: PostLostItemUseCase {
         self.noticeListRepository = noticeListRepository
     }
 
-    func execute(request: [PostLostItemRequest]) -> AnyPublisher<LostArticleDetailDto, ErrorResponse> {
+    func execute(request: [PostLostItemRequest]) -> AnyPublisher<LostItemDataDto, ErrorResponse> {
         noticeListRepository.postLostItem(request: request)
     }
 }

Koin/Presentation/LostItem/EditLostItem/SubViews/EditLostItemImagesView.swift

@@ -39,6 +39,7 @@ final class EditLostItemImagesView: UIView {
         layout.scrollDirection = .horizontal
         let collectionView = LostItemImageCollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.backgroundColor = UIColor.appColor(.neutral100)
+        collectionView.layer.cornerRadius = 8
         return collectionView
     }()
     private let addPictureButton = UIButton().then {
@@ -78,7 +79,7 @@ final class EditLostItemImagesView: UIView {
             self?.pictureCountLabel.text = "\(urls.count)/10"
         }.store(in: &subscriptions)
 
-        imageUploadCollectionView.shouldDismissDropDownPublisher.sink { [weak self] in
+        imageUploadCollectionView.shouldDismissDropDownKeyBoardPublisher.sink { [weak self] in
             self?.dismissDropDownPublisher.send()
             self?.endEditing(true)
         }.store(in: &subscriptions)

Koin/Presentation/LostItem/LostItemData/Subviews/LostItemDataContentView.swift

@@ -77,8 +77,7 @@ final class LostItemDataContentView: UIView {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
-    
+        
     func configure(images: [Image], content: String?, isCouncil: Bool) {
         imageCollectionView.configure(images: images)
         imageCollectionView.isHidden = images.isEmpty

Koin/Presentation/LostItem/LostItemList/LostItemListViewController.swift

@@ -182,25 +182,40 @@ extension LostItemListViewController {
 
     private func presentPostTypeModal() {
         let onFoundButtonTapped = { [weak self] in
-            self?.dismissView()
+            guard let self else { return }
+            dismissView()
             let viewController = PostLostItemViewController(viewModel: PostLostItemViewModel(type: .found))
-            self?.navigationController?.pushViewController(viewController, animated: true)
+            viewController.delegate = self
+            navigationController?.pushViewController(viewController, animated: true)
         }
         let onLostButtonTapped = { [weak self] in
-            self?.dismissView()
+            guard let self else { return }
+            dismissView()
             let viewController = PostLostItemViewController(viewModel: PostLostItemViewModel(type: .lost))
-            self?.navigationController?.pushViewController(viewController, animated: true)
+            viewController.delegate = self
+            navigationController?.pushViewController(viewController, animated: true)
         }
         let postOptionViewController = LostItemPostOptionController(
             onFoundButtonTapped: onFoundButtonTapped,
             onLostButtonTapped: onLostButtonTapped
         )
-        let bottomSheetViewController = BottomSheetViewController(contentViewController: postOptionViewController, defaultHeight: 225, cornerRadius: 32)
+        let bottomSheetViewController = BottomSheetViewController(
+            contentViewController: postOptionViewController,
+            defaultHeight: 191 + UIApplication.bottomSafeAreaHeight(),
+            cornerRadius: 32
+        )
         bottomSheetViewController.modalTransitionStyle = .crossDissolve
         navigationController?.present(bottomSheetViewController, animated: true)
     }
 }
 
+extension LostItemListViewController: PostLostItemViewControllerDelegate {
+    
+    func appendData(_ newData: LostItemData) {
+        lostItemListTableView.appendAtFirst(LostItemListData(from: newData))
+    }
+}
+
 extension LostItemListViewController: LostItemDataViewControllerDelegate {
 
     func updateState(foundDataId id: Int) {
@@ -239,7 +254,10 @@ extension LostItemListViewController {
                 self?.inputSubject.send(.updateFilter(filter: filter))
             }
         )
-        let bottomSheetViewController = BottomSheetViewController(contentViewController: filterViewController, defaultHeight: UIApplication.hasHomeButton() ? 661 - 35 : 661, cornerRadius: 32)
+        let bottomSheetViewController = BottomSheetViewController(
+            contentViewController: filterViewController,
+            defaultHeight: 627 + UIApplication.bottomSafeAreaHeight(),
+            cornerRadius: 32)
         bottomSheetViewController.modalTransitionStyle = .crossDissolve
         navigationController?.present(bottomSheetViewController, animated: true)
     }