Feat [#186] 3차 스프린트 기능 구현 완료 및 QA 진행 완료

DontBe-iOS/DontBe-iOS.xcodeproj/project.pbxproj

@@ -110,6 +110,7 @@
 		3C1ABD872B8F01E700ADF97B /* MyPageSignOutReasonViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1ABD862B8F01E700ADF97B /* MyPageSignOutReasonViewModel.swift */; };
 		3C1ABD892B8F083C00ADF97B /* MyPageSignOutConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1ABD882B8F083C00ADF97B /* MyPageSignOutConfirmViewController.swift */; };
 		3C1ABD8B2B8F089100ADF97B /* MyPageSignOutConfirmView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1ABD8A2B8F089100ADF97B /* MyPageSignOutConfirmView.swift */; };
+		3C2245292BF34C1A0095D3FB /* DontBePhotoDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2245282BF34C1A0095D3FB /* DontBePhotoDetailView.swift */; };
 		3C2854FD2B3A9FD800369C99 /* ExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FC2B3A9FD800369C99 /* ExampleViewController.swift */; };
 		3C2854FF2B3AA01700369C99 /* ExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2854FE2B3AA01700369C99 /* ExampleView.swift */; };
 		3C2855012B3AA0A000369C99 /* ExampleCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2855002B3AA0A000369C99 /* ExampleCollectionViewCell.swift */; };
@@ -124,6 +125,7 @@
 		3C4EDCCB2B58653800A9707C /* PostReplyResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4EDCCA2B58653800A9707C /* PostReplyResponseDTO.swift */; };
 		3C4F5BB52B7A49A500B21C45 /* MyPageSignOutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F5BB42B7A49A500B21C45 /* MyPageSignOutViewController.swift */; };
 		3C4F5BB72B7A4A0C00B21C45 /* MyPageSignOutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F5BB62B7A4A0C00B21C45 /* MyPageSignOutView.swift */; };
+		3C5F82B02BFB133700D2FE3F /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 3C5F82AF2BFB133700D2FE3F /* Kingfisher */; };
 		3C6192ED2B3A719A00220CEB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EC2B3A719A00220CEB /* AppDelegate.swift */; };
 		3C6192EF2B3A719A00220CEB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EE2B3A719A00220CEB /* SceneDelegate.swift */; };
 		3C6192F62B3A719C00220CEB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C6192F52B3A719C00220CEB /* Assets.xcassets */; };
@@ -147,6 +149,7 @@
 		3CBF99292B56BD210015FE4B /* MypageProfileResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CBF99282B56BD210015FE4B /* MypageProfileResponseDTO.swift */; };
 		3CD25D272B5466DB0075F80F /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CD25D262B5466DB0075F80F /* Empty.swift */; };
 		3CD25D292B5482FE0075F80F /* DontBeBottomSheetButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CD25D282B5482FE0075F80F /* DontBeBottomSheetButton.swift */; };
+		3CE6B90D2BECBCA6002E2CDC /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE6B90C2BECBCA6002E2CDC /* Functions.swift */; };
 		3CE9C12A2B4BE6780086E4A3 /* WriteViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE9C1292B4BE6780086E4A3 /* WriteViewController.swift */; };
 		3CE9C12C2B4BE7300086E4A3 /* WriteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE9C12B2B4BE7300086E4A3 /* WriteView.swift */; };
 		3CE9C12E2B4C08AE0086E4A3 /* WriteTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CE9C12D2B4C08AE0086E4A3 /* WriteTextView.swift */; };
