Skip to content

Commit dbe89c1

Browse files
committed
Merge branch 'fix/#155-fix-unmatch-designs' into release/v1.1.0-test
2 parents 822cdc8 + a6a18cd commit dbe89c1

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

โ€ŽPoppool/PresentationLayer/DesignSystem/DesignSystem/Components/PPSearchBarView.swiftโ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class PPSearchBarView: UIView {
1515
$0.searchTextField.setPlaceholder(text: "ํŒ์—…์Šคํ† ์–ด๋ช…์„ ์ž…๋ ฅํ•ด๋ณด์„ธ์š”", color: .g400, font: .korFont(style: .regular, size: 14))
1616
$0.tintColor = .g400
1717
$0.backgroundColor = .g50
18+
$0.layer.cornerRadius = 4
1819
$0.setImage(UIImage(named: "icon_search_gray"), for: .search, state: .normal)
1920
$0.searchBarStyle = .minimal
2021
$0.searchTextField.clearButtonMode = .never

โ€ŽPoppool/PresentationLayer/Presentation/Presentation/Scene/Home/Main/HomeController.swiftโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private extension HomeController {
8383

8484
view.addSubview(homeHeaderView)
8585
homeHeaderView.snp.makeConstraints { make in
86-
make.top.equalTo(view.safeAreaLayoutGuide).inset(7)
86+
make.top.equalTo(view.safeAreaLayoutGuide).inset(12)
8787
make.leading.trailing.equalToSuperview()
8888
}
8989

โ€ŽPoppool/PresentationLayer/Presentation/Presentation/Scene/Map/MapView/MapSearchInput.swiftโ€Ž

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
import UIKit
2+
3+
import DesignSystem
4+
15
import ReactorKit
26
import RxCocoa
37
import RxSwift
4-
import UIKit
8+
import Then
59

610
final class MapSearchInput: UIView, View {
711
// MARK: - Components
@@ -17,7 +21,7 @@ final class MapSearchInput: UIView, View {
1721
private let containerView: UIView = {
1822
let view = UIView()
1923
view.backgroundColor = .white
20-
view.layer.cornerRadius = 8
24+
view.layer.cornerRadius = 4
2125
return view
2226
}()
2327

@@ -28,22 +32,20 @@ final class MapSearchInput: UIView, View {
2832
return iv
2933
}()
3034

31-
let searchTextField: UITextField = {
32-
let textField = UITextField()
33-
textField.placeholder = "ํŒ์—…์Šคํ† ์–ด๋ช…, ์ง€์—ญ์„ ์ž…๋ ฅํ•ด๋ณด์„ธ์š”"
34-
textField.font = UIFont.systemFont(ofSize: 14, weight: .regular)
35-
textField.clearButtonMode = .whileEditing
36-
textField.textColor = .g400
37-
textField.returnKeyType = .search
38-
textField.enablesReturnKeyAutomatically = true
39-
textField.attributedPlaceholder = NSAttributedString(
35+
let searchTextField = UITextField().then {
36+
$0.placeholder = "ํŒ์—…์Šคํ† ์–ด๋ช…, ์ง€์—ญ์„ ์ž…๋ ฅํ•ด๋ณด์„ธ์š”"
37+
$0.font = .korFont(style: .regular, size: 14)
38+
$0.clearButtonMode = .whileEditing
39+
$0.textColor = .g400
40+
$0.returnKeyType = .search
41+
$0.enablesReturnKeyAutomatically = true
42+
$0.attributedPlaceholder = NSAttributedString(
4043
string: "ํŒ์—…์Šคํ† ์–ด๋ช…, ์ง€์—ญ์„ ์ž…๋ ฅํ•ด๋ณด์„ธ์š”",
4144
attributes: [NSAttributedString.Key.foregroundColor: UIColor.g400]
4245
)
4346
// ํŽธ์ง‘์€ ํ•˜์ง€ ์•Š๊ณ , ํƒญ์œผ๋กœ ํ™”๋ฉด ์ „ํ™˜์„ ์œ ๋„
44-
textField.isEnabled = false
45-
return textField
46-
}()
47+
$0.isEnabled = false
48+
}
4749

4850
// MARK: - Init
4951
init() {
@@ -117,13 +119,13 @@ private extension MapSearchInput {
117119
}
118120

119121
searchIcon.snp.makeConstraints { make in
120-
make.leading.equalToSuperview().offset(16)
122+
make.leading.equalToSuperview().offset(12)
121123
make.centerY.equalToSuperview()
122124
make.size.equalTo(20)
123125
}
124126

125127
searchTextField.snp.makeConstraints { make in
126-
make.leading.equalTo(searchIcon.snp.trailing).offset(8)
128+
make.leading.equalTo(searchIcon.snp.trailing).offset(4)
127129
make.centerY.equalToSuperview()
128130
make.trailing.equalToSuperview().offset(-16)
129131
}

โ€ŽPoppool/PresentationLayer/Presentation/Presentation/Scene/Map/MapView/MapView.swiftโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private extension MapView {
101101

102102
searchFilterContainer.addSubview(searchInput)
103103
searchInput.snp.makeConstraints { make in
104-
make.top.equalToSuperview()
104+
make.top.equalTo(safeAreaLayoutGuide).inset(12)
105105
make.leading.trailing.equalToSuperview().inset(20)
106106
make.height.equalTo(37)
107107
}

0 commit comments

Comments
ย (0)