Merge pull request #133 from teamCA-PIN/feature/#111

Feature/#111

Author: Kim-jisoo11

CA-PIN_IOS/CA-PIN_IOS.xcodeproj/project.pbxproj

@@ -1522,7 +1522,7 @@
 				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = VTJLBZ2Q3F;
 				INFOPLIST_FILE = "CA-PIN_IOS/Supports/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1548,15 +1548,14 @@
 				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = VTJLBZ2Q3F;
 				INFOPLIST_FILE = "CA-PIN_IOS/Supports/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0.0;
-				PRODUCT_BUNDLE_IDENTIFIER = CAPIN.dist;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "AppStore CAPIN";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};

CA-PIN_IOS/CA-PIN_IOS/Screens/Mypage/Cells/MyPage/Review/MyReviewTableViewCell.swift

@@ -232,6 +232,7 @@ extension MyReviewTableViewCell {
       writeVC.content = (self.reviewModel?.content)!
       writeVC.ratingValue = self.reviewModel!.rating
       writeVC.reviewId = self.reviewModel!.id
+      writeVC.recommend = self.reviewModel!.recommend ?? []
       if self.reviewModel?.imgs == [] {
         for imagePath in (self.reviewModel!.imgs)! {
           let image = UIImageView()

CA-PIN_IOS/CA-PIN_IOS/Screens/WriteReview/ViewControllers/WriteReviewViewController.swift

@@ -104,8 +104,8 @@ class WriteReviewViewController: UIViewController {
   override func viewDidLoad() {
     self.view.backgroundColor = .white
     super.viewDidLoad()
-    dataBind(rating: ratingValue, title: titleContent, recommend: recommend, content: content, confirmTitle: confirmTitle)
     layout()
+    dataBind(rating: ratingValue, title: titleContent, recommend: recommend, content: content, confirmTitle: confirmTitle)
     register()
     self.reviewphotoCollectionView.delegate = self
     self.reviewphotoCollectionView.dataSource = self
@@ -481,7 +481,26 @@ extension WriteReviewViewController {
     self.writereviewtitleLabel.setupLabel(text: title, color: .black, font: UIFont.notoSansKRMediumFont(fontSize: 20))
     self.writereviewtitleLabel.letterSpacing = -0.7
     self.ratingContentLabel.text = "\(rating)점"
-    self.recommend = recommend ?? []
+    if let recommend = recommend {
+      if recommend == [0] {
+        self.tasteButton.isSelected = true
+        tasteButton.backgroundColor = .maincolor1
+        tasteButton.setTitleColor(.white, for: .normal)
+      }
+      if recommend == [1] {
+        self.feelButton.isSelected = true
+        feelButton.backgroundColor = .maincolor1
+        feelButton.setTitleColor(.white, for: .normal)
+      }
+      if recommend == [0,1] {
+        self.tasteButton.isSelected = true
+        self.feelButton.isSelected = true
+        tasteButton.backgroundColor = .maincolor1
+        tasteButton.setTitleColor(.white, for: .normal)
+        feelButton.backgroundColor = .maincolor1
+        feelButton.setTitleColor(.white, for: .normal)
+      }
+    }
     self.reviewTextView.text = content
     if content == "리뷰를 입력하세요." {
       self.reviewTextView.textColor = .gray3
@@ -491,16 +510,6 @@ extension WriteReviewViewController {
     }
     self.writereviewButton.setupButton(title: confirmTitle, color: .white, font: .notoSansKRMediumFont(fontSize: 16), backgroundColor: .maincolor1, state: .normal, radius: 24.5)
     self.ratingView.rating = self.ratingValue
-    if self.recommend == [0] {
-      self.tasteButton.isSelected = true
-    }
-    if self.recommend == [1] {
-      self.feelButton.isSelected = true
-    }
-    if self.recommend == [0,1] {
-      self.tasteButton.isSelected = true
-      self.feelButton.isSelected = true
-    }
   }
   @objc func tasteButtonClicked() {
     tasteButton.isSelected.toggle()

CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/coffee.imageset/Contents.json

@@ -2,13 +2,13 @@
   "images" : [
     {
       "filename" : "coffee.png",
-      "scale" : "1x",
-      "idiom" : "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
     },
     {
+      "idiom" : "universal",
       "filename" : "[email protected]",
-      "scale" : "2x",
-      "idiom" : "universal"
+      "scale" : "2x"
     },
     {
       "scale" : "3x",

CA-PIN_IOS/CA-PIN_IOS/Supports/Assets.xcassets/coffee.imageset/coffee.png

@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 85892d76eba475ec29cbba01bd6921fbed733ca7
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.10.1