Skip to content

Commit 98fc1cc

Browse files
authored
fix: 제보하기 말풍선 label 폰트 수정, 루틴 등록화면 컴포넌트 레이아웃 수정 (#86)
1 parent 6f41d25 commit 98fc1cc

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

Projects/Presentation/Sources/EmotionRegister/View/EmotionRegisterCompletionViewController.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ final class EmotionRegisterCompletionViewController: UIViewController {
1616
static let speechImageBottomSpacing: CGFloat = 24
1717
static let speechLabelHorizontalSpacing: CGFloat = 20
1818
static let speechLabelTopSpacing: CGFloat = 22
19+
static let speechLabelBottomSpacing: CGFloat = 32
1920
static let groundImageHeight: CGFloat = 171
2021
static let pomoImageWidth: CGFloat = 200
2122
static let pomoImageHeight: CGFloat = 282
@@ -79,7 +80,10 @@ final class EmotionRegisterCompletionViewController: UIViewController {
7980

8081
speechImageView.image = BitnagilGraphic.marbleSpeechGraphic?.withRenderingMode(.alwaysTemplate)
8182
speechImageView.tintColor = BitnagilColor.gray10
82-
speechLabel.font = BitnagilFont.init(style: .cafe24Title2, weight: .light).font
83+
speechLabel.font = BitnagilFont.init(
84+
family: .cafe24Ssurround,
85+
style: .cafe24Title2,
86+
weight: .light).font
8387
speechLabel.numberOfLines = 2
8488
speechLabel.textColor = .white
8589
speechLabel.textAlignment = .center
@@ -139,6 +143,7 @@ final class EmotionRegisterCompletionViewController: UIViewController {
139143

140144
speechLabel.snp.makeConstraints { make in
141145
make.top.equalTo(speechImageView.snp.top).offset(Layout.speechLabelTopSpacing)
146+
make.bottom.equalTo(speechImageView.snp.bottom).offset(-Layout.speechLabelBottomSpacing)
142147
make.horizontalEdges.equalTo(speechImageView).inset(Layout.speechImageHorizontalSpacing)
143148
}
144149
}

Projects/Presentation/Sources/EmotionRegister/View/EmotionRegistrationViewController.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ final class EmotionRegistrationViewController: BaseViewController<EmotionRegiste
2525
static let speechImageHorizontalSpacing: CGFloat = 54
2626
static let speechImageHeight: CGFloat = 102
2727
static let speechLabelTopSpacing: CGFloat = 22
28+
static let speechLabelBottomSpacing: CGFloat = 32
2829
static let fomoHandImageWidth: CGFloat = 263
2930
static let fomoHandImageHeight: CGFloat = 207
3031
static let fomoThumbImageWidth: CGFloat = 80
@@ -124,7 +125,10 @@ final class EmotionRegistrationViewController: BaseViewController<EmotionRegiste
124125
speechImageView.tintColor = .clear
125126
speechLabel.numberOfLines = 2
126127
speechLabel.textAlignment = .center
127-
speechLabel.font = BitnagilFont.init(style:.cafe24Title2, weight: .light).font
128+
speechLabel.font = BitnagilFont.init(
129+
family: .cafe24Ssurround,
130+
style:.cafe24Title2,
131+
weight: .light).font
128132
speechLabel.textColor = .clear
129133

130134
infoSwipeOverlayView.backgroundColor = .clear
@@ -197,6 +201,7 @@ final class EmotionRegistrationViewController: BaseViewController<EmotionRegiste
197201

198202
speechLabel.snp.makeConstraints { make in
199203
make.top.equalTo(speechImageView.snp.top).offset(Layout.speechLabelTopSpacing)
204+
make.bottom.equalTo(speechImageView.snp.bottom).offset(-Layout.speechLabelBottomSpacing)
200205
make.centerX.equalTo(speechImageView)
201206
}
202207

Projects/Presentation/Sources/RoutineCreation/View/Component/RoutineCreationCardView.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ final class RoutineCreationCardView<ContentView: UIView & RoutineCreationExpanda
3939
private let divideLine = UIView()
4040
private let contentView = ContentView()
4141
private var labelStackViewBottomConstraint: Constraint?
42+
private var divideLineTopConstraint: Constraint?
4243
public var onAction: ((ContentView.Action) -> Void)? {
4344
didSet { contentView.action = onAction }
4445
}
@@ -164,9 +165,12 @@ final class RoutineCreationCardView<ContentView: UIView & RoutineCreationExpanda
164165
}
165166

166167
divideLine.snp.makeConstraints { make in
167-
make.top.equalTo(labelStackView.snp.bottom).offset(Layout.divideLineTopSpacing)
168168
make.horizontalEdges.equalToSuperview().inset(Layout.edgeSpacing)
169169
make.height.equalTo(Layout.divideLineHeight)
170+
171+
divideLineTopConstraint = make.top
172+
.equalTo(labelStackView.snp.bottom)
173+
.offset(CGFloat.zero).constraint
170174
}
171175

172176
contentView.snp.makeConstraints { make in
@@ -250,11 +254,15 @@ final class RoutineCreationCardView<ContentView: UIView & RoutineCreationExpanda
250254
contentView.isHidden = false
251255
divideLine.isHidden = false
252256
chevronImageView.image = BitnagilIcon.chevronIcon(direction: .up)
257+
258+
divideLineTopConstraint?.update(offset: Layout.edgeSpacing)
253259
} else {
254260
labelStackViewBottomConstraint?.isActive = true
255261
contentView.isHidden = true
256262
divideLine.isHidden = true
257263
chevronImageView.image = BitnagilIcon.chevronIcon(direction: .down)
264+
265+
divideLineTopConstraint?.update(offset: CGFloat.zero)
258266
}
259267

260268
contentView.setExpanded(expanded: nextExpandedState)

0 commit comments

Comments
 (0)