@@ -267,6 +270,7 @@
 		3C1ABD862B8F01E700ADF97B /* MyPageSignOutReasonViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageSignOutReasonViewModel.swift; sourceTree = "<group>"; };
 		3C1ABD882B8F083C00ADF97B /* MyPageSignOutConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageSignOutConfirmViewController.swift; sourceTree = "<group>"; };
 		3C1ABD8A2B8F089100ADF97B /* MyPageSignOutConfirmView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageSignOutConfirmView.swift; sourceTree = "<group>"; };
+		3C2245282BF34C1A0095D3FB /* DontBePhotoDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBePhotoDetailView.swift; sourceTree = "<group>"; };
 		3C2854FC2B3A9FD800369C99 /* ExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleViewController.swift; sourceTree = "<group>"; };
 		3C2854FE2B3AA01700369C99 /* ExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleView.swift; sourceTree = "<group>"; };
 		3C2855002B3AA0A000369C99 /* ExampleCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleCollectionViewCell.swift; sourceTree = "<group>"; };
@@ -306,6 +310,7 @@
 		3CBF99282B56BD210015FE4B /* MypageProfileResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MypageProfileResponseDTO.swift; sourceTree = "<group>"; };
 		3CD25D262B5466DB0075F80F /* Empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Empty.swift; sourceTree = "<group>"; };
 		3CD25D282B5482FE0075F80F /* DontBeBottomSheetButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DontBeBottomSheetButton.swift; sourceTree = "<group>"; };
+		3CE6B90C2BECBCA6002E2CDC /* Functions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
 		3CE9C1292B4BE6780086E4A3 /* WriteViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteViewController.swift; sourceTree = "<group>"; };
 		3CE9C12B2B4BE7300086E4A3 /* WriteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteView.swift; sourceTree = "<group>"; };
 		3CE9C12D2B4C08AE0086E4A3 /* WriteTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteTextView.swift; sourceTree = "<group>"; };
@@ -331,6 +336,7 @@
 				2A8D70B12B4C4D8F009F4C6C /* KakaoSDK in Frameworks */,
 				3CFB30472BB305EE00A3F70A /* Amplitude in Frameworks */,
 				2FD9276A2B92245B0046193D /* Lottie in Frameworks */,
+				3C5F82B02BFB133700D2FE3F /* Kingfisher in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -690,6 +696,7 @@
 			isa = PBXGroup;
 			children = (
 				2F4BE0C52BD90EC4003147E7 /* AppStoreCheckManager.swift */,
+				3CE6B90C2BECBCA6002E2CDC /* Functions.swift */,
 			);
 			path = Shared;
 			sourceTree = "<group>";
@@ -1093,6 +1100,7 @@
 				3C2F544D2B50F65500E7BF01 /* DontBeBottomSheetView.swift */,
 				3CD25D282B5482FE0075F80F /* DontBeBottomSheetButton.swift */,
 				3CB634C92B59080E00DB9DA5 /* DontBeTransparencyGrayView.swift */,
+				3C2245282BF34C1A0095D3FB /* DontBePhotoDetailView.swift */,
 				3CE9C1342B4C4BC20086E4A3 /* CircleProgressbar.swift */,
 				2A2672042B4C3C00009D214F /* CancelBag.swift */,
 				2A8D70C22B4D7FF5009F4C6C /* BackButton.swift */,
@@ -1199,6 +1207,7 @@
 				2A8D70B02B4C4D8F009F4C6C /* KakaoSDK */,
 				2FD927692B92245B0046193D /* Lottie */,
 				3CFB30462BB305EE00A3F70A /* Amplitude */,
+				3C5F82AF2BFB133700D2FE3F /* Kingfisher */,
 			);
 			productName = DontBe;
 			productReference = 3C6192E92B3A719A00220CEB /* DontBe-iOS.app */;
@@ -1233,6 +1242,7 @@
 				2A8D70AF2B4C4D8F009F4C6C /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */,
 				2FD927682B92245B0046193D /* XCRemoteSwiftPackageReference "lottie-spm" */,
 				3CFB30452BB305EE00A3F70A /* XCRemoteSwiftPackageReference "Amplitude-iOS" */,
