Merge pull request #117 from TeamNobar/bug/#116-tasting-note

[BUG] 테이스팅 노트 버그 수정

Author: yujinnee

Nobar.xcodeproj/project.pbxproj

@@ -750,6 +750,7 @@
 				6AD777C9288A9AD500424585 /* Component */,
 				6AD777C8288A9ACF00424585 /* Model */,
 				3CD4370C2877DC910044AE04 /* WritingNote.storyboard */,
+				6AD777CC288A9B1A00424585 /* CocktailNameSearchViewController.swift */,
 				3CD437122877EC530044AE04 /* WritingNoteViewController.swift */,
 			);
 			path = WritingNote;
@@ -948,7 +949,6 @@
 			isa = PBXGroup;
 			children = (
 				6AD777CA288A9AF200424585 /* Status.swift */,
-				6AD777CC288A9B1A00424585 /* CocktailNameSearchViewController.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1734,7 +1734,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = Nobar/Nobar.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = BWM6S332K8;
@@ -1753,7 +1753,7 @@
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "kr.teamnobar.nobar-ios-release";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "match AppStore kr.teamnobar.nobar-ios-release";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development kr.teamnobar.nobar-ios-release";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;

Nobar.xcodeproj/xcshareddata/xcschemes/Nobar.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

Nobar.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

Nobar/Scenes/WritingNote/Cell/TasteCVC.swift

@@ -77,20 +77,23 @@ extension TasteCVC {
 
   func bind(with tags: [Tag]) {
     self.tags = tags
+    topStackView.removeAllSubViews()
+    middleStackView.removeAllSubViews()
+    bottomStackView.removeAllSubViews()
 
     guard tags.count == 9 else { return }
 
     for i in 0..<9 {
       let tagView = TastingTagView()
       tagView.setTastingTagView(with: tags[i])
       tagView.tag = i+1
-      tagViews += [tagView]
       switch i {
       case 0..<3: topStackView.addArrangedSubview(tagView)
       case 3..<6: middleStackView.addArrangedSubview(tagView)
       case 6..<9: bottomStackView.addArrangedSubview(tagView)
       default: return
       }
+
     }
 
     setNeedsLayout()

Nobar/Scenes/WritingNote/Cell/TastingNoteHeaderView.swift

@@ -66,6 +66,7 @@ extension TastingNoteHeaderView {
       switch status{
       case .newWriting,.revising:
         titleLabel.text = "언제 칵테일을 마셨나요?"
+        notiLabel.text = ""
       case .viewing:
         titleLabel.text = "칵테일을 만든 날짜"
       }

…l/CocktailNameSearchViewController.swift …e/CocktailNameSearchViewController.swiftNobar/Scenes/WritingNote/Model/CocktailNameSearchViewController.swift renamed to Nobar/Scenes/WritingNote/CocktailNameSearchViewController.swift Nobar/Scenes/WritingNote/Model/CocktailNameSearchViewController.swift renamed to Nobar/Scenes/WritingNote/CocktailNameSearchViewController.swift

@@ -68,8 +68,9 @@ final class WritingNoteViewController: BaseViewController {
   private let deleteButton = UIButton().then {
     $0.setImage(ImageFactory.icnDelete, for: .normal)
   }
-  private let reviseButton = UIButton().then {
+  private lazy var reviseButton = UIButton().then {
     $0.setImage(ImageFactory.icnModify, for: .normal)
+    $0.addTarget(self, action: #selector(didTapReviseButton(_:)), for: .touchUpInside)
   }
 
   private let grayLine = UIView().then {
@@ -100,7 +101,8 @@ extension WritingNoteViewController {
     render()
     setDelegation()
     setRegistration()
-    setTitleViewLayout()
+    initHeaderBarLayout()
+    setHeaderBarLayout()
     setNotification()
     fetchTastingNoteTags()
   }
@@ -112,7 +114,7 @@ extension WritingNoteViewController {
   private func render() {
     view.addSubviews([headerBarView,grayLine,tastingCollectionView])
   }
-  private func setTitleViewLayout() {
+  private func initHeaderBarLayout() {
     headerBarView.addSubviews([closeButton,titleLabel,applyButton,reviseButton,deleteButton])
 
     closeButton.snp.makeConstraints{
@@ -139,23 +141,7 @@ extension WritingNoteViewController {
     }
 
 
-    switch writingstatus{
-    case .newWriting:
-      titleLabel.text = "테이스팅 노트 기록하기"
-      applyButton.isHidden = false
-      reviseButton.isHidden = true
-      deleteButton.isHidden = true
-    case .revising:
-      titleLabel.text = "테이스팅 노트 수정하기"
-      applyButton.isHidden = false
-      reviseButton.isHidden = true
-      deleteButton.isHidden = true
-    case .viewing:
-      titleLabel.text = "작성한 테이스팅 노트"
-      applyButton.isHidden = true
-      reviseButton.isHidden = false
-      deleteButton.isHidden = false
-    }
+  
   }
 
   private func setLayout() {
@@ -238,7 +224,6 @@ extension WritingNoteViewController {
     if let keyboardFrame: NSValue = noti.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
       if self.view.frame.origin.y != 0 {
 
-        /// naviBar 만큼 내림
         self.view.frame.origin.y += keyboardFrame.cgRectValue.size.height
       }
     }
@@ -272,6 +257,32 @@ extension WritingNoteViewController {
     print("closetapped")
     self.dismiss(animated: true)
   }
+  @objc private func didTapReviseButton(_ sender: UIButton){
+    print("revisetapped")
+    writingstatus = .revising
+    setHeaderBarLayout()
+    tastingCollectionView.reloadData()
+    
+  }
+  private func setHeaderBarLayout(){
+    switch writingstatus{
+    case .newWriting:
+      titleLabel.text = "테이스팅 노트 기록하기"
+      applyButton.isHidden = false
+      reviseButton.isHidden = true
+      deleteButton.isHidden = true
+    case .revising:
+      titleLabel.text = "테이스팅 노트 수정하기"
+      applyButton.isHidden = false
+      reviseButton.isHidden = true
+      deleteButton.isHidden = true
+    case .viewing:
+      titleLabel.text = "작성한 테이스팅 노트"
+      applyButton.isHidden = true
+      reviseButton.isHidden = false
+      deleteButton.isHidden = false
+    }
+  }
 }
 
 struct TastingTagDTO {
@@ -360,6 +371,7 @@ extension WritingNoteViewController: UICollectionViewDataSource{
       cell.selectedTagListClosure = { [weak self] indexArray in
         self?.selectedTags = indexArray.map { TastingTagDTO(id: $0) }
       }
+
       cell.bind(with: self.tagOptions)
       cell.setLayout(for: writingstatus)
       return cell