diff --git a/momoIOS.xcodeproj/project.pbxproj b/momoIOS.xcodeproj/project.pbxproj index ed69a0d..61f0b70 100644 --- a/momoIOS.xcodeproj/project.pbxproj +++ b/momoIOS.xcodeproj/project.pbxproj @@ -13,8 +13,8 @@ 3A72A20529A9E16500F2716A /* PaddingLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A72A20429A9E16500F2716A /* PaddingLabel.swift */; }; 3A72A20729A9E19300F2716A /* AddSessionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A72A20629A9E19300F2716A /* AddSessionView.swift */; }; 3A75FC10298827BE00B36A46 /* MainAttendanceCodeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A75FC0F298827BE00B36A46 /* MainAttendanceCodeCell.swift */; }; - 3A8BDEF329AA6D66005CF633 /* MemberListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8BDEF229AA6D66005CF633 /* MemberListCell.swift */; }; - 3A8BDEF529AA7B74005CF633 /* AttendanceListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8BDEF429AA7B74005CF633 /* AttendanceListCell.swift */; }; + 3A8BDEF329AA6D66005CF633 /* AttendanceListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8BDEF229AA6D66005CF633 /* AttendanceListCell.swift */; }; + 3A8BDEF529AA7B74005CF633 /* MemberListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8BDEF429AA7B74005CF633 /* MemberListCell.swift */; }; 3A8E2DDF2997697E00D5476A /* AttendanceCodeDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8E2DDE2997697E00D5476A /* AttendanceCodeDetailViewController.swift */; }; 3A8FC29929A9EFEF000B9315 /* MemberManagementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8FC29829A9EFEF000B9315 /* MemberManagementViewController.swift */; }; 3A8FC29D29A9F31D000B9315 /* MemberListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8FC29C29A9F31D000B9315 /* MemberListViewController.swift */; }; @@ -77,8 +77,8 @@ 3A72A20429A9E16500F2716A /* PaddingLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaddingLabel.swift; sourceTree = ""; }; 3A72A20629A9E19300F2716A /* AddSessionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddSessionView.swift; sourceTree = ""; }; 3A75FC0F298827BE00B36A46 /* MainAttendanceCodeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainAttendanceCodeCell.swift; sourceTree = ""; }; - 3A8BDEF229AA6D66005CF633 /* MemberListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberListCell.swift; sourceTree = ""; }; - 3A8BDEF429AA7B74005CF633 /* AttendanceListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttendanceListCell.swift; sourceTree = ""; }; + 3A8BDEF229AA6D66005CF633 /* AttendanceListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttendanceListCell.swift; sourceTree = ""; }; + 3A8BDEF429AA7B74005CF633 /* MemberListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberListCell.swift; sourceTree = ""; }; 3A8E2DDE2997697E00D5476A /* AttendanceCodeDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttendanceCodeDetailViewController.swift; sourceTree = ""; }; 3A8FC29829A9EFEF000B9315 /* MemberManagementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberManagementViewController.swift; sourceTree = ""; }; 3A8FC29C29A9F31D000B9315 /* MemberListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MemberListViewController.swift; sourceTree = ""; }; @@ -162,8 +162,8 @@ 3A8BDEF129AA6D55005CF633 /* Cells */ = { isa = PBXGroup; children = ( - 3A8BDEF229AA6D66005CF633 /* MemberListCell.swift */, - 3A8BDEF429AA7B74005CF633 /* AttendanceListCell.swift */, + 3A8BDEF229AA6D66005CF633 /* AttendanceListCell.swift */, + 3A8BDEF429AA7B74005CF633 /* MemberListCell.swift */, ); path = Cells; sourceTree = ""; @@ -557,7 +557,7 @@ BF04086F2987E70200F1129B /* CheckSecurityCodeController.swift in Sources */, E8D5C3F32984FC23003D1AD0 /* SceneDelegate.swift in Sources */, 3A75FC10298827BE00B36A46 /* MainAttendanceCodeCell.swift in Sources */, - 3A8BDEF529AA7B74005CF633 /* AttendanceListCell.swift in Sources */, + 3A8BDEF529AA7B74005CF633 /* MemberListCell.swift in Sources */, E83238F1298506A000DC83C2 /* MainViewController.swift in Sources */, BF998900298BB0D3005723C7 /* InputMemberInfoController.swift in Sources */, BF0408632987B3AA00F1129B /* LoginController.swift in Sources */, @@ -569,7 +569,7 @@ 3A72A20529A9E16500F2716A /* PaddingLabel.swift in Sources */, 3A5AC31029898B330080323A /* UIButton+Extension.swift in Sources */, E89F6DF329AA024C00602075 /* NotActiveSessionView.swift in Sources */, - 3A8BDEF329AA6D66005CF633 /* MemberListCell.swift in Sources */, + 3A8BDEF329AA6D66005CF633 /* AttendanceListCell.swift in Sources */, BF43B57829951F0C0026DCE3 /* ProfileView.swift in Sources */, 3A8FC29929A9EFEF000B9315 /* MemberManagementViewController.swift in Sources */, 3A8E2DDF2997697E00D5476A /* AttendanceCodeDetailViewController.swift in Sources */, diff --git a/momoIOS/AdminSide/MemberManagement/Cells/AttendanceListCell.swift b/momoIOS/AdminSide/MemberManagement/Cells/AttendanceListCell.swift index fe33ee0..bf50479 100644 --- a/momoIOS/AdminSide/MemberManagement/Cells/AttendanceListCell.swift +++ b/momoIOS/AdminSide/MemberManagement/Cells/AttendanceListCell.swift @@ -14,7 +14,7 @@ final class AttendanceListCell: UITableViewCell { private let nameLabel: UILabel = UILabel() private let generationLabel: UILabel = UILabel() private let jobLabel: UILabel = UILabel() - private let disableButton: UIButton = UIButton() + private let attendanceStatusButton: UIButton = UIButton() // MARK: - Initializer override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { @@ -23,7 +23,7 @@ final class AttendanceListCell: UITableViewCell { self.selectionStyle = .none self.setupViews() self.setupLayout() - } + } required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") @@ -43,13 +43,13 @@ final class AttendanceListCell: UITableViewCell { self.jobLabel.font = .body16 self.jobLabel.textColor = .gray800 - self.disableButton.setTitle("비활성화", font: .tag1, color: .gray800) - self.disableButton.configurate(bgColor: .white, strokeColor: .gray500, strokeWidth: 1, cornerRadius: 6, padding: 0) + self.attendanceStatusButton.setTitle("정상출석", font: .tag2, color: .white) + self.attendanceStatusButton.configurate(bgColor: .attendanceCheck, cornerRadius: 6, padding: 0) } // MARK: - Layout private func setupLayout() { - self.contentView.addSubviews(self.nameLabel, self.generationLabel, self.jobLabel, self.disableButton) + self.contentView.addSubviews(self.nameLabel, self.generationLabel, self.jobLabel, self.attendanceStatusButton) self.contentView.snp.makeConstraints { make in make.width.equalToSuperview() @@ -73,7 +73,7 @@ final class AttendanceListCell: UITableViewCell { make.leading.greaterThanOrEqualTo(self.generationLabel.snp.trailing).offset(12) } - self.disableButton.snp.makeConstraints { make in + self.attendanceStatusButton.snp.makeConstraints { make in make.centerY.equalToSuperview() make.leading.greaterThanOrEqualTo(self.jobLabel.snp.trailing).offset(12) make.trailing.equalToSuperview().inset(24) diff --git a/momoIOS/AdminSide/MemberManagement/Cells/MemberListCell.swift b/momoIOS/AdminSide/MemberManagement/Cells/MemberListCell.swift index 2f10681..5a21d4b 100644 --- a/momoIOS/AdminSide/MemberManagement/Cells/MemberListCell.swift +++ b/momoIOS/AdminSide/MemberManagement/Cells/MemberListCell.swift @@ -14,7 +14,7 @@ final class MemberListCell: UITableViewCell { private let nameLabel: UILabel = UILabel() private let generationLabel: UILabel = UILabel() private let jobLabel: UILabel = UILabel() - private let attendanceStatusButton: UIButton = UIButton() + private let disableButton: UIButton = UIButton() // MARK: - Initializer override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { @@ -23,7 +23,7 @@ final class MemberListCell: UITableViewCell { self.selectionStyle = .none self.setupViews() self.setupLayout() - } + } required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") @@ -43,13 +43,13 @@ final class MemberListCell: UITableViewCell { self.jobLabel.font = .body16 self.jobLabel.textColor = .gray800 - self.attendanceStatusButton.setTitle("출석", font: .tag2, color: .white) - self.attendanceStatusButton.configurate(bgColor: .attendanceCheck, cornerRadius: 6, edgeInsets: .init(top: 0, leading: 11, bottom: 0, trailing: 11)) + self.disableButton.setTitle("비활성화", font: .tag1, color: .gray800) + self.disableButton.configurate(bgColor: .white, strokeColor: .gray500, strokeWidth: 1, cornerRadius: 6, padding: 0) } // MARK: - Layout private func setupLayout() { - self.contentView.addSubviews(self.nameLabel, self.generationLabel, self.jobLabel, self.attendanceStatusButton) + self.contentView.addSubviews(self.nameLabel, self.generationLabel, self.jobLabel, self.disableButton) self.contentView.snp.makeConstraints { make in make.width.equalToSuperview() @@ -73,7 +73,7 @@ final class MemberListCell: UITableViewCell { make.leading.greaterThanOrEqualTo(self.generationLabel.snp.trailing).offset(12) } - self.attendanceStatusButton.snp.makeConstraints { make in + self.disableButton.snp.makeConstraints { make in make.centerY.equalToSuperview() make.leading.greaterThanOrEqualTo(self.jobLabel.snp.trailing).offset(12) make.trailing.equalToSuperview().inset(24) diff --git a/momoIOS/AdminSide/MemberManagement/MemberManagementViewController.swift b/momoIOS/AdminSide/MemberManagement/MemberManagementViewController.swift index 3ad6281..95a2b34 100644 --- a/momoIOS/AdminSide/MemberManagement/MemberManagementViewController.swift +++ b/momoIOS/AdminSide/MemberManagement/MemberManagementViewController.swift @@ -37,7 +37,7 @@ final class MemberManagementViewController: UIViewController { self.memberButton.setTitle("회원", font: .body18, color: .gray800) self.memberButton.addTarget(self, action: #selector(selectMemberButton), for: .touchUpInside) - self.attendanceButton.setTitle("참석", font: .body18, color: .gray800) + self.attendanceButton.setTitle("출석", font: .body18, color: .gray800) self.attendanceButton.addTarget(self, action: #selector(selectAttendanceButton), for: .touchUpInside) [self.memberButton, self.attendanceButton].forEach { (button: UIButton) in