[CHORE] Button 영역 44px로 수정 (Team-LionHeart#121)

bricksky · Jul 21, 2023 · 28e7065 · 28e7065
1 parent 1fcc051
commit 28e7065
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -21,20 +21,23 @@ final class LHNavigationBarView: UIView {
     private let leftBarItem: UIButton = {
         let button = UIButton()
         button.tintColor = .designSystem(.white)
+        button.marginImageWithText(margin: 14)
         return button
     }()
 
     private let rightFirstBarItem: UIButton = {
         let button = UIButton()
         button.setImage(ImageLiterals.NavigationBar.bookMark, for: .normal)
         button.tintColor = .designSystem(.white)
+        button.marginImageWithText(margin: 14)
         return button
     }()
 
     private let rightSecondBarItem: UIButton = {
         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
@@ -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
@@ -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{