diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/Contents.json new file mode 100644 index 00000000..3ab459f0 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "iconRefreshLocation.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "iconRefreshLocation@2x.png", + "scale" : "2x" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "iconRefreshLocation@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation.png new file mode 100644 index 00000000..b65db295 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation@2x.png new file mode 100644 index 00000000..fce8cc62 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation@3x.png new file mode 100644 index 00000000..a1382bfa Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconRefreshLocation.imageset/iconRefreshLocation@3x.png differ diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift index f6f83d37..e0195ae7 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/AroundMe/VC/AroundMeViewController.swift @@ -19,11 +19,14 @@ final class AroundMeViewController: UIViewController { // MARK: - UI Components + private let navigationBar = CustomNavigationBar() + // MARK: - View Life Cycles override func viewDidLoad() { super.viewDidLoad() setUI() + setLayout() } } @@ -31,8 +34,19 @@ final class AroundMeViewController: UIViewController { extension AroundMeViewController { // MARK: - UI & Layout + private func setUI() { self.view.backgroundColor = .white self.navigationController?.navigationBar.isHidden = true + navigationBar.setUI("내 근처의 명함", leftImage: UIImage(named: "iconClear"), rightImage: UIImage(named: "iconRefreshLocation")) + } + + private func setLayout() { + view.addSubviews([navigationBar]) + + navigationBar.snp.makeConstraints { make in + make.top.leading.trailing.equalTo(self.view.safeAreaLayoutGuide) + make.height.equalTo(50) + } } } diff --git a/NADA-iOS-forRelease/Sources/Views/CustomNavigationBar/CustomNavigationBar.swift b/NADA-iOS-forRelease/Sources/Views/CustomNavigationBar/CustomNavigationBar.swift index 97a8460a..072f8570 100644 --- a/NADA-iOS-forRelease/Sources/Views/CustomNavigationBar/CustomNavigationBar.swift +++ b/NADA-iOS-forRelease/Sources/Views/CustomNavigationBar/CustomNavigationBar.swift @@ -17,7 +17,7 @@ import UIKit 2) 해당 ViewController로 가서 CustomNavigationBar를 상속받은 UIView 생성 (ex: navigationBar) 3) navigationBar.leftButtonAction = { 왼쪽버튼을 누르면 해야할 것 } 을 추가해요. 4) navigationBar.rightButtonAction = { 오른쪽버튼을 누르면 해야할 것 } 을 추가해요. - 5) func iconImage(leftImage: UIImage, rightImage: UIImage) 함수를 이용하여 왼쪽 아이템과 오른쪽 아이템을 바꿔주세요. + 5) func setUI(_ title: String?, leftImage: UIImage?, rightImage: UIImage?) 함수를 이용하여 왼쪽/오른쪽 아이템과 타이틀을 바꿔주세요. */ @@ -57,8 +57,8 @@ class CustomNavigationBar: UIView { func setUI(_ title: String?, leftImage: UIImage?, rightImage: UIImage?) { titleLabel.text = title - leftButton.setImage(leftImage?.withRenderingMode(.alwaysTemplate), for: .normal) - rightButton.setImage(rightImage?.withRenderingMode(.alwaysTemplate), for: .normal) + leftButton.setImage(leftImage?.withRenderingMode(.alwaysOriginal), for: .normal) + rightButton.setImage(rightImage?.withRenderingMode(.alwaysOriginal), for: .normal) } private func setLayout() {