feat: 반려동물 삭제 api 연동 -> 데이터 적용

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)")
+//            }
+//        }
+//        
 
 
     }

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/close_icon.imageset/Contents.json → 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"
     },

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_left.imageset/Contents.json → 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"
     },

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_right.imageset/Contents.json → 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"
     },

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/icon/calendar_add.imageset/Contents.json → 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"
     },

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)
 

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

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
     }()
 

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)
     }

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)
     }

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{
 

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
     }

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()