+				3C5F82AE2BFB133700D2FE3F /* XCRemoteSwiftPackageReference "Kingfisher" */,
 			);
 			productRefGroup = 3C6192EA2B3A719A00220CEB /* Products */;
 			projectDirPath = "";
@@ -1287,6 +1297,7 @@
 				2F05B1A72B5799B700AC368D /* PostDetailResponseDTO.swift in Sources */,
 				3C61930C2B3A782100220CEB /* StringLiterals.swift in Sources */,
 				2FB64FF22B5318C50082A414 /* WriteReplyContentView.swift in Sources */,
+				3C2245292BF34C1A0095D3FB /* DontBePhotoDetailView.swift in Sources */,
 				2F8735462B4C34A500E55552 /* HomeCollectionView.swift in Sources */,
 				2FBBADFA2B54401A002D6286 /* DeletePopupViewController.swift in Sources */,
 				3CEE4CBD2B500A7800F506AF /* DontBeTransparencyInfoView.swift in Sources */,
@@ -1375,6 +1386,7 @@
 				2FBBADF12B53AF9B002D6286 /* PostDetailCollectionFooterView.swift in Sources */,
 				2FB64FF62B531E4F0082A414 /* WriteReplyEditorView.swift in Sources */,
 				2FB769D02B5277BD004C7752 /* PostReplyTextFieldView.swift in Sources */,
+				3CE6B90D2BECBCA6002E2CDC /* Functions.swift in Sources */,
 				2A2671FD2B4C3A9F009D214F /* LoginViewModel.swift in Sources */,
 				2FB818DC2B51875D00B7498F /* PostReplyCollectionViewCell.swift in Sources */,
 				2F0A98D32B58B8EF00AAE625 /* DeleteReplyPopupViewController.swift in Sources */,
@@ -1546,7 +1558,7 @@
 				CODE_SIGN_ENTITLEMENTS = "DontBe-iOS/DontBe-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = MAZQ6JDBT4;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "DontBe-iOS/Global/Resources/Info.plist";
@@ -1562,7 +1574,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SOPT33.DontBe-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1584,7 +1596,7 @@
 				CODE_SIGN_ENTITLEMENTS = "DontBe-iOS/DontBe-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = MAZQ6JDBT4;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "DontBe-iOS/Global/Resources/Info.plist";
@@ -1600,7 +1612,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.SOPT33.DontBe-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1662,6 +1674,14 @@
 				minimumVersion = 4.4.1;
 			};
 		};
+		3C5F82AE2BFB133700D2FE3F /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/onevcat/Kingfisher.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 7.11.0;
+			};
+		};
 		3CFB30452BB305EE00A3F70A /* XCRemoteSwiftPackageReference "Amplitude-iOS" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/amplitude/Amplitude-iOS";
@@ -1688,6 +1708,11 @@
 			package = 2FD927682B92245B0046193D /* XCRemoteSwiftPackageReference "lottie-spm" */;
 			productName = Lottie;
 		};
+		3C5F82AF2BFB133700D2FE3F /* Kingfisher */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3C5F82AE2BFB133700D2FE3F /* XCRemoteSwiftPackageReference "Kingfisher" */;
+			productName = Kingfisher;
+		};
 		3CFB30462BB305EE00A3F70A /* Amplitude */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 3CFB30452BB305EE00A3F70A /* XCRemoteSwiftPackageReference "Amplitude-iOS" */;

DontBe-iOS/DontBe-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "a04664d0969ba455e6e6696e590afa4d7878d5741b6b1e3bb7b11edd9fc58c87",
+  "originHash" : "74a68703609c00724d8fa5d77c9ef0723fac1493ecbf4612b13c4182b56fbd1f",
   "pins" : [
     {
       "identity" : "alamofire",
@@ -37,6 +37,15 @@
         "revision" : "ab226a7a3625d64e73a52aa3800595dab810156b"
       }
     },
