From fac43c784a2585cff5bf0da7378758f002382be8 Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Tue, 28 Dec 2021 10:21:44 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[FIX]=20#247=20-=20=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=EB=B7=B0=20=EB=AA=85=ED=95=A8=EB=A6=AC=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EB=B0=8F=20=EB=AA=85=ED=95=A8=EC=83=9D=EC=84=B1=20url=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=EC=8B=9C=ED=82=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resouces/Constants/Notification.swift | 1 + .../NetworkService/Card/CardService.swift | 2 +- .../CardCreationPreviewViewController.swift | 2 ++ .../CardList/CardListViewController.swift | 1 + .../Main/FrontViewController.swift | 16 +++++++++------- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/NADA-iOS-forRelease/Resouces/Constants/Notification.swift b/NADA-iOS-forRelease/Resouces/Constants/Notification.swift index 2ef63808..b0f275f6 100644 --- 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 index fb41e6d4..131e0896 100644 --- 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/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift index 04a6462c..7328deb2 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift +++ b/NADA-iOS-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 index ce3556a1..1693c020 100644 --- 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 index 649f8976..1e0aa61f 100644 --- 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 From eba55ef922f44f9a89cc6129e1caf2d016067535 Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Tue, 28 Dec 2021 10:58:38 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[FIX]=20#249=20-=20=EC=9E=AC=EC=84=A4?= =?UTF-8?q?=EC=B9=98=20=EC=8B=9C=20=EB=A9=94=EC=9D=B8=20=EB=AA=85=ED=95=A8?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B9=84=EC=9B=8C=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EC=8A=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewControllers/Login/LoginViewController.swift | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift index b297f06d..fdf0c1bf 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift @@ -127,8 +127,6 @@ extension LoginViewController { } } } - - self.presentToMain() } } @@ -150,8 +148,6 @@ extension LoginViewController { } } } - - self.presentToMain() } } } @@ -211,10 +207,11 @@ extension LoginViewController { print("postUserSignUpWithAPI - success") if let userData = loginData as? UserWithTokenRequest { UserDefaults.standard.set(userData.user.userID, forKey: Const.UserDefaultsKey.userID) - if let tokenData = userData.user.token as? Token { - UserDefaults.standard.set(tokenData.accessToken, forKey: Const.UserDefaultsKey.accessToken) - UserDefaults.standard.set(tokenData.refreshToken, forKey: Const.UserDefaultsKey.refreshToken) - } + let tokenData = userData.user.token + UserDefaults.standard.set(tokenData.accessToken, forKey: Const.UserDefaultsKey.accessToken) + UserDefaults.standard.set(tokenData.refreshToken, forKey: Const.UserDefaultsKey.refreshToken) + + self.presentToMain() } case .requestErr(let message): print("postUserSignUpWithAPI - requestErr: \(message)") From ff4b1ba4afd3e51ef5c268d3c7a6e886e4b28f6f Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Tue, 28 Dec 2021 11:01:37 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[FIX]=20#249=20-=20=EC=9E=AC=EC=84=A4?= =?UTF-8?q?=EC=B9=98=20=EC=8B=9C=20=EB=A9=94=EC=9D=B8=20=EB=AA=85=ED=95=A8?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B9=84=EC=9B=8C=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EC=8A=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/Login/LoginViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift index fdf0c1bf..f1cd994c 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift @@ -185,7 +185,6 @@ extension LoginViewController: ASAuthorizationControllerDelegate, ASAuthorizatio // print("User Email : \(email ?? "")") // print("User Name : \((fullName?.givenName ?? "") + (fullName?.familyName ?? ""))") postUserSignUpWithAPI(request: userIdentifier) - presentToMain() default: break @@ -213,6 +212,7 @@ extension LoginViewController { self.presentToMain() } + } case .requestErr(let message): print("postUserSignUpWithAPI - requestErr: \(message)") case .pathErr: From 173971c7c69b44a3b6de51b7281225c8419a669e Mon Sep 17 00:00:00 2001 From: hyungyu Kim Date: Tue, 28 Dec 2021 11:09:40 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[FIX]=20#249=20-=20=EC=9E=AC=EC=84=A4?= =?UTF-8?q?=EC=B9=98=20=EC=8B=9C=20=EB=A9=94=EC=9D=B8=20=EB=AA=85=ED=95=A8?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B9=84=EC=9B=8C=EC=A7=80?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EC=8A=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/ViewControllers/Login/LoginViewController.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift index f1cd994c..61c6f74e 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift @@ -209,10 +209,9 @@ extension LoginViewController { let tokenData = userData.user.token UserDefaults.standard.set(tokenData.accessToken, forKey: Const.UserDefaultsKey.accessToken) UserDefaults.standard.set(tokenData.refreshToken, forKey: Const.UserDefaultsKey.refreshToken) - + self.presentToMain() } - } case .requestErr(let message): print("postUserSignUpWithAPI - requestErr: \(message)") case .pathErr: