Skip to content

Commit c64e098

Browse files
authored
Merge pull request #246 from teamterning/Fix/#245
[Fix] #245 - μ˜¨λ³΄λ”© & 탐색뷰 3μ°¨ μŠ€ν”„λ¦°νŠΈ QA λ°˜μ˜ν–ˆμŠ΅λ‹ˆλ‹€.
2 parents dfef5bf + 7f52d43 commit c64e098

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

β€ŽTerning-iOS/Terning-iOS/Resource/UIComponents/CustomDatePicker.swiftβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ public final class CustomDatePicker: UIPickerView {
1111

1212
// MARK: - Properties
1313

14-
private(set) var years = Array(2022...2030).map { "\($0)" }
14+
private(set) var years: [String] = {
15+
let (currentYear, currentMonth) = Date().getCurrentKrYearAndMonth()
16+
let endYear = currentMonth > 10 ? currentYear + 1 : currentYear
17+
return Array(2022...endYear).map { "\($0)" }
18+
}()
19+
1520
private(set) var months = Array(1...12).map { "\($0)" }
1621
private var shouldRemovePlaceholderOnSelection = false
1722

β€ŽTerning-iOS/Terning-iOS/Source/Presentation/SearchResult/Cell/SortHeaderCell.swiftβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ extension SortHeaderCell {
119119

120120
let range = (fullText as NSString).range(of: countString)
121121
attributedText.addAttributes([
122-
.font: UIFont.body3,
122+
.font: UIFont.body5,
123123
.foregroundColor: UIColor.terningMain,
124124
.kern: 0.002,
125125
.paragraphStyle: paragraphStyle

β€ŽTerning-iOS/Terning-iOS/Source/Presentation/Welcome/View/WelcomeView.swiftβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,9 @@ extension WelcomeView {
123123
$0.height.equalTo(388.adjustedH)
124124
}
125125
skipButton.snp.makeConstraints {
126+
$0.height.equalTo(14.adjustedH)
126127
$0.centerX.equalToSuperview()
127-
$0.bottom.equalToSuperview().inset(52.adjustedH)
128+
$0.bottom.equalToSuperview().inset(44.adjustedH)
128129
}
129130
case .second:
130131
logoAnimationView.snp.makeConstraints {

0 commit comments

Comments
Β (0)