diff --git a/NADA-iOS-forRelease/Resouces/Constants/Header.swift b/NADA-iOS-forRelease/Resouces/Constants/Header.swift index 32a2311b..44c05e0e 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/Header.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/Header.swift @@ -9,10 +9,9 @@ import Foundation extension Const { struct Header { -// static let bearerHeader = ["Content-Type": "application/json", -// "Authorization": "Bearer " + Const.UserDefaults.accessToken] - static let bearerHeader = ["Authorization": "Bearer " + "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJuYWRhMiIsImF1dGgiOiJST0xFX1VTRVIiLCJleHAiOjE2NDEwMDQ0ODJ9.qNYjBirHaJ03ST2vSKNDspzm7nDXuLdCkl6vxCQxC29W0yJgMvp14Wq2ATOR5mCBrIUAaP0w4c7qx7kXZ4U2Gg"] - static let basicHeader = ["Content-Type": "application/json", - "Authorization": "Bearer " + "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJuYWRhMiIsImF1dGgiOiJST0xFX1VTRVIiLCJleHAiOjE2NDEwMDQ0ODJ9.qNYjBirHaJ03ST2vSKNDspzm7nDXuLdCkl6vxCQxC29W0yJgMvp14Wq2ATOR5mCBrIUAaP0w4c7qx7kXZ4U2Gg"] + static var bearerHeader = ["Authorization": "Bearer " + UserDefaults.standard.string(forKey: Const.UserDefaultsKey.accessToken)!] + + static var basicHeader = ["Content-Type": "application/json", + "Authorization": "Bearer " + UserDefaults.standard.string(forKey: Const.UserDefaultsKey.accessToken)!] } } diff --git a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift index fc42c2ed..f8d09df4 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift @@ -8,7 +8,7 @@ import Foundation extension Const { - struct UserDefaults { + struct UserDefaultsKey { static let darkModeState = "darkModeState" static let accessToken = "accessToken" static let refreshToken = "refreshToken" diff --git a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift index b988af10..fb41e6d4 100644 --- a/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift +++ b/NADA-iOS-forRelease/Sources/NetworkService/Card/CardService.swift @@ -112,8 +112,7 @@ extension CardService: TargetType { var headers: [String: String]? { switch self { case .cardDetailFetch, .cardListFetch, .cardDelete, .cardListEdit: - return ["Content-Type": "application/json", - "Authorization": "Bearer " + UserDefaults.standard.string(forKey: Const.UserDefaults.accessToken)!] + return Const.Header.basicHeader case .cardCreation: return Const.Header.basicHeader } diff --git a/NADA-iOS-forRelease/Sources/SceneDelegate.swift b/NADA-iOS-forRelease/Sources/SceneDelegate.swift index c957f0a4..f78aa647 100644 --- a/NADA-iOS-forRelease/Sources/SceneDelegate.swift +++ b/NADA-iOS-forRelease/Sources/SceneDelegate.swift @@ -26,7 +26,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { IQKeyboardManager.shared.enableAutoToolbar = false IQKeyboardManager.shared.shouldResignOnTouchOutside = true - let isDark = defaults.bool(forKey: Const.UserDefaults.darkModeState) + let isDark = defaults.bool(forKey: Const.UserDefaultsKey.darkModeState) // 시스템 무시하고 UserDefault 상태에 따라 화면 전체에 다크/라이트 모드를 결정 if let window = UIApplication.shared.windows.first { @@ -39,8 +39,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { // 스플래시 지연시간동안 자동 로그인 작업처리 DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1) { - let acToken = self.defaults.string(forKey: Const.UserDefaults.accessToken) - let rfToken = self.defaults.string(forKey: Const.UserDefaults.refreshToken) + let acToken = self.defaults.string(forKey: Const.UserDefaultsKey.accessToken) + let rfToken = self.defaults.string(forKey: Const.UserDefaultsKey.refreshToken) self.postUserTokenReissue(request: UserTokenReissueRequset(accessToken: acToken ?? "", refreshToken: rfToken ?? "")) } @@ -65,7 +65,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { var rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil) .instantiateViewController(identifier: Const.ViewController.Identifier.loginViewController) - if self.defaults.string(forKey: Const.UserDefaults.accessToken) != "" { + if self.defaults.string(forKey: Const.UserDefaultsKey.accessToken) != "" { rootViewController = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController) } else { rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil) @@ -90,7 +90,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { // MARK: - Methods private func presentToLoginViewController() { - if UserDefaults.standard.object(forKey: Const.UserDefaults.isOnboarding) != nil { + if UserDefaults.standard.object(forKey: Const.UserDefaultsKey.isOnboarding) != nil { let rootViewController = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(identifier: Const.ViewController.Identifier.loginViewController) self.window?.rootViewController = rootViewController self.window?.makeKeyAndVisible() diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift index a65b483e..09900040 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift @@ -99,7 +99,7 @@ extension AddGroupBottomSheetViewController { func textFieldShouldReturn(_ textField: UITextField) -> Bool { textField.resignFirstResponder() hideBottomSheetAndGoBack() - groupAddWithAPI(groupRequest: GroupAddRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupName: addGroupTextField.text ?? "")) + groupAddWithAPI(groupRequest: GroupAddRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", groupName: addGroupTextField.text ?? "")) returnToGroupEditViewController?() return true diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift index 9494a886..07e9fa75 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddWithIdBottomSheetViewController.swift @@ -107,7 +107,7 @@ extension AddWithIdBottomSheetViewController { switch response { case .success(let data): if let card = data as? CardClass { - if UserDefaults.standard.string(forKey: Const.UserDefaults.userID) == card.card.author { + if UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) == card.card.author { self.errorImageView.isHidden = false self.explainLabel.isHidden = false self.explainLabel.text = "자신의 명함은 추가할 수 없습니다." diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift index a19d4a24..c96f8d21 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CardResultBottomSheetViewController.swift @@ -98,7 +98,7 @@ class CardResultBottomSheetViewController: CommonBottomSheetViewController { } @objc func presentGroupSelectBottomSheet() { - groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") + groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "") } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift index feef2621..792a400a 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/SelectGroupBottomSheetViewController.swift @@ -73,12 +73,12 @@ class SelectGroupBottomSheetViewController: CommonBottomSheetViewController { switch status { case .detail: changeGroupWithAPI(request: ChangeGroupRequest(cardID: cardDataModel?.cardID ?? "", - userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", + userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", groupID: groupId ?? 0, newGroupID: selectedGroup)) case .add, .addWithQR: cardAddInGroupWithAPI(cardRequest: CardAddInGroupRequest(cardId: cardDataModel?.cardID ?? "", - userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", + userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", groupId: selectedGroup)) case .group: return diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift index 6d002a73..04a6462c 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardCreation/CardCreationPreviewViewController.swift @@ -37,7 +37,7 @@ class CardCreationPreviewViewController: UIViewController { @IBAction func touchCompleteButton(_ sender: Any) { guard let frontCardDataModel = frontCardDataModel, let backCardDataModel = backCardDataModel else { return } - guard let userID = UserDefaults.standard.string(forKey: Const.UserDefaults.userID) else { return } + guard let userID = UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) else { return } cardCreationRequest = CardCreationRequest(userID: userID, frontCard: frontCardDataModel, backCard: backCardDataModel) guard let cardCreationRequest = cardCreationRequest, @@ -197,7 +197,7 @@ extension CardCreationPreviewViewController { guard let presentingVC = self.presentingViewController else { return } self.dismiss(animated: true) { - if UserDefaults.standard.object(forKey: Const.UserDefaults.isFirstCard) == nil { + if UserDefaults.standard.object(forKey: Const.UserDefaultsKey.isFirstCard) == nil { let nextVC = FirstCardAlertBottomSheetViewController() .setTitle(""" 🎉 @@ -206,7 +206,7 @@ extension CardCreationPreviewViewController { .setHeight(587) nextVC.modalPresentationStyle = .overFullScreen presentingVC.present(nextVC, animated: true) { - UserDefaults.standard.set(false, forKey: Const.UserDefaults.isFirstCard) + UserDefaults.standard.set(false, forKey: Const.UserDefaultsKey.isFirstCard) } } } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift index 15d5168f..56891226 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardDetail/CardDetailViewController.swift @@ -26,7 +26,7 @@ class CardDetailViewController: UIViewController { } @IBAction func presentHarmonyViewController(_ sender: Any) { - cardHarmonyFetchWithAPI(myCard: UserDefaults.standard.string(forKey: Const.UserDefaults.firstCardID) ?? "", + cardHarmonyFetchWithAPI(myCard: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.firstCardID) ?? "", yourCard: cardDataModel?.cardID ?? "") } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift index bba197eb..ce3556a1 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/CardList/CardListViewController.swift @@ -30,7 +30,7 @@ class CardListViewController: UIViewController { cardListTableView.delegate = self cardListTableView.dataSource = self - cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", isList: true) + cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", isList: true) } override func viewWillAppear(_ animated: Bool) { @@ -191,7 +191,7 @@ extension CardListViewController { switch response { case .success(let data): print(data) - self.cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", isList: true) + self.cardListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", isList: true) self.cardListTableView.reloadData() case .requestErr(let message): print("deleteGroupWithAPI - requestErr", message) diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift index 5f13746f..4cc0b675 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/GroupViewController.swift @@ -85,7 +85,7 @@ class GroupViewController: UIViewController { // 그룹 리스트 조회 서버 테스트 super.viewWillAppear(true) NotificationCenter.default.addObserver(self, selector: #selector(didRecieveDataNotification(_:)), name: Notification.Name.passDataToGroup, object: nil) - groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") + groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "") } @@ -124,7 +124,7 @@ extension GroupViewController { self.groupCollectionView.reloadData() self.groupId = group.groups[self.selectedRow].groupID if !group.groups.isEmpty { - self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", groupId: group.groups[self.selectedRow].groupID, offset: 0)) + self.cardListInGroupWithAPI(cardListInGroupRequest: CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", groupId: group.groups[self.selectedRow].groupID, offset: 0)) } } case .requestErr(let message): @@ -254,7 +254,7 @@ extension GroupViewController: UICollectionViewDataSource { selectedRow = indexPath.row groupId = serverGroups?.groups[indexPath.row].groupID cardListInGroupWithAPI(cardListInGroupRequest: - CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "", + CardListInGroupRequest(userId: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "", groupId: serverGroups?.groups[indexPath.row].groupID ?? 0, offset: 0)) case cardsCollectionView: diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift index 5207f3da..83aa9c01 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Group/QRScanViewController.swift @@ -141,7 +141,7 @@ extension QRScanViewController { switch response { case .success(let data): if let card = data as? CardClass { - if UserDefaults.standard.string(forKey: Const.UserDefaults.userID) == card.card.author { + if UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) == card.card.author { self.showToast(message: "자신의 명함은 추가할 수 없습니다.", font: UIFont.button02, view: "wrongCard") } else { let nextVC = CardResultBottomSheetViewController() diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift index 601c7dca..10472209 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/GroupEdit/GroupEditViewController.swift @@ -46,7 +46,7 @@ class GroupEditViewController: UIViewController { .setTitle("그룹 추가") .setHeight(184) nextVC.returnToGroupEditViewController = { - self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") + self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "") } nextVC.modalPresentationStyle = .overFullScreen self.present(nextVC, animated: false, completion: nil) @@ -85,7 +85,7 @@ extension GroupEditViewController: UITableViewDelegate { nextVC.modalPresentationStyle = .overFullScreen nextVC.text = serverGroups?.groups[indexPath.row].groupName ?? "" nextVC.returnToGroupEditViewController = { - self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") + self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "") } nextVC.nowGroup = serverGroups?.groups[indexPath.row] self.present(nextVC, animated: false, completion: nil) @@ -143,7 +143,7 @@ extension GroupEditViewController { switch response { case .success: print("groupDeleteWithAPI - success") - self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaults.userID) ?? "") + self.groupListFetchWithAPI(userID: UserDefaults.standard.string(forKey: Const.UserDefaultsKey.userID) ?? "") self.groupEditTableView.reloadData() case .requestErr(let message): print("groupDeleteWithAPI - requestErr: \(message)") diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift index 1e4ec871..b297f06d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Login/LoginViewController.swift @@ -53,7 +53,7 @@ class LoginViewController: UIViewController { authorizationButton.heightAnchor.constraint(equalToConstant: 48) ]) - let isDark = UserDefaults.standard.bool(forKey: Const.UserDefaults.darkModeState) + let isDark = UserDefaults.standard.bool(forKey: Const.UserDefaultsKey.darkModeState) if let window = UIApplication.shared.windows.first { if #available(iOS 13.0, *) { @@ -69,7 +69,7 @@ class LoginViewController: UIViewController { let nextVC = UIStoryboard(name: Const.Storyboard.Name.tabBar, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.tabBarViewController) nextVC.modalPresentationStyle = .overFullScreen self.present(nextVC, animated: true) { - UserDefaults.standard.set(false, forKey: Const.UserDefaults.isOnboarding) + UserDefaults.standard.set(false, forKey: Const.UserDefaultsKey.isOnboarding) } } @@ -210,10 +210,10 @@ extension LoginViewController { case .success(let loginData): print("postUserSignUpWithAPI - success") if let userData = loginData as? UserWithTokenRequest { - UserDefaults.standard.set(userData.user.userID, forKey: Const.UserDefaults.userID) + 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.UserDefaults.accessToken) - UserDefaults.standard.set(tokenData.refreshToken, forKey: Const.UserDefaults.refreshToken) + UserDefaults.standard.set(tokenData.accessToken, forKey: Const.UserDefaultsKey.accessToken) + UserDefaults.standard.set(tokenData.refreshToken, forKey: Const.UserDefaultsKey.refreshToken) } } case .requestErr(let message): diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift index fb935b73..69fb56fb 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/Main/FrontViewController.swift @@ -120,7 +120,7 @@ extension FrontViewController: VerticalCardSwiperDatasource { if cardDataList?.count != 0 { guard let cell = verticalCardSwiperView.dequeueReusableCell(withReuseIdentifier: Const.Xib.mainCardCell, for: index) as? MainCardCell else { return CardCell() } guard let cardDataList = cardDataList else { return CardCell() } - UserDefaults.standard.set(cardDataList[0].cardID, forKey: Const.UserDefaults.firstCardID) + UserDefaults.standard.set(cardDataList[0].cardID, forKey: Const.UserDefaultsKey.firstCardID) cell.initCell(cardDataModel: cardDataList[index]) cell.isShareable = true cell.setFrontCard() diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift index daede587..0288f61d 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/More/MoreViewController.swift @@ -46,7 +46,7 @@ extension MoreViewController { } private func setModeSwitch() { - modeSwitch.isOn = defaults.bool(forKey: Const.UserDefaults.darkModeState) + modeSwitch.isOn = defaults.bool(forKey: Const.UserDefaultsKey.darkModeState) changeInterfaceStyle() } @@ -54,7 +54,7 @@ extension MoreViewController { if let window = UIApplication.shared.windows.first { if #available(iOS 13.0, *) { window.overrideUserInterfaceStyle = modeSwitch.isOn == true ? .dark : .light - defaults.set(modeSwitch.isOn, forKey: Const.UserDefaults.darkModeState) + defaults.set(modeSwitch.isOn, forKey: Const.UserDefaultsKey.darkModeState) } else { window.overrideUserInterfaceStyle = .light } @@ -110,10 +110,10 @@ extension MoreViewController { func setLogoutClicked() { makeOKCancelAlert(title: "", message: "로그아웃 하시겠습니까?", okAction: { _ in self.makeOKAlert(title: "", message: "로그아웃이 완료 되었습니다.") { _ in - if let acToken = UserDefaults.standard.string(forKey: Const.UserDefaults.accessToken) { + if let acToken = UserDefaults.standard.string(forKey: Const.UserDefaultsKey.accessToken) { self.logoutUserWithAPI(token: acToken) - self.defaults.removeObject(forKey: Const.UserDefaults.accessToken) - self.defaults.removeObject(forKey: Const.UserDefaults.darkModeState) + self.defaults.removeObject(forKey: Const.UserDefaultsKey.accessToken) + self.defaults.removeObject(forKey: Const.UserDefaultsKey.darkModeState) let nextVC = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.loginViewController) nextVC.modalPresentationStyle = .overFullScreen self.navigationController?.changeRootViewController(nextVC) @@ -129,7 +129,7 @@ extension MoreViewController { print(error) } else { self.makeOKAlert(title: "", message: "받은 명함이 초기화 되었습니다.") - if let acToken = UserDefaults.standard.string(forKey: Const.UserDefaults.accessToken) { + if let acToken = UserDefaults.standard.string(forKey: Const.UserDefaultsKey.accessToken) { self.groupResetWithAPI(token: acToken) } } @@ -144,10 +144,10 @@ extension MoreViewController { print(error) } else { self.makeOKAlert(title: "", message: "모든 명함이 삭제되었습니다.") { _ in - if let acToken = UserDefaults.standard.string(forKey: Const.UserDefaults.accessToken) { + if let acToken = UserDefaults.standard.string(forKey: Const.UserDefaultsKey.accessToken) { self.deleteUserWithAPI(token: acToken) - self.defaults.removeObject(forKey: Const.UserDefaults.accessToken) - self.defaults.removeObject(forKey: Const.UserDefaults.darkModeState) + self.defaults.removeObject(forKey: Const.UserDefaultsKey.accessToken) + self.defaults.removeObject(forKey: Const.UserDefaultsKey.darkModeState) let nextVC = UIStoryboard(name: Const.Storyboard.Name.login, bundle: nil).instantiateViewController(withIdentifier: Const.ViewController.Identifier.loginViewController) nextVC.modalPresentationStyle = .overFullScreen self.navigationController?.changeRootViewController(nextVC)