diff --git a/Budi/Budi.xcodeproj/project.pbxproj b/Budi/Budi.xcodeproj/project.pbxproj index ea6fcbff..ae32b709 100644 --- a/Budi/Budi.xcodeproj/project.pbxproj +++ b/Budi/Budi.xcodeproj/project.pbxproj @@ -176,6 +176,12 @@ A8CE1193278B1F82008AFEBC /* MyBudiProjectDetailCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8CE1190278B1F82008AFEBC /* MyBudiProjectDetailCollectionViewCell.swift */; }; A8CE1194278B1F82008AFEBC /* MyBudiProjectDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8CE1191278B1F82008AFEBC /* MyBudiProjectDetailViewController.swift */; }; A8CE1196278B1F91008AFEBC /* MyBudiContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8CE1195278B1F90008AFEBC /* MyBudiContentViewController.swift */; }; + A8E03CCF278C68A40074DE4B /* NormalTextFieldTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E03CCD278C68A40074DE4B /* NormalTextFieldTableViewCell.swift */; }; + A8E03CD0278C68A40074DE4B /* NormalTextFieldTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A8E03CCE278C68A40074DE4B /* NormalTextFieldTableViewCell.xib */; }; + A8E03CD3278C693C0074DE4B /* LocationReplaceTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E03CD1278C693C0074DE4B /* LocationReplaceTableViewCell.swift */; }; + A8E03CD4278C693C0074DE4B /* LocationReplaceTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A8E03CD2278C693C0074DE4B /* LocationReplaceTableViewCell.xib */; }; + A8E03CD7278C6B030074DE4B /* PositionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E03CD5278C6B030074DE4B /* PositionTableViewCell.swift */; }; + A8E03CD8278C6B030074DE4B /* PositionTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A8E03CD6278C6B030074DE4B /* PositionTableViewCell.xib */; }; B92D54F9274C02EB00D0E851 /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = B92D54F8274C02EB00D0E851 /* .swiftlint.yml */; }; B92D5505274C03AB00D0E851 /* Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = B92D5504274C03AA00D0E851 /* Post.swift */; }; B94D2D9A277DE9E700DD7FDD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B94D2D99277DE9E700DD7FDD /* GoogleService-Info.plist */; }; @@ -404,6 +410,12 @@ A8CE1190278B1F82008AFEBC /* MyBudiProjectDetailCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyBudiProjectDetailCollectionViewCell.swift; sourceTree = ""; }; A8CE1191278B1F82008AFEBC /* MyBudiProjectDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyBudiProjectDetailViewController.swift; sourceTree = ""; }; A8CE1195278B1F90008AFEBC /* MyBudiContentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyBudiContentViewController.swift; sourceTree = ""; }; + A8E03CCD278C68A40074DE4B /* NormalTextFieldTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NormalTextFieldTableViewCell.swift; sourceTree = ""; }; + A8E03CCE278C68A40074DE4B /* NormalTextFieldTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NormalTextFieldTableViewCell.xib; sourceTree = ""; }; + A8E03CD1278C693C0074DE4B /* LocationReplaceTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationReplaceTableViewCell.swift; sourceTree = ""; }; + A8E03CD2278C693C0074DE4B /* LocationReplaceTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LocationReplaceTableViewCell.xib; sourceTree = ""; }; + A8E03CD5278C6B030074DE4B /* PositionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PositionTableViewCell.swift; sourceTree = ""; }; + A8E03CD6278C6B030074DE4B /* PositionTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PositionTableViewCell.xib; sourceTree = ""; }; B92D54F8274C02EB00D0E851 /* .swiftlint.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = ""; }; B92D54FE274C037E00D0E851 /* String+date.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+date.swift"; sourceTree = ""; }; B92D5501274C039C00D0E851 /* HomeContentViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeContentViewModel.swift; sourceTree = ""; }; @@ -594,6 +606,12 @@ 5E9150A42772355B000578D4 /* Cells */ = { isa = PBXGroup; children = ( + A8E03CCD278C68A40074DE4B /* NormalTextFieldTableViewCell.swift */, + A8E03CCE278C68A40074DE4B /* NormalTextFieldTableViewCell.xib */, + A8E03CD1278C693C0074DE4B /* LocationReplaceTableViewCell.swift */, + A8E03CD2278C693C0074DE4B /* LocationReplaceTableViewCell.xib */, + A8E03CD5278C6B030074DE4B /* PositionTableViewCell.swift */, + A8E03CD6278C6B030074DE4B /* PositionTableViewCell.xib */, ); path = Cells; sourceTree = ""; @@ -1172,6 +1190,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + A8E03CD0278C68A40074DE4B /* NormalTextFieldTableViewCell.xib in Resources */, B92D54F9274C02EB00D0E851 /* .swiftlint.yml in Resources */, 5E43FB3E278A95EF0073574F /* ChattingProjectRequestCell.xib in Resources */, 5E820B8B2769F04A004A03E9 /* ProjectMembersBottomDetailCell.xib in Resources */, @@ -1212,6 +1231,7 @@ 5E91509B27722213000578D4 /* MyBudiProjectCell.xib in Resources */, 5E2554362732770B00033723 /* HomeDetailPersonCell.xib in Resources */, 5E820B902769F963004A03E9 /* DatePickerBottomViewController.xib in Resources */, + A8E03CD8278C6B030074DE4B /* PositionTableViewCell.xib in Resources */, 5EFB0A462733E36800F39A4D /* TeamSearchCell.xib in Resources */, 5EC2FEFA275E191F00FF5BB0 /* HomeDetailStatusUnitCell.xib in Resources */, 5EA453912731774100943C94 /* HomeDetailMemberCell.xib in Resources */, @@ -1229,6 +1249,7 @@ 5E503E7827898D1400F13256 /* ProjectMembersBottomViewController.xib in Resources */, 5E7CF4C92770B79E007315F1 /* ProjectMembersBottomPositionCell.xib in Resources */, 5E5517AA2768BCC300DC605E /* HomeWritingPartBottomCell.xib in Resources */, + A8E03CD4278C693C0074DE4B /* LocationReplaceTableViewCell.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1312,6 +1333,8 @@ B968415F277853BC002F5D3D /* ProjectHistory.swift in Sources */, 5E9150A62772356A000578D4 /* MyBudiEditCellType.swift in Sources */, 5E88636E2767450A0022397A /* HomeWritingCellType.swift in Sources */, + 5E820B7B2769E9D7004A03E9 /* HomeWritingMembersDetailPartBottomCell.swift in Sources */, + A8E03CD3278C693C0074DE4B /* LocationReplaceTableViewCell.swift in Sources */, 5E8863822767AE190022397A /* HomeWritingImageBottomCell.swift in Sources */, 5EF986CA2786E58600874A40 /* Leader.swift in Sources */, A8CE1196278B1F91008AFEBC /* MyBudiContentViewController.swift in Sources */, @@ -1333,6 +1356,7 @@ B97A862D2786D6DB0016CF23 /* TeamSearchProfileCell.swift in Sources */, A8CD936127384C4900299AB4 /* SearchTableViewCell.swift in Sources */, A85C920B276A35270097E444 /* PortfolioViewController.swift in Sources */, + A8E03CCF278C68A40074DE4B /* NormalTextFieldTableViewCell.swift in Sources */, B94D2D9C277DFE2300DD7FDD /* TeamSearchViewModel.swift in Sources */, B92D5505274C03AB00D0E851 /* Post.swift in Sources */, 5EB4302D2758951600283239 /* HomeWritingPartCell.swift in Sources */, @@ -1451,6 +1475,7 @@ 5EBD9D5D276DB57B00615319 /* HomeDetailViewModel.swift in Sources */, 5E91508D27721D8B000578D4 /* MyBudiMainViewController.swift in Sources */, 5E58E6B1276B588C00ABBF1C /* AppliesRequest.swift in Sources */, + A8E03CD7278C6B030074DE4B /* PositionTableViewCell.swift in Sources */, 5EB430452758959600283239 /* HomeWritingDescriptionCell.swift in Sources */, A81D1061276482950022D610 /* DefaultTableViewCell.swift in Sources */, 5E91509627722206000578D4 /* MyBudiLevelCell.swift in Sources */, diff --git a/Budi/Budi/Source/Home/HomeDetail/HomeDetailCells/HomeDetailViewController.swift b/Budi/Budi/Source/Home/HomeDetail/HomeDetailCells/HomeDetailViewController.swift index 71cd49d2..f44ce695 100644 --- a/Budi/Budi/Source/Home/HomeDetail/HomeDetailCells/HomeDetailViewController.swift +++ b/Budi/Budi/Source/Home/HomeDetail/HomeDetailCells/HomeDetailViewController.swift @@ -72,7 +72,6 @@ private extension HomeDetailViewController { .receive(on: DispatchQueue.main) .sink { [weak self] _ in guard let self = self, let isAlreadyApplied = self.viewModel.state.post.value?.isAlreadyApplied else { return } - if UserDefaults.standard.string(forKey: "accessToken") == "" { let storyboard = UIStoryboard(name: "Main", bundle: nil) let loginSelectViewController = storyboard.instantiateViewController(identifier: "LoginSelectViewController") diff --git a/Budi/Budi/Source/MyBudi/Edit/Cells/LocationReplaceTableViewCell.swift b/Budi/Budi/Source/MyBudi/Edit/Cells/LocationReplaceTableViewCell.swift new file mode 100644 index 00000000..0e947eb5 --- /dev/null +++ b/Budi/Budi/Source/MyBudi/Edit/Cells/LocationReplaceTableViewCell.swift @@ -0,0 +1,27 @@ +// +// PositionTableViewCell.swift +// Budi +// +// Created by 인병윤 on 2022/01/10. +// + +import UIKit + +class LocationReplaceTableViewCell: UITableViewCell { + + static let cellId = "LocationReplaceTableViewCell" + + @IBOutlet weak var locationTextField: UITextField! + @IBOutlet weak var replaceLocationButton: UIButton! + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Budi/Budi/Source/MyBudi/Edit/Cells/LocationReplaceTableViewCell.xib b/Budi/Budi/Source/MyBudi/Edit/Cells/LocationReplaceTableViewCell.xib new file mode 100644 index 00000000..4077811b --- /dev/null +++ b/Budi/Budi/Source/MyBudi/Edit/Cells/LocationReplaceTableViewCell.xib @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Budi/Budi/Source/MyBudi/Edit/Cells/NormalTextFieldTableViewCell.swift b/Budi/Budi/Source/MyBudi/Edit/Cells/NormalTextFieldTableViewCell.swift new file mode 100644 index 00000000..19209f1f --- /dev/null +++ b/Budi/Budi/Source/MyBudi/Edit/Cells/NormalTextFieldTableViewCell.swift @@ -0,0 +1,25 @@ +// +// NormalTextFieldTableViewCell.swift +// Budi +// +// Created by 인병윤 on 2022/01/10. +// + +import UIKit + +class NormalTextFieldTableViewCell: UITableViewCell { + + static let cellId = "NormalTableViewCell" + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Budi/Budi/Source/MyBudi/Edit/Cells/NormalTextFieldTableViewCell.xib b/Budi/Budi/Source/MyBudi/Edit/Cells/NormalTextFieldTableViewCell.xib new file mode 100644 index 00000000..247258e8 --- /dev/null +++ b/Budi/Budi/Source/MyBudi/Edit/Cells/NormalTextFieldTableViewCell.xib @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Budi/Budi/Source/MyBudi/Edit/Cells/PositionTableViewCell.swift b/Budi/Budi/Source/MyBudi/Edit/Cells/PositionTableViewCell.swift new file mode 100644 index 00000000..1809495d --- /dev/null +++ b/Budi/Budi/Source/MyBudi/Edit/Cells/PositionTableViewCell.swift @@ -0,0 +1,25 @@ +// +// PositionTableViewCell.swift +// Budi +// +// Created by 인병윤 on 2022/01/10. +// + +import UIKit + +class PositionTableViewCell: UITableViewCell { + + static let cellId = "PositionTableViewCell" + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + + // Configure the view for the selected state + } + +} diff --git a/Budi/Budi/Source/MyBudi/Edit/Cells/PositionTableViewCell.xib b/Budi/Budi/Source/MyBudi/Edit/Cells/PositionTableViewCell.xib new file mode 100644 index 00000000..b3143d30 --- /dev/null +++ b/Budi/Budi/Source/MyBudi/Edit/Cells/PositionTableViewCell.xib @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.swift b/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.swift index 271f9781..6fe9c577 100644 --- a/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.swift +++ b/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.swift @@ -11,6 +11,7 @@ import CombineCocoa final class MyBudiEditViewController: UIViewController { + @IBOutlet weak var tableView: UITableView! weak var coordinator: MyBudiCoordinator? private let viewModel: MyBudiEditViewModel private var cancellables = Set() @@ -27,7 +28,7 @@ final class MyBudiEditViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() configureNavigationBar() - configureCollectionView() + configureTableView()() } override func viewWillAppear(_ animated: Bool) { @@ -41,8 +42,17 @@ final class MyBudiEditViewController: UIViewController { // MARK: - CollectionView extension MyBudiEditViewController { - private func configureCollectionView() { - + private func configureTableView() { + tableView.delegate = self + tableView.dataSource = self + let nib = UINib(nibName: DefaultHeaderView.cellId, bundle: nil) + let normal = UINib(nibName: NormalTextFieldTableViewCell.cellId, bundle: nil) + let location = UINib(nibName: LocationReplaceTableViewCell.cellId, bundle: nil) + let position = UINib(nibName: PositionTableViewCell.cellId, bundle: nil) + tableView.register(nib, forHeaderFooterViewReuseIdentifier: DefaultHeaderView.cellId) + tableView.register(normal, forCellReuseIdentifier: NormalTextFieldTableViewCell.cellId) + tableView.register(<#T##nib: UINib?##UINib?#>, forCellReuseIdentifier: <#T##String#>) + tableView.separatorStyle = UITableViewCell.SeparatorStyle.none } } diff --git a/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.xib b/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.xib index e9eb6d7d..136fcca7 100644 --- a/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.xib +++ b/Budi/Budi/Source/MyBudi/Edit/MyBudiEditViewController.xib @@ -1,22 +1,103 @@ - - + + + - + + + + - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +