diff --git a/fit-a-pet-client/fit-a-pet-client.xcworkspace/xcuserdata/maclove.xcuserdatad/UserInterfaceState.xcuserstate b/fit-a-pet-client/fit-a-pet-client.xcworkspace/xcuserdata/maclove.xcuserdatad/UserInterfaceState.xcuserstate index dd33e191..d34d24b8 100644 Binary files a/fit-a-pet-client/fit-a-pet-client.xcworkspace/xcuserdata/maclove.xcuserdatad/UserInterfaceState.xcuserstate and b/fit-a-pet-client/fit-a-pet-client.xcworkspace/xcuserdata/maclove.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/fit-a-pet-client/fit-a-pet-client/AppDelegate.swift b/fit-a-pet-client/fit-a-pet-client/AppDelegate.swift index 99814d4d..7ed064dd 100644 --- a/fit-a-pet-client/fit-a-pet-client/AppDelegate.swift +++ b/fit-a-pet-client/fit-a-pet-client/AppDelegate.swift @@ -114,33 +114,33 @@ extension AppDelegate: MessagingDelegate { // TODO: - 디바이스 토큰을 보내는 서버통신 구현 print("APNs fcm Token: \(String(describing: fcmToken!))") // sendDeviceTokenWithAPI(fcmToken: fcmToken ?? "") - - AuthorizationAlamofire.shared.registDeviceToken(String(describing: fcmToken!), device.systemVersion, modelName) {result in - switch result { - case .success(let data): - if let responseData = data, - let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] { - print("response jsonData: \(jsonObject)") - - AuthorizationAlamofire.shared.pushNotificationAPI{result in - switch result { - case .success(let data): - if let responseData = data, - let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] { - print("response jsonData: \(jsonObject)") - } - - case .failure(let error): - print("Error: \(error)") - } - } - } - - case .failure(let error): - print("Error: \(error)") - } - } - +// +// AuthorizationAlamofire.shared.registDeviceToken(String(describing: fcmToken!), device.systemVersion, modelName) {result in +// switch result { +// case .success(let data): +// if let responseData = data, +// let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] { +// print("response jsonData: \(jsonObject)") +// +// AuthorizationAlamofire.shared.pushNotificationAPI{result in +// switch result { +// case .success(let data): +// if let responseData = data, +// let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] { +// print("response jsonData: \(jsonObject)") +// } +// +// case .failure(let error): +// print("Error: \(error)") +// } +// } +// } +// +// case .failure(let error): +// print("Error: \(error)") +// } +// } +// } diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/close_icon.imageset/Close.png b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/close_icon.imageset/Close.png deleted file mode 100644 index c95d121c..00000000 Binary files a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/close_icon.imageset/Close.png and /dev/null differ diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_add.imageset/calendar_add.png b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_add.imageset/calendar_add.png deleted file mode 100644 index 67013cb9..00000000 Binary files a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_add.imageset/calendar_add.png and /dev/null differ diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_left.imageset/calendar_left.png b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_left.imageset/calendar_left.png deleted file mode 100644 index 290b34c7..00000000 Binary files a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_left.imageset/calendar_left.png and /dev/null differ diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_right.imageset/calendar_right.png b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_right.imageset/calendar_right.png deleted file mode 100644 index 681ea8ad..00000000 Binary files a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_right.imageset/calendar_right.png and /dev/null differ diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/close_icon.imageset/Contents.json b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_add.imageset/Contents.json similarity index 88% rename from fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/close_icon.imageset/Contents.json rename to fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_add.imageset/Contents.json index 03e5d205..dabb5390 100644 --- a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/close_icon.imageset/Contents.json +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_add.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Close.png", + "filename" : "icon_add.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_add.imageset/icon_add.svg b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_add.imageset/icon_add.svg new file mode 100644 index 00000000..2aca557a --- /dev/null +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_add.imageset/icon_add.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_left.imageset/Contents.json b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_left.imageset/Contents.json similarity index 86% rename from fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_left.imageset/Contents.json rename to fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_left.imageset/Contents.json index 2edc9010..25d7b01f 100644 --- a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_left.imageset/Contents.json +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_left.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "calendar_left.png", + "filename" : "icon_arrow_left.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_left.imageset/icon_arrow_left.svg b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_left.imageset/icon_arrow_left.svg new file mode 100644 index 00000000..e9a829a4 --- /dev/null +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_left.imageset/icon_arrow_left.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_right.imageset/Contents.json b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_right.imageset/Contents.json similarity index 86% rename from fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_right.imageset/Contents.json rename to fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_right.imageset/Contents.json index 8f088643..3b4b0c7d 100644 --- a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_right.imageset/Contents.json +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_right.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "calendar_right.png", + "filename" : "icon_arrow_right.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_right.imageset/icon_arrow_right.svg b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_right.imageset/icon_arrow_right.svg new file mode 100644 index 00000000..840f48cf --- /dev/null +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_arrow_right.imageset/icon_arrow_right.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_add.imageset/Contents.json b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_close.imageset/Contents.json similarity index 87% rename from fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_add.imageset/Contents.json rename to fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_close.imageset/Contents.json index 183ebe21..a3bcdd83 100644 --- a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_add.imageset/Contents.json +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_close.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "calendar_add.png", + "filename" : "icon_close.svg", "idiom" : "universal", "scale" : "1x" }, diff --git a/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_close.imageset/icon_close.svg b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_close.imageset/icon_close.svg new file mode 100644 index 00000000..4a8b45c3 --- /dev/null +++ b/fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/icon_close.imageset/icon_close.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/fit-a-pet-client/fit-a-pet-client/UIElement/CustomNavigationBar.swift b/fit-a-pet-client/fit-a-pet-client/UIElement/CustomNavigationBar.swift index bf165f7d..b8139f14 100644 --- a/fit-a-pet-client/fit-a-pet-client/UIElement/CustomNavigationBar.swift +++ b/fit-a-pet-client/fit-a-pet-client/UIElement/CustomNavigationBar.swift @@ -19,7 +19,7 @@ class CustomNavigationBar: UIViewController { private func setupNavigationBar(title: String) { // X button closeButton = UIButton(type: .system) - closeButton.setImage(UIImage(named: "close_icon"), for: .normal) + closeButton.setImage(UIImage(named: "icon_close"), for: .normal) closeButton.addTarget(self, action: #selector(closeButtonTapped), for: .touchUpInside) navigationItem.rightBarButtonItem = UIBarButtonItem(customView: closeButton) diff --git a/fit-a-pet-client/fit-a-pet-client/View/CalendarVCView/CalendarHeaderView.swift b/fit-a-pet-client/fit-a-pet-client/View/CalendarVCView/CalendarHeaderView.swift index 7b3ca60a..80b1f9ca 100644 --- a/fit-a-pet-client/fit-a-pet-client/View/CalendarVCView/CalendarHeaderView.swift +++ b/fit-a-pet-client/fit-a-pet-client/View/CalendarVCView/CalendarHeaderView.swift @@ -11,7 +11,7 @@ class CalendarStackView: UIStackView { weak var delegate: CalendarStackViewDelegate? let prevButton: UIButton = { let button = UIButton(type: .custom) - button.setImage(UIImage(named: "calendar_left"), for: .normal) + button.setImage(UIImage(named: "icon_arrow_left"), for: .normal) button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) button.setTitleColor(.black, for: .normal) return button @@ -26,7 +26,7 @@ class CalendarStackView: UIStackView { let nextButton: UIButton = { let button = UIButton(type: .custom) - button.setImage(UIImage(named: "calendar_right"), for: .normal) + button.setImage(UIImage(named: "icon_arrow_right"), for: .normal) button.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18) button.setTitleColor(.black, for: .normal) return button diff --git a/fit-a-pet-client/fit-a-pet-client/View/CustomView/CustomPanModalView.swift b/fit-a-pet-client/fit-a-pet-client/View/CustomView/CustomPanModalView.swift index a21f756b..dd9ac2d2 100644 --- a/fit-a-pet-client/fit-a-pet-client/View/CustomView/CustomPanModalView.swift +++ b/fit-a-pet-client/fit-a-pet-client/View/CustomView/CustomPanModalView.swift @@ -21,7 +21,7 @@ class CustomPanModalView: UIView { private let closeButton: UIButton = { let button = UIButton() - button.setImage(UIImage(named: "close_icon"), for: .normal) + button.setImage(UIImage(named: "icon_close"), for: .normal) return button }() diff --git a/fit-a-pet-client/fit-a-pet-client/ViewControllers/CalendarRegistrationVC.swift b/fit-a-pet-client/fit-a-pet-client/ViewControllers/CalendarRegistrationVC.swift index bcdf6612..e2b11d54 100644 --- a/fit-a-pet-client/fit-a-pet-client/ViewControllers/CalendarRegistrationVC.swift +++ b/fit-a-pet-client/fit-a-pet-client/ViewControllers/CalendarRegistrationVC.swift @@ -48,7 +48,7 @@ class CalendarRegistrationVC: UIViewController, CalendarDateViewDelegate { navigationItem.titleView = titleView - closeBtn.setImage(UIImage(named: "close_icon"), for: .normal) + closeBtn.setImage(UIImage(named: "icon_close"), for: .normal) closeBtn.addTarget(self, action: #selector(closeBtnTapped), for: .touchUpInside) navigationItem.rightBarButtonItem = UIBarButtonItem(customView: closeBtn) } diff --git a/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/InviteMemberVC.swift b/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/InviteMemberVC.swift index c1cfa02c..28119f60 100644 --- a/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/InviteMemberVC.swift +++ b/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/InviteMemberVC.swift @@ -111,7 +111,7 @@ class InviteMemberVC: UIViewController{ navigationItem.titleView = titleView - closeBtn.setImage(UIImage(named: "close_icon"), for: .normal) + closeBtn.setImage(UIImage(named: "icon_close"), for: .normal) closeBtn.addTarget(self, action: #selector(closeBtnTapped), for: .touchUpInside) navigationItem.rightBarButtonItem = UIBarButtonItem(customView: closeBtn) } diff --git a/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/PetProfileEditVC.swift b/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/PetProfileEditVC.swift index 8cb7e013..21725236 100644 --- a/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/PetProfileEditVC.swift +++ b/fit-a-pet-client/fit-a-pet-client/ViewControllers/PetProfileVC/PetProfileEditVC.swift @@ -113,6 +113,7 @@ class PetProfileEditVC: CustomNavigationBar{ birthTapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(datePickerViewTapped)) basicUserInofoView.birthdayView.birthdayStackView.addGestureRecognizer(birthTapGestureRecognizer) editButton.addTarget(self, action: #selector(editButtonTapped), for: .touchUpInside) + deleteButton.addTarget(self, action: #selector(deleteButtonTapped), for: .touchUpInside) } private func petTotalInfoCheckAPI() { @@ -260,6 +261,21 @@ class PetProfileEditVC: CustomNavigationBar{ } } + @objc func deleteButtonTapped(){ + AuthorizationAlamofire.shared.petDelete(SelectedPetId.petId){ result in + switch result { + case .success(let data): + if let responseData = data, + let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] { + print("response jsonData: \(jsonObject)") + self.navigationController?.popToRootViewController(animated: true) + } + + case .failure(let error): + print("Error: \(error)") + } + } + } } extension PetProfileEditVC: UITextFieldDelegate{ diff --git a/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/CalendarVC.swift b/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/CalendarVC.swift index 49d64ddd..0f497b7a 100644 --- a/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/CalendarVC.swift +++ b/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/CalendarVC.swift @@ -95,7 +95,7 @@ class CalendarVC: UIViewController { let leftItem = UIBarButtonItem(customView: leftLabel) navigationItem.leftBarButtonItem = leftItem - let addButton = UIBarButtonItem(image: UIImage(named: "calendar_add"), style: .plain, target: self, action: #selector(didTapAddButton)) + let addButton = UIBarButtonItem(image: UIImage(named: "icon_add"), style: .plain, target: self, action: #selector(didTapAddButton)) addButton.tintColor = UIColor(named: "PrimaryColor") navigationItem.rightBarButtonItem = addButton } diff --git a/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/PetVC.swift b/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/PetVC.swift index 8671d311..7b6f1eaf 100644 --- a/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/PetVC.swift +++ b/fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/PetVC.swift @@ -67,6 +67,8 @@ class PetVC: UIViewController{ switch result { case .success(let data): if let responseData = data { + + PetDataManager.pets.removeAll() PetDataManager.updatePets(with: responseData) self.petListCollectionView.reloadData()