Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI/#294 가독성을 위해 컬러 변경 #296

Merged
merged 6 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public final class DefaultNearMapUseCase: NearMapUseCase {
}
}.first
if let selectedBusStop {
let distance = locationService.getDistance(
var distance = locationService.getDistance(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기 var로 바꾸신 이유를 알 수 있을까요?

response: selectedBusStop
)
return (selectedBusStop, distance)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class EmptyRegularAlarmView: UIView {
.font: DesignSystemFontFamily.NanumSquareNeoOTF.bold.font(
size: 20
),
.foregroundColor: DesignSystemAsset.bottonBtnColor.color
.foregroundColor: DesignSystemAsset.settingColor.color
]
)
let padding = NSAttributedString(
Expand Down
62 changes: 62 additions & 0 deletions Projects/Feature/HomeFeature/Sources/View/EmptyFavoritesView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,60 @@ final class EmptyFavoritesView: UIView {
return imgView
}()

private let messageLabel: UILabel = {
let label = UILabel()
label.font = DesignSystemFontFamily.NanumSquareNeoOTF.regular.font(
size: 15
)
label.textColor = DesignSystemAsset.gray6.color
label.textAlignment = .center
label.numberOfLines = 3
let message1 = NSAttributedString(
string: "확인하고 싶은 버스 정보는\n",
attributes: [
.font: DesignSystemFontFamily.NanumSquareNeoOTF.regular.font(
size: 15
)
]
)
let message2 = NSAttributedString(
string: "즐겨찾기로 등록하세요 ",
attributes: [
.font: DesignSystemFontFamily.NanumSquareNeoOTF.bold.font(
size: 20
),
.foregroundColor: DesignSystemAsset.settingColor.color
]
)
let padding = NSAttributedString(
string: "\n",
attributes: [
.font: DesignSystemFontFamily.NanumSquareNeoOTF.bold.font(
size: 6
),
.foregroundColor: DesignSystemAsset.bottonBtnColor.color
]
)
let attributedString = NSMutableAttributedString()
attributedString.append(message1)
attributedString.append(padding)
attributedString.append(message2)
label.attributedText = attributedString
return label
}()

private let exampleLabel: UILabel = {
let label = UILabel()
label.font = .systemFont(
ofSize: 20,
weight: .light
)
label.text = "ex"
label.textColor = DesignSystemAsset.blueGray.color
label.transform = CGAffineTransform(rotationAngle: -0.3)
return label
}()

private let starImageView: LottieAnimationView = {
let imgView = LottieAnimationView(
name: "star",
Expand All @@ -48,6 +102,7 @@ final class EmptyFavoritesView: UIView {
backgroundColor = DesignSystemAsset.cellColor.color
[
listLottieView,
messageLabel,
starImageView
].forEach {
addSubview($0)
Expand Down Expand Up @@ -76,6 +131,13 @@ final class EmptyFavoritesView: UIView {
starImageView.heightAnchor.constraint(
equalToConstant: 40
),
messageLabel.centerXAnchor.constraint(
equalTo: centerXAnchor
),
messageLabel.bottomAnchor.constraint(
equalTo: listLottieView.bottomAnchor,
constant: 80
),
])
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,6 @@ public final class NearMapViewController: UIViewController {
.subscribe(
onNext: { vc, tuple in
var (response, distance) = tuple
switch vc.viewModel.viewMode {
case .normal:
break
case .focused(let busStopId):
distance = "알수없음"
}
vc.busStopInformationView.updateUI(
response: response,
distance: distance
Expand Down
Loading