Skip to content

Commit

Permalink
Feat [#36] reviewVC와 연결
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaentopia
chaentopia committed May 26, 2023
1 parent 51ca12a commit 5b71093
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 6 deletions.
8 changes: 4 additions & 4 deletions SOPT-32nd-APP4-CarrotiOS/SOPT-32nd-APP4-CarrotiOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
C32525252A17541A002629E0 /* ReceiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C32525242A17541A002629E0 /* ReceiveView.swift */; };
C32525272A176201002629E0 /* SendView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C32525262A176201002629E0 /* SendView.swift */; };
C36D9F9E2A174169006B155F /* GuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C36D9F9D2A174169006B155F /* GuideView.swift */; };
C3D71D732A208075006222A4 /* ReviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D71D722A208075006222A4 /* ReviewViewController.swift */; };
C3FFFB262A13394500FACA8E /* HeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3FFFB252A13394500FACA8E /* HeaderView.swift */; };
C3FFFB2A2A134E8400FACA8E /* ChatViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3FFFB292A134E8400FACA8E /* ChatViewController.swift */; };
C3FFFB2C2A134E9400FACA8E /* ChatHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3FFFB2B2A134E9400FACA8E /* ChatHeader.swift */; };
Expand All @@ -39,7 +40,6 @@
DF1841D52A11BD1C001A466A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DF1841D32A11BD1C001A466A /* LaunchScreen.storyboard */; };
DF1841F82A11C405001A466A /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1841F72A11C405001A466A /* Color.swift */; };
DF1841FA2A11C40D001A466A /* UIFont+.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1841F92A11C40D001A466A /* UIFont+.swift */; };
DF1842022A11C433001A466A /* g.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1842012A11C433001A466A /* g.swift */; };
DF1842042A11C43A001A466A /* h.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1842032A11C43A001A466A /* h.swift */; };
DF1842062A11C445001A466A /* i.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1842052A11C445001A466A /* i.swift */; };
DF18420A2A11C451001A466A /* k.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF1842092A11C451001A466A /* k.swift */; };
Expand Down Expand Up @@ -89,6 +89,7 @@
C32525242A17541A002629E0 /* ReceiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReceiveView.swift; sourceTree = "<group>"; };
C32525262A176201002629E0 /* SendView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendView.swift; sourceTree = "<group>"; };
C36D9F9D2A174169006B155F /* GuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuideView.swift; sourceTree = "<group>"; };
C3D71D722A208075006222A4 /* ReviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewViewController.swift; sourceTree = "<group>"; };
C3FFFB252A13394500FACA8E /* HeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderView.swift; sourceTree = "<group>"; };
C3FFFB292A134E8400FACA8E /* ChatViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
C3FFFB2B2A134E9400FACA8E /* ChatHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatHeader.swift; sourceTree = "<group>"; };
Expand All @@ -101,7 +102,6 @@
DF1841D62A11BD1C001A466A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DF1841F72A11C405001A466A /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
DF1841F92A11C40D001A466A /* UIFont+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+.swift"; sourceTree = "<group>"; };
DF1842012A11C433001A466A /* g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = g.swift; sourceTree = "<group>"; };
DF1842032A11C43A001A466A /* h.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = h.swift; sourceTree = "<group>"; };
DF1842052A11C445001A466A /* i.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = i.swift; sourceTree = "<group>"; };
DF1842092A11C451001A466A /* k.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = k.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -341,7 +341,7 @@
DF1841E62A11C28F001A466A /* Review */ = {
isa = PBXGroup;
children = (
DF1842012A11C433001A466A /* g.swift */,
C3D71D722A208075006222A4 /* ReviewViewController.swift */,
);
path = Review;
sourceTree = "<group>";
Expand Down Expand Up @@ -562,6 +562,7 @@
DF18423A2A178028001A466A /* HomeHeaderView.swift in Sources */,
055970792A17FBE400868C42 /* SaleDummyTableViewCell.swift in Sources */,
C3FFFB2A2A134E8400FACA8E /* ChatViewController.swift in Sources */,
C3D71D732A208075006222A4 /* ReviewViewController.swift in Sources */,
DF1841FA2A11C40D001A466A /* UIFont+.swift in Sources */,
DF1841F82A11C405001A466A /* Color.swift in Sources */,
DF1842122A11C46D001A466A /* o.swift in Sources */,
Expand All @@ -570,7 +571,6 @@
057A0ACB2A1BB15A00F10B85 /* UIButton+.swift in Sources */,
C36D9F9E2A174169006B155F /* GuideView.swift in Sources */,
DF1842222A11F5A1001A466A /* Image.swift in Sources */,
DF1842022A11C433001A466A /* g.swift in Sources */,
C3FFFB2E2A135E4A00FACA8E /* UILabel+.swift in Sources */,
DF1842042A11C43A001A466A /* h.swift in Sources */,
C312AB172A1FDD8500DA32EE /* String+.swift in Sources */,
Expand Down
1 change: 0 additions & 1 deletion SOPT-32nd-APP4-CarrotiOS/SOPT-32nd-APP4-CarrotiOS/Presentation/Chat/View/ChatHeader.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ extension ChatHeader {
}

private func setAddTarget() {

}

func addBottomBorder(with color: UIColor?, andWidth borderWidth: CGFloat) {
Expand Down
11 changes: 10 additions & 1 deletion ...rotiOS/SOPT-32nd-APP4-CarrotiOS/Presentation/Chat/ViewController/ChatViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,18 @@ final class ChatViewController: UIViewController {
setStyle()
setDelegate()
setLayout()
setAddTarget()
setKeyboardObserver()
hideKeyboardTappedAround()
}
}

extension ChatViewController {

private func setAddTarget() {
chatHeader.reviewButton.addTarget(self, action: #selector(reviewButtonTapped), for: .touchUpInside)
}

private func setStyle() {
view.backgroundColor = .white
navigationController?.setNavigationBarHidden(true, animated: true)
Expand Down Expand Up @@ -191,7 +196,6 @@ extension ChatViewController {


private func chatData() {
//TODO: 이전 뷰에서 RoomId 받아옴
ChatService.shared.chat(chatRoomId: chatRoom) { response in
switch response {
case .success(let data):
Expand Down Expand Up @@ -226,6 +230,11 @@ extension ChatViewController {
}
}
}

@objc func reviewButtonTapped() {
let reviewViewController = ReviewViewController()
self.navigationController?.pushViewController(reviewViewController, animated: true)
}
}

extension ChatViewController: HandleBackButtonDelegate {
Expand Down
14 changes: 14 additions & 0 deletions ...nd-APP4-CarrotiOS/SOPT-32nd-APP4-CarrotiOS/Presentation/Review/ReviewViewController.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// ReviewViewController.swift
// SOPT-32nd-APP4-CarrotiOS
//
// Created by 정채은 on 2023/05/26.
//

import UIKit

class ReviewViewController: BaseViewController {



}

0 comments on commit 5b71093

Please sign in to comment.