From 28e7065d829c11f718015ded307c94597f026481 Mon Sep 17 00:00:00 2001 From: Kim Minjae Date: Sat, 22 Jul 2023 04:15:54 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE]=20Button=20=EC=98=81=EC=97=AD=2044px?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95=20(#121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LionHeart-iOS/Global/Extensions/UIButton+.swift | 2 +- .../Global/UIComponents/LHNavigationBarView.swift | 6 ++++-- .../Curriculum/Cells/CurriculumTableViewCell.swift | 3 ++- .../Curriculum/Views/CurriculumUserInfoView.swift | 10 +++------- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/LionHeart-iOS/LionHeart-iOS/Global/Extensions/UIButton+.swift b/LionHeart-iOS/LionHeart-iOS/Global/Extensions/UIButton+.swift index b87316bc..a306dc0b 100644 --- a/LionHeart-iOS/LionHeart-iOS/Global/Extensions/UIButton+.swift +++ b/LionHeart-iOS/LionHeart-iOS/Global/Extensions/UIButton+.swift @@ -21,7 +21,7 @@ extension UIButton { extension UIButton { func marginImageWithText(margin: CGFloat) { - let halfSize = margin/2 + let halfSize = margin / 2 imageEdgeInsets = UIEdgeInsets(top: 0, left: -halfSize, bottom: 0, right: halfSize) titleEdgeInsets = UIEdgeInsets(top: 0, left: halfSize, bottom: 0, right: -halfSize) contentEdgeInsets = UIEdgeInsets(top: 0, left: halfSize, bottom: 0, right: halfSize) diff --git a/LionHeart-iOS/LionHeart-iOS/Global/UIComponents/LHNavigationBarView.swift b/LionHeart-iOS/LionHeart-iOS/Global/UIComponents/LHNavigationBarView.swift index c22fda91..bf910cd5 100644 --- a/LionHeart-iOS/LionHeart-iOS/Global/UIComponents/LHNavigationBarView.swift +++ b/LionHeart-iOS/LionHeart-iOS/Global/UIComponents/LHNavigationBarView.swift @@ -21,6 +21,7 @@ final class LHNavigationBarView: UIView { private let leftBarItem: UIButton = { let button = UIButton() button.tintColor = .designSystem(.white) + button.marginImageWithText(margin: 14) return button }() @@ -28,6 +29,7 @@ final class LHNavigationBarView: UIView { let button = UIButton() button.setImage(ImageLiterals.NavigationBar.bookMark, for: .normal) button.tintColor = .designSystem(.white) + button.marginImageWithText(margin: 14) return button }() @@ -35,6 +37,7 @@ final class LHNavigationBarView: UIView { let button = UIButton() button.setImage(ImageLiterals.NavigationBar.profile, for: .normal) button.tintColor = .designSystem(.white) + button.marginImageWithText(margin: 14) return button }() @@ -49,7 +52,6 @@ final class LHNavigationBarView: UIView { rightFirstBarItem, rightSecondBarItem ]) stackView.axis = .horizontal - stackView.spacing = 8 stackView.alignment = .center stackView.distribution = .equalSpacing stackView.isHidden = true @@ -110,7 +112,7 @@ final class LHNavigationBarView: UIView { rightBarItemsStackView.snp.makeConstraints { make in make.centerY.equalTo(leftBarItem) - make.trailing.equalToSuperview().inset(24) + make.trailing.equalToSuperview().inset(16) } graySepartorLine.snp.makeConstraints { make in diff --git a/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumTableViewCell.swift b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumTableViewCell.swift index 149e1052..2db23f4f 100644 --- a/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumTableViewCell.swift +++ b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Cells/CurriculumTableViewCell.swift @@ -80,6 +80,7 @@ final class CurriculumTableViewCell: UITableViewCell, TableViewCellRegisterDeque lazy var curriculumToggleDirectionButton: UIButton = { var button = UIButton() + button.marginImageWithText(margin: 19) button.setImage(ImageLiterals.Curriculum.arrowDownSmall, for: .normal) button.setImage(ImageLiterals.Curriculum.arrowUpSmall, for: .selected) button.setContentCompressionResistancePriority(.required, for: .horizontal) @@ -166,7 +167,7 @@ private extension CurriculumTableViewCell { curriculumToggleDirectionButton.snp.makeConstraints{ $0.leading.greaterThanOrEqualTo(weekTitleLabel.snp.trailing).offset(8) $0.centerY.equalTo(weekLabel) - $0.trailing.equalToSuperview() + $0.trailing.equalToSuperview().offset(12) } curriculumWholeStackView.snp.makeConstraints{ diff --git a/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Views/CurriculumUserInfoView.swift b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Views/CurriculumUserInfoView.swift index 3041e294..70d8793f 100644 --- a/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Views/CurriculumUserInfoView.swift +++ b/LionHeart-iOS/LionHeart-iOS/Scenes/Curriculum/Views/CurriculumUserInfoView.swift @@ -47,6 +47,7 @@ final class CurriculumUserInfoView: UIView { let label = UILabel() label.font = .pretendard(.head3) label.textColor = .designSystem(.gray100) + label.textAlignment = .center return label }() @@ -67,13 +68,8 @@ final class CurriculumUserInfoView: UIView { } override func layoutSubviews() { - // MARK: - 컴포넌트 설정 setUI() - - // MARK: - addsubView setHierarchy() - - // MARK: - autolayout설정 setLayout() } @@ -91,6 +87,7 @@ extension CurriculumUserInfoView { func setHierarchy() { self.addSubviews(userWeekDayInfoView, weekImageView, userWeekLabel, weekLabel, dayImageView, userDayLabel, dayLabel) + dayImageView.addSubview(userDayLabel) } func setLayout() { @@ -116,8 +113,7 @@ extension CurriculumUserInfoView { } userDayLabel.snp.makeConstraints{ - $0.leading.equalTo(dayImageView.snp.leading).offset(4) - $0.centerY.equalTo(dayImageView) + $0.center.equalToSuperview() } dayLabel.snp.makeConstraints{