Merge pull request #232 from Link-MIND/fix/#231

[Fix] #231 - 3차 스프린트 최종 QA 내용 반영
Link-MIND · Nov 10, 2024 · 9983ec9 · 9983ec9
2 parents 0ba412b + 349a0c6
commit 9983ec9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/TOASTER-iOS/Present/DetailClip/View/Component/ChangeClipBottomSheetView.swift b/TOASTER-iOS/Present/DetailClip/View/Component/ChangeClipBottomSheetView.swift
@@ -108,9 +108,10 @@ private extension ChangeClipBottomSheetView {
         completeBottomButton.loadingButtonTapped(
             loadingTitle: "이동 중...",
             loadingAnimationSize: 16,
-            task: { _ in
+            task: { completion in
                 DispatchQueue.global().asyncAfter(deadline: .now() + 0.5) {
                     self.delegate?.completButtonTap()
+                    completion()
                 }
             }
         )

diff --git a/TOASTER-iOS/Present/DetailClip/ViewModel/ChangeClipViewModel.swift b/TOASTER-iOS/Present/DetailClip/ViewModel/ChangeClipViewModel.swift
@@ -64,7 +64,7 @@ final class ChangeClipViewModel: ViewModelType {
 
         /// 완료 버튼이 눌렸을때 동작
         let changeCategoryResult = input.completeButtonTap
-            .combineLatest(input.selectedClip) { _, selectedClip in
+            .zip(input.selectedClip) { _, selectedClip in
                 return selectedClip
             }
             .flatMap { [weak self] selectedClip -> AnyPublisher<Bool, Never> in

diff --git a/TOASTER-iOS/Present/RemindAdd/ClipAdd/View/Cell/RemindSelectClipCollectionViewCell.swift b/TOASTER-iOS/Present/RemindAdd/ClipAdd/View/Cell/RemindSelectClipCollectionViewCell.swift
@@ -80,6 +80,8 @@ extension RemindSelectClipCollectionViewCell {
     func configureCell(forModel: RemindClipModel, icon: UIImage, isRounded: Bool) {
         clipTitleLabel.text = forModel.title
         clipCountLabel.text = "\(forModel.clipCount)개"
+        clipTitleLabel.textColor = isSelected == true ? .toasterPrimary : .black850
+        clipCountLabel.textColor = isSelected == true ? .toasterPrimary : .gray600
         clipImageView.image = isSelected == true ? icon.withTintColor(.toasterPrimary) : icon
         self.isRounded = isRounded
     }

diff --git a/ToasterShareExtension/ShareViewController.swift b/ToasterShareExtension/ShareViewController.swift
@@ -58,6 +58,16 @@ class ShareViewController: UIViewController {
         super.viewDidAppear(animated)
         print("viewDidAppear View height: \(self.view.frame.size.height)")
 
+        clipSelectCollectionView.selectItem(
+            at: IndexPath(row: 0, section: 0),
+            animated: false,
+            scrollPosition: .top
+        )
+        collectionView(
+            clipSelectCollectionView,
+            didSelectItemAt: IndexPath(row: 0, section: 0)
+        )
+
         if isUseShareExtension {
             // 상단 Title 높이 + 데이터 개수 * cell 높이 + 하단 버튼 + SafeArea
             let calculateBottomSheetHeight = titleHeight + (viewModel.clipData.count) * 54 + 116