Skip to content

Commit

Permalink
๐Ÿ’„#298: inset ์กฐ์ • ๋ฐ ์‚ญ์ œ ์ด๋ฏธ์ง€ ์—…๋ฐ์ดํŠธ
Browse files Browse the repository at this point in the history
  • Loading branch information
wendoei committed Dec 15, 2024
1 parent b4273b1 commit 37dbc4f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private extension MainViewController {
self.view.addSubview(bubbleCommentView)
bubbleCommentView.snp.makeConstraints {
$0.centerX.equalToSuperview()
$0.verticalEdges.greaterThanOrEqualTo(self.view.safeAreaLayoutGuide).inset(16)
$0.top.greaterThanOrEqualTo(self.view.safeAreaLayoutGuide).inset(16)
$0.width.lessThanOrEqualTo(self.view.safeAreaLayoutGuide).inset(32)
$0.bottom.equalTo(musicDropButton.snp.top).offset(-10)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ final class RecentQueryCell: UICollectionViewCell {
private lazy var deletingButton: UIButton = {
let button = UIButton()
button.setImage(
// TODO: jihye - figma image update
UIImage(named: "deletingQuery")?.withRenderingMode(.alwaysTemplate),
UIImage(named: "delete"),
for: .normal
)
button.tintColor = .gray400
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,6 @@ final class SearchingMusicViewController: UIViewController {
let textField: UITextField = UITextField()
textField.font = .pretendard(size: 14, weightName: .medium)
textField.backgroundColor = UIColor.gray700
textField.attributedPlaceholder = NSAttributedString(
string: "๋“œ๋žํ•  ์Œ์•… ๊ฒ€์ƒ‰",
attributes: [
.foregroundColor: UIColor.gray300
]
)
textField.textColor = UIColor.gray100
textField.layer.cornerRadius = 8.0

Expand Down Expand Up @@ -601,6 +595,12 @@ private extension SearchingMusicViewController {
}
.disposed(by: disposeBag)

output.promptOfTheDay
.bind { [weak self] prompt in
self?.configureSearchBarPlaceholder(with: prompt)
}
.disposed(by: disposeBag)

Observable.combineLatest(
output.recentMusicQueries,
output.trendingMusicList,
Expand Down Expand Up @@ -666,10 +666,8 @@ private extension SearchingMusicViewController {
}

self.searchView.snp.makeConstraints {
// TODO: 56 -> 60์œผ๋กœ ๋ฐ”๊ผˆ๋Š”์ง€ ์ถ”ํ›„์— ํ”ผ๊ทธ๋งˆ ํ™•์ธ
$0.height.equalTo(56)
$0.height.equalTo(60)
$0.top.equalTo(view.safeAreaLayoutGuide)
$0.top.equalTo(bannerView.snp.bottom).offset(10)
$0.leading.equalToSuperview()
$0.trailing.equalToSuperview()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ final class DefaultSearchingMusicViewModel: SearchingMusicViewModel {
case .success(let prompt):
output.promptOfTheDay.accept(prompt)
case .failure(_):
output.mostDroppedMusicList.accept([])
output.promptOfTheDay.accept("๋“œ๋žํ•  ์Œ์•… ๊ฒ€์ƒ‰")
}
}
.disposed(by: disposedBag)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "delete.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
Binary file not shown.

0 comments on commit 37dbc4f

Please sign in to comment.