#171: TopTitleView 리팩토링 및 iOS 버전으로 속성 적용

Zatch-Team · Feb 12, 2023 · ef7e857 · ef7e857
1 parent 69e57df
commit ef7e857
Showing 7 changed files with 74 additions and 72 deletions.
diff --git a/Zatch.xcodeproj/project.pbxproj b/Zatch.xcodeproj/project.pbxproj
@@ -177,7 +177,7 @@
 		576EA923282B7F840028046C /* ZatchRegisterFirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 576EA922282B7F840028046C /* ZatchRegisterFirstViewController.swift */; };
 		576EA925282B7FBB0028046C /* ZatchRegisterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 576EA924282B7FBB0028046C /* ZatchRegisterSecondViewController.swift */; };
 		576EA927282B7FD60028046C /* CheckRegisterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 576EA926282B7FD60028046C /* CheckRegisterViewController.swift */; };
-		57713944281F596C0066DEEB /* TitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57713943281F596C0066DEEB /* TitleView.swift */; };
+		57713944281F596C0066DEEB /* TopTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57713943281F596C0066DEEB /* TopTitleView.swift */; };
 		577A01B628A496D1004B2575 /* UITextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 577A01B528A496D1004B2575 /* UITextView.swift */; };
 		578B7A9828AC6AF900E7B4F4 /* ChattingRoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 578B7A9728AC6AF900E7B4F4 /* ChattingRoomViewController.swift */; };
 		578B7A9C28AC892800E7B4F4 /* ChatInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 578B7A9B28AC892800E7B4F4 /* ChatInputView.swift */; };
@@ -312,6 +312,8 @@
 		EEB13B8D297FC68B001A8DD9 /* UIButton+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEB13B8C297FC68B001A8DD9 /* UIButton+Rx.swift */; };
 		EEB13B91297FC7A1001A8DD9 /* BaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEB13B90297FC7A1001A8DD9 /* BaseViewModel.swift */; };
 		EEB13B94297FCD0A001A8DD9 /* LifeCycle+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEB13B93297FCD0A001A8DD9 /* LifeCycle+Rx.swift */; };
+		EEE326A72998B5190017DF46 /* SearchTextFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE326A62998B5190017DF46 /* SearchTextFieldView.swift */; };
+		EEE326AA2998B6EA0017DF46 /* BorderLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE326A92998B6EA0017DF46 /* BorderLine.swift */; };
 		EEE6D15829973C1C0004FC7B /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE6D15729973C1C0004FC7B /* Tag.swift */; };
 		EEE6D15B299752EB0004FC7B /* TagStlye.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE6D15A299752EB0004FC7B /* TagStlye.swift */; };
 		EEE6D15E299757EF0004FC7B /* Padding.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE6D15D299757EF0004FC7B /* Padding.swift */; };
@@ -519,7 +521,7 @@
 		576EA922282B7F840028046C /* ZatchRegisterFirstViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZatchRegisterFirstViewController.swift; sourceTree = "<group>"; };
 		576EA924282B7FBB0028046C /* ZatchRegisterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZatchRegisterSecondViewController.swift; sourceTree = "<group>"; };
 		576EA926282B7FD60028046C /* CheckRegisterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckRegisterViewController.swift; sourceTree = "<group>"; };
-		57713943281F596C0066DEEB /* TitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleView.swift; sourceTree = "<group>"; };
+		57713943281F596C0066DEEB /* TopTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopTitleView.swift; sourceTree = "<group>"; };
 		577A01B528A496D1004B2575 /* UITextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextView.swift; sourceTree = "<group>"; };
 		578B7A9728AC6AF900E7B4F4 /* ChattingRoomViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChattingRoomViewController.swift; sourceTree = "<group>"; };
 		578B7A9B28AC892800E7B4F4 /* ChatInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInputView.swift; sourceTree = "<group>"; };
@@ -665,6 +667,8 @@
 		EEB13B8C297FC68B001A8DD9 /* UIButton+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Rx.swift"; sourceTree = "<group>"; };
 		EEB13B90297FC7A1001A8DD9 /* BaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewModel.swift; sourceTree = "<group>"; };
 		EEB13B93297FCD0A001A8DD9 /* LifeCycle+Rx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LifeCycle+Rx.swift"; sourceTree = "<group>"; };
+		EEE326A62998B5190017DF46 /* SearchTextFieldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTextFieldView.swift; sourceTree = "<group>"; };
+		EEE326A92998B6EA0017DF46 /* BorderLine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BorderLine.swift; sourceTree = "<group>"; };
 		EEE6D15729973C1C0004FC7B /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
 		EEE6D15A299752EB0004FC7B /* TagStlye.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagStlye.swift; sourceTree = "<group>"; };
 		EEE6D15D299757EF0004FC7B /* Padding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Padding.swift; sourceTree = "<group>"; };
@@ -1822,7 +1826,6 @@
 			isa = PBXGroup;
 			children = (
 				57EBCE3628A7CC5F00212D20 /* PaddingLabel.swift */,