+    {
+      "identity" : "kingfisher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/onevcat/Kingfisher.git",
+      "state" : {
+        "revision" : "5b92f029fab2cce44386d28588098b5be0824ef5",
+        "version" : "7.11.0"
+      }
+    },
     {
       "identity" : "lottie-spm",
       "kind" : "remoteSourceControl",

DontBe-iOS/DontBe-iOS/Application/SceneDelegate.swift

@@ -66,7 +66,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func sceneWillEnterForeground(_ scene: UIScene) {
         // Called as the scene transitions from the background to the foreground.
         // Use this method to undo the changes made on entering the background.
-        self.checkAndUpdateIfNeeded()
     }
 
     func sceneDidEnterBackground(_ scene: UIScene) {
@@ -90,17 +89,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
                 let splitCurrentProjectVersion = currentProjectVersion.split(separator: ".").map { $0 }
 
-                if splitCurrentProjectVersion.count > 0 && splitMarketingVersion.count > 0 {
-
-                    if splitCurrentProjectVersion[0] < splitMarketingVersion[0] {
-                        self.showUpdateAlert(version: marketingVersion)
-
-                    } else if splitCurrentProjectVersion[1] < splitMarketingVersion[1] {
-                        self.showUpdateAlert(version: marketingVersion)
-
-                    } else {
-                        print("현재 최신버전입니다.")
-                    }
+                if currentProjectVersion < marketingVersion {
+                    self.showUpdateAlert(version: marketingVersion)
+                } else {
+                    print("현재 최신버전입니다.")
                 }
             }
         }

DontBe-iOS/DontBe-iOS/Global/Extension/UIImageView+.swift

@@ -7,21 +7,103 @@
 
 import UIKit
 
+import Kingfisher
+
 extension UIImageView {
     func load(url: String) {
-        if let url = URL(string: url) {
-            DispatchQueue.global().async { [weak self] in
-                if let data = try? Data(contentsOf: url) {
-                    if let image = UIImage(data: data) {
-                        DispatchQueue.main.async {
-                            self?.image = image
-                            self?.layer.cornerRadius = (self?.frame.size.width ?? 0) / 2.adjusted
-                            self?.contentMode = .scaleAspectFill
-                            self?.clipsToBounds = true
-                        }
-                    }
+        guard let url = URL(string: url) else { return }
+
+        self.kf.indicatorType = .activity
+        self.kf.setImage(
+            with: url,
+            placeholder: nil,
+            options: [
+                .scaleFactor(UIScreen.main.scale),
+                .cacheOriginalImage
+            ]
+        ) { result in
+            switch result {
+            case .success(let value):
+                DispatchQueue.main.async { [weak self] in
+                    self?.image = value.image
+                    self?.layer.cornerRadius = (self?.frame.size.width ?? 0) / 2.adjusted
+                    self?.contentMode = .scaleAspectFill
+                    self?.clipsToBounds = true
+                }
+            case .failure(let error):
+                print("Error loading image: \(error)")
+
+                DispatchQueue.main.async { [weak self] in
+                    self?.layer.cornerRadius = (self?.frame.size.width ?? 0) / 2.adjusted
+                    self?.contentMode = .scaleAspectFill
+                    self?.clipsToBounds = true
+                }
+            }
+        }
+    }
+
+    func loadContentImage(url: String) {
+        guard let url = URL(string: url) else { return }
+        self.kf.indicatorType = .activity
+        self.kf.setImage(
+            with: url,
+            placeholder: nil,
+            options: [
+                .scaleFactor(UIScreen.main.scale),
+                .cacheOriginalImage
+            ]
+        ) { result in
+            switch result {
+            case .success(let value):
+                DispatchQueue.main.async {
+                    self.image = value.image
+                    self.layer.cornerRadius = 4.adjusted
+                    self.contentMode = .scaleAspectFill
+                    self.clipsToBounds = true
                 }
+            case .failure(let error):
+                print("Error loading image: \(error)")
+
+                self.layer.cornerRadius = 4.adjusted
+                self.contentMode = .scaleAspectFill
+                self.clipsToBounds = true
             }
         }
     }
 }
+
+//    Kingfisher 이전 이미지 로드 함수 아카이빙
+//
+//    func load(url: String) {
+//        if let url = URL(string: url) {
+//            DispatchQueue.global().async { [weak self] in
+//                if let data = try? Data(contentsOf: url) {
+//                    if let image = UIImage(data: data) {
+//                        DispatchQueue.main.async {
+//                            self?.image = image
+//                            self?.layer.cornerRadius = (self?.frame.size.width ?? 0) / 2.adjusted
+//                            self?.contentMode = .scaleAspectFill
+//                            self?.clipsToBounds = true
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
+
+//    func loadContentImage(url: String) {
+//        if let url = URL(string: url) {
+//            DispatchQueue.global().async { [weak self] in
+//                if let data = try? Data(contentsOf: url) {
+//                    if let image = UIImage(data: data) {
+//                        DispatchQueue.main.async {
+//                            self?.image = image
+//                            self?.layer.cornerRadius = 4.adjusted
+//                            self?.contentMode = .scaleAspectFill
+//                            self?.clipsToBounds = true
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }

DontBe-iOS/DontBe-iOS/Global/Literals/ImageLiterals.swift

@@ -71,13 +71,14 @@ enum ImageLiterals {
         static var btnFavoriteActive: UIImage { .load(name: "favorite=btn_favorite_active") }
         static var btnFavoriteInActive: UIImage { .load(name: "favorite=btn_favorite_default") }
         static var icnDelete: UIImage { .load(name: "icn_delete") }
-        static var btnTransparent: UIImage { .load(name: "status=btn_ghost_default") }
+        static var btnTransparent: UIImage { .load(name: "btn_ghost_gray") }
     }
 
     enum Write {
         static var imgWritingRestriction: UIImage { .load(name: "img_writing_restriction") }
         static var imgBanText: UIImage { .load(name: "img_ban_text") }
         static var btnLink: UIImage { .load(name: "btn_link") }
+        static var btnPhoto: UIImage { .load(name: "btn_photo") }
         static var btnCloseLink: UIImage { .load(name: "btn_close_link") }
     }
 

DontBe-iOS/DontBe-iOS/Global/Literals/StringLiterals.swift

@@ -18,7 +18,8 @@ enum StringLiterals {
     enum Write {
         static let writeNavigationTitle = "새로운 글"
         static let writeNavigationBarButtonItemTitle = "취소"
-        static let writeContentPlaceholder = "무슨 고민이 있나요?"
+        static let writeContentPlaceholder = "어떤 생각을 하고 있나요?"
+        static let writeReplyContentPlaceholder = "님에게 답글 남기기..."
         static let writePostButtonTitle = "게시"
         static let writePopupContentLabel = "작성 중인 글을 삭제하시겠어요?"
         static let writePopupCancleButtonTitle = "취소"
@@ -183,7 +184,7 @@ enum StringLiterals {
     }
 
     enum VersionUpdate {
-        static let versionTitle = "v 1.1.0 업데이트 안내\nDon't be가 업데이트 되었습니다."
-        static let versionMessage = "•눌러서 바로 이동할 수 있는 링크를 삽입할 수 있어요.\n•내 글에 답글을 달거나 좋아요를 누른 상대의 프로필로 이동할 수 있어요.\n•그 외 자잘한 오류들을 해결했어요."
+        static let versionTitle = "v 1.2.1 업데이트 안내\nDon't be가 업데이트 되었습니다."
+        static let versionMessage = "•글을 작성할 때 사진을 첨부할 수 있어요.\n•투명도 버튼 생김새와 터치 영역을 수정했어요.\n•그 외 자잘한 오류들을 해결했어요."
     }
 }