Merge branch 'release1.0/3' into release/TeamNADA#246

mini-min · Dec 28, 2021 · 01aa228 · 01aa228
2 parents 60911e4 + ce41b46
commit 01aa228
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/NADA-iOS-forRelease/Resouces/Constants/Notification.swift b/NADA-iOS-forRelease/Resouces/Constants/Notification.swift
@@ -18,4 +18,5 @@ extension Notification.Name {
     static let presentCardShare = Notification.Name("presentCardShare")
     static let passDataToGroup = Notification.Name("passDataToGroup")
     static let passDataToDetail = Notification.Name("passDataToDetail")
+    static let reloadMainCardSwiper = Notification.Name("reloadMainCardSwiper")
 }
diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift
@@ -77,7 +77,7 @@ extension CardService: TargetType {
             let instagramIDData = request.frontCard.instagramID.data(using: .utf8) ?? Data()
             multiPartData.append(MultipartFormData(provider: .data(instagramIDData), name: "card.instagram"))
             let linkURLData = request.frontCard.linkURL.data(using: .utf8) ?? Data()
-            multiPartData.append(MultipartFormData(provider: .data(linkURLData), name: "card.linkName"))
+            multiPartData.append(MultipartFormData(provider: .data(linkURLData), name: "card.link"))
             let descriptionData = request.frontCard.description.data(using: .utf8) ?? Data()
             multiPartData.append(MultipartFormData(provider: .data(descriptionData), name: "card.description"))
             let isMinchoData = Bool(request.backCard.isMincho).description.data(using: .utf8) ?? Data()

diff --git a/...S-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/...S-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift
@@ -196,6 +196,8 @@ extension CardCreationPreviewViewController {
 
                 guard let presentingVC = self.presentingViewController else { return }
 
+                NotificationCenter.default.post(name: .reloadMainCardSwiper, object: nil)
+
                 self.dismiss(animated: true) {
                     if UserDefaults.standard.object(forKey: Const.UserDefaultsKey.isFirstCard) == nil {
                         let nextVC = FirstCardAlertBottomSheetViewController()

diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift
@@ -41,6 +41,7 @@ class CardListViewController: UIViewController {
 
     // MARK: - IBAction Properties
     @IBAction func dismissToPreviousView(_ sender: UIButton) {
+        NotificationCenter.default.post(name: .reloadMainCardSwiper, object: nil)
         self.navigationController?.popViewController(animated: true)
     }
 

diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift
@@ -28,13 +28,6 @@ class FrontViewController: UIViewController {
         setUserID()
         setDelegate()
         setNotification()
-    }
-
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-
-        cardDataList?.removeAll()
-        offset = 0
         cardListFetchWithAPI(userID: userID, isList: false, offset: offset)
     }
 
@@ -72,6 +65,7 @@ extension FrontViewController {
 
     private func setNotification() {
         NotificationCenter.default.addObserver(self, selector: #selector(didRecievePresentCardShare(_:)), name: .presentCardShare, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(setReloadMainCardSwiper), name: .reloadMainCardSwiper, object: nil)
     }
 
     private func setUserID() {
@@ -93,6 +87,14 @@ extension FrontViewController {
         nextVC.modalPresentationStyle = .overFullScreen
         self.present(nextVC, animated: false, completion: nil)
     }
+
+    @objc
+    private func setReloadMainCardSwiper() {
+        cardDataList?.removeAll()
+        offset = 0
+        _ = cardSwiper.scrollToCard(at: 0, animated: false)
+        cardListFetchWithAPI(userID: userID, isList: false, offset: offset)
+    }
 }
 
 // MARK: - VerticalCardSwiperDelegate