-				57713943281F596C0066DEEB /* TitleView.swift */,
 				57A28CDE28CF20AC00263079 /* LocationSearchTextField.swift */,
 				57468A72289D070400056691 /* UIButton */,
 				5767D788286C0ACB0075DB28 /* UICheckBox */,
@@ -1946,9 +1949,12 @@
 				EEE6D15C299757E20004FC7B /* Util */,
 				EEE6D1632997BEEE0004FC7B /* Button */,
 				EEE6D159299752E00004FC7B /* Tag */,
+				EEE326A92998B6EA0017DF46 /* BorderLine.swift */,
 				EE33D21B2993BF710020866E /* LettersAndArrowView.swift */,
 				EE9B053429953A1200068503 /* FilterView.swift */,
 				EE73C52129961BF30000F8AC /* RadioButtonView.swift */,
+				EEE326A62998B5190017DF46 /* SearchTextFieldView.swift */,
+				57713943281F596C0066DEEB /* TopTitleView.swift */,
 			);
 			path = Component;
 			sourceTree = "<group>";
@@ -2399,7 +2405,7 @@
 				235613FD28D09DCD00D44E97 /* MyZatchTableViewCell.swift in Sources */,
 				23B051CA28E21BAD005D08EA /* MyQuestionTableViewCell.swift in Sources */,
 				57A28D5628D1A0BB00263079 /* KakaoLocationAddressModel.swift in Sources */,
-				57713944281F596C0066DEEB /* TitleView.swift in Sources */,
+				57713944281F596C0066DEEB /* TopTitleView.swift in Sources */,
 				57067864281C143A00F48342 /* Color.swift in Sources */,
 				235613F328D0974A00D44E97 /* ProfileViewController.swift in Sources */,
 				EE73C51E299610F80000F8AC /* ProductQuantityTableViewCell.swift in Sources */,
@@ -2502,6 +2508,7 @@
 				57C23CD428B2698C006E7915 /* ChattingMemberTableViewCell.swift in Sources */,
 				5724EB5D290FC17700DC529B /* MeetingAlertController.swift in Sources */,
 				EE2BC34A29829A32002B5C60 /* CenterNavigationHeaderView.swift in Sources */,
+				EEE326A72998B5190017DF46 /* SearchTextFieldView.swift in Sources */,
 				57FFEDBF28DD27FE0041719B /* CheckRegisterView.swift in Sources */,
 				5722460228BCBD52009B7C78 /* RightChattingMessageTableViewCell.swift in Sources */,
 				EEB13B72297F9A12001A8DD9 /* TabBarItem.swift in Sources */,
@@ -2530,6 +2537,7 @@
 				5767D777286832420075DB28 /* ExchangeDetailTableViewCell.swift in Sources */,
 				576B374E28D6D71A00EF36E6 /* KakaoMapView.swift in Sources */,
 				57397FCD296FBDBE0088B5F4 /* GatchSearchFilterCollectionViewCell.swift in Sources */,
+				EEE326AA2998B6EA0017DF46 /* BorderLine.swift in Sources */,
 				57A28CDF28CF20AC00263079 /* LocationSearchTextField.swift in Sources */,
 				23B051B628E1FD7F005D08EA /* NotificationViewController.swift in Sources */,
 				579F5E5A281E7F2800D3F0D5 /* ResultSearchViewController.swift in Sources */,

diff --git a/...source/Old/ZatchComponent/TitleView.swift → ...lobal/Source/Component/TopTitleView.swift b/...source/Old/ZatchComponent/TitleView.swift → ...lobal/Source/Component/TopTitleView.swift
@@ -1,5 +1,5 @@
 //
-//  UIContainerView.swift
+//  TopTitleView.swift
 //  Zatch
 //
 //  Created by 박지윤 on 2022/05/02.
@@ -8,21 +8,26 @@
 import Foundation
 import UIKit
 
-class TitleView: UIView{
+class TopTitleView: BaseView{
 
-    let titleLabel = UILabel().then{
+    private let titleLabel = UILabel().then{
         $0.numberOfLines = 0
-        $0.font = UIFont.pretendard(size: 20, family: .Bold)
+        $0.font = UIFont.pretendard(size: 22, family: .Bold)
     }
 
-    override init(frame: CGRect){
-        super.init(frame: frame)
-
-        self.snp.makeConstraints{ make in
-            make.height.equalTo(88)
-        }
+    init(title: String){
+        self.titleLabel.text = title
+        super.init(frame: .zero)
+    }
+
+    override func hierarchy() {
         self.addSubview(titleLabel)
-
+    }
+
+    override func layout() {
+        self.snp.makeConstraints{
+            $0.height.equalTo(120)
+        }
         titleLabel.snp.makeConstraints{ make in
             make.top.equalToSuperview().offset(16)
             make.leading.equalToSuperview().offset(28)

diff --git a/Zatch/Presentation/Views/RegisterView/CheckRegisterView.swift b/Zatch/Presentation/Views/RegisterView/CheckRegisterView.swift
@@ -24,9 +24,7 @@ class CheckRegisterView: BaseView {
 
     //MARK: - UI
 
-    let titleView = TitleView().then{
-        $0.titleLabel.text = "이렇게 재치를\n업로드해도 괜찮을까요?"
-    }
+    let titleView = TopTitleView(title: "이렇게 재치를\n업로드해도 괜찮을까요?")
 
     let photoFrame = UIView()
     let photoTitle = UILabel().then{

diff --git a/Zatch/Presentation/Views/RegisterView/ZatchRegisterFirstView.swift b/Zatch/Presentation/Views/RegisterView/ZatchRegisterFirstView.swift
@@ -10,9 +10,7 @@ import UIKit
 class ZatchRegisterFirstView: BaseView {
 
     //MARK: - UI
-    let topView = TitleView().then{
-        $0.titleLabel.text = "주고 싶은\n물건이 무엇인가요?"
-    }
+    let topView = TopTitleView(title: "주고 싶은\n물건이 무엇인가요?")
 
     let backTableView = UITableView().then{
         $0.showsVerticalScrollIndicator = false

diff --git a/Zatch/Presentation/Views/RegisterView/ZatchRegisterSecondView.swift b/Zatch/Presentation/Views/RegisterView/ZatchRegisterSecondView.swift
@@ -11,9 +11,7 @@ class ZatchRegisterSecondView: BaseView {
 
     //MARK: - UI
 
-    let topTitleView = TitleView().then{
-        $0.titleLabel.text = "받고 싶은\n물건이 있나요?"
-    }
+    let topTitleView = TopTitleView(title: "받고 싶은\n물건이 있나요?")
 
     var tableView = UITableView().then{
         $0.showsVerticalScrollIndicator = false

diff --git a/Zatch/Presentation/Views/SearchView/Zatch/ExchangeMyZatchSearchView.swift b/Zatch/Presentation/Views/SearchView/Zatch/ExchangeMyZatchSearchView.swift
@@ -11,25 +11,24 @@ class ExchangeMyZatchSearchView: BaseView {
 
     //MARK: UI
 
-    let topView = TitleView().then{
-        $0.titleLabel.text = "내가 교환할 재치를\n입력해주세요."
-    }
+    let topView = TopTitleView(title: "내가 교환할 재치를\n입력해주세요.")
 
     //selectFrame
-    let selectFrame = UIView()
-
-    let selectTextField = UILabel().then{
-        $0.textAlignment = .center
-        $0.font = UIFont.pretendard(size: 16, family: .Bold)
-    }
-
-    let searchImage = UIImageView().then{
-        $0.image = Image.search
-    }
-
-    let underLine = UIView().then{
-        $0.backgroundColor = .black85
-    }
+    let selectFrame = ZatchComponent.SearchTextFieldView()
+//    let selectFrame = UIView()
+//
+//    let selectTextField = UILabel().then{
+//        $0.textAlignment = .center
+//        $0.font = UIFont.pretendard(size: 16, family: .Bold)
+//    }
+//
+//    let searchImage = UIImageView().then{
+//        $0.image = Image.search
+//    }
+//
+//    let underLine = UIView().then{
+//        $0.backgroundColor = .black85
+//    }
 
     //
     let subTitle = UILabel().then{
@@ -46,7 +45,6 @@ class ExchangeMyZatchSearchView: BaseView {
     }
 
     let collectionView = UICollectionView(frame: .zero, collectionViewLayout: .init()).then{
-
         let layout = LeftAlignCollectionViewFlowLayout()
         layout.minimumLineSpacing = 8
         layout.minimumInteritemSpacing = 4
@@ -60,9 +58,9 @@ class ExchangeMyZatchSearchView: BaseView {
         self.addSubview(topView)
 
         self.addSubview(selectFrame)
-        self.selectFrame.addSubview(selectTextField)
-        self.selectFrame.addSubview(underLine)
-        self.selectFrame.addSubview(searchImage)
+//        self.selectFrame.addSubview(selectTextField)
+//        self.selectFrame.addSubview(underLine)
+//        self.selectFrame.addSubview(searchImage)
 
         self.addSubview(subTitle)
         self.addSubview(collectionView)
@@ -79,37 +77,37 @@ class ExchangeMyZatchSearchView: BaseView {
 
         //selectFrame
         self.selectFrame.snp.makeConstraints{ make in
-            make.height.equalTo(122)
+//            make.height.equalTo(122)
             make.top.equalTo(topView.snp.bottom)
             make.leading.trailing.equalToSuperview()
         }
 
-        self.selectTextField.snp.makeConstraints{ make in
-            make.height.equalTo(44)
-            make.top.equalToSuperview().offset(54)
-            make.leading.equalToSuperview().offset(40)
-            make.trailing.equalToSuperview().offset(-40)
-        }
+//        self.selectTextField.snp.makeConstraints{ make in
+//            make.height.equalTo(44)
+//            make.top.equalToSuperview().offset(54)
+//            make.leading.equalToSuperview().offset(40)
+//            make.trailing.equalToSuperview().offset(-40)
+//        }
 
-        self.searchImage.snp.makeConstraints{ make in
-            make.width.height.equalTo(24)
-            make.trailing.equalToSuperview().offset(-48)
-            make.bottom.equalTo(underLine).offset(-8)
-            make.top.equalToSuperview().offset(62)
-        }
+//        self.searchImage.snp.makeConstraints{ make in
+//            make.width.height.equalTo(24)
+//            make.trailing.equalToSuperview().offset(-48)
+//            make.bottom.equalTo(underLine).offset(-8)
+//            make.top.equalToSuperview().offset(62)
+//        }
 
-        self.underLine.snp.makeConstraints{ make in
-//            make.top.equalTo(selectTextField.snp.bottom).offset(8)
-            make.top.equalTo(selectTextField.snp.bottom)
-            make.height.equalTo(1.5)
-            make.leading.equalTo(selectTextField)
-            make.trailing.equalTo(selectTextField)
-        }
+//        self.underLine.snp.makeConstraints{ make in
+////            make.top.equalTo(selectTextField.snp.bottom).offset(8)
+//            make.top.equalTo(selectTextField.snp.bottom)
+//            make.height.equalTo(1.5)
+//            make.leading.equalTo(selectTextField)
+//            make.trailing.equalTo(selectTextField)
+//        }
 
 
         //
         self.subTitle.snp.makeConstraints{ make in
-            make.top.equalTo(underLine.snp.bottom).offset(48)
+            make.top.equalTo(selectFrame.snp.bottom).offset(48)
             make.leading.equalToSuperview().offset(20)
         }
 

diff --git a/Zatch/Presentation/Views/SearchView/Zatch/FindSearchView.swift b/Zatch/Presentation/Views/SearchView/Zatch/FindSearchView.swift
@@ -10,10 +10,7 @@ import UIKit
 class FindSearchView: BaseView {
 
     //MARK: - UI
-    let titleView = TitleView().then{
-        $0.titleLabel.text = "무엇을 찾고 있나요?"
-        $0.titleLabel.font = UIFont.pretendard(size: 20, family: .Bold)
-    }
+    let titleView = TopTitleView(title: "무엇을 찾고 있나요?")
 
     //
     let exchangeFrame = UIView()
@@ -58,7 +55,7 @@ class FindSearchView: BaseView {
 
         $0.collectionViewLayout = flexLayout
 
-        $0.register(FindSearchTagCollectionViewCell.self, forCellWithReuseIdentifier: FindSearchTagCollectionViewCell.cellIdentifier)
+//        $0.register(FindSearchTagCollectionViewCell.self, forCellWithReuseIdentifier: FindSearchTagCollectionViewCell.cellIdentifier)
     }
 
     let subTitle2 = UILabel().then{
@@ -75,7 +72,7 @@ class FindSearchView: BaseView {
 
         $0.collectionViewLayout = flexLayout
 
-        $0.register(FindSearchTagCollectionViewCell.self, forCellWithReuseIdentifier: FindSearchTagCollectionViewCell.cellIdentifier)
+//        $0.register(FindSearchTagCollectionViewCell.self, forCellWithReuseIdentifier: FindSearchTagCollectionViewCell.cellIdentifier)
     }
 
     let nextButton = Purple36Button(title: "검색